comparison libpurple/protocols/qq/file_trans.c @ 28214:9ab9e5f1eec2

merge of '65195a427a4340ca3f017d8d052c0b85c1f482f2' and 'd8d0c78fad568b2380be8a8c68c1474ff3ad4ea5'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 04 Sep 2009 23:08:30 +0000
parents 33921125348d 73a30365c293
children 351d07aefb09
comparison
equal deleted inserted replaced
28213:33921125348d 28214:9ab9e5f1eec2
323 packet_type); 323 packet_type);
324 bytes_expected = 0; 324 bytes_expected = 0;
325 } 325 }
326 326
327 if (bytes != bytes_expected) { 327 if (bytes != bytes_expected) {
328 purple_debug_error("QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d", 328 purple_debug_error("QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d\n",
329 bytes_expected, bytes); 329 bytes_expected, bytes);
330 return; 330 return;
331 } 331 }
332 332
333 qq_hex_dump(PURPLE_DEBUG_INFO, "QQ", 333 qq_hex_dump(PURPLE_DEBUG_INFO, "QQ",
340 340
341 #if 0 341 #if 0
342 guint8 *buf; 342 guint8 *buf;
343 int buflen; 343 int buflen;
344 hex_dump = hex_dump_to_str(encrypted, encrypted_len); 344 hex_dump = hex_dump_to_str(encrypted, encrypted_len);
345 purple_debug_info("QQ", "encrypted packet: \n%s", hex_dump); 345 purple_debug_info("QQ", "encrypted packet: \n%s\n", hex_dump);
346 g_free(hex_dump); 346 g_free(hex_dump);
347 buf = g_newa(guint8, MAX_PACKET_SIZE); 347 buf = g_newa(guint8, MAX_PACKET_SIZE);
348 buflen = encrypted_len; 348 buflen = encrypted_len;
349 if (qq_crypt(DECRYPT, encrypted, encrypted_len, info->file_session_key, buf, &buflen)) { 349 if (qq_crypt(DECRYPT, encrypted, encrypted_len, info->file_session_key, buf, &buflen)) {
350 purple_debug_info("QQ", "decrypt success\n"); 350 purple_debug_info("QQ", "decrypt success\n");
351 if (buflen == bytes && memcmp(raw_data, buf, buflen) == 0) 351 if (buflen == bytes && memcmp(raw_data, buf, buflen) == 0)
352 purple_debug_info("QQ", "checksum ok\n"); 352 purple_debug_info("QQ", "checksum ok\n");
353 353
354 hex_dump = hex_dump_to_str(buf, buflen); 354 hex_dump = hex_dump_to_str(buf, buflen);
355 purple_debug_info("QQ", "decrypted packet: \n%s", hex_dump); 355 purple_debug_info("QQ", "decrypted packet: \n%s\n", hex_dump);
356 g_free(hex_dump); 356 g_free(hex_dump);
357 } else { 357 } else {
358 purple_debug_info("QQ", "decrypt fail\n"); 358 purple_debug_info("QQ", "decrypt fail\n");
359 } 359 }
360 #endif 360 #endif
818 break; 818 break;
819 case QQ_FILE_DATA_PACKET_TAG: 819 case QQ_FILE_DATA_PACKET_TAG:
820 _qq_process_recv_file_data(gc, data + bytes, len - bytes); 820 _qq_process_recv_file_data(gc, data + bytes, len - bytes);
821 break; 821 break;
822 default: 822 default:
823 purple_debug_info("QQ", "unknown packet tag"); 823 purple_debug_info("QQ", "unknown packet tag\n");
824 } 824 }
825 } 825 }