Mercurial > pidgin
diff libpurple/protocols/qq/send_file.c @ 24095:25f62d21b3f8
disapproval of revision '8cebefbc6cd5d84acb69c74e69e8821f11dd225d'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:04:07 +0000 |
parents | 147ada94a1d8 |
children | bcfc98c7a55f |
line wrap: on
line diff
--- a/libpurple/protocols/qq/send_file.c Thu Sep 11 13:25:07 2008 +0000 +++ b/libpurple/protocols/qq/send_file.c Mon Sep 15 03:04:07 2008 +0000 @@ -54,7 +54,7 @@ static int _qq_in_same_lan(ft_info *info) { if (info->remote_internet_ip == info->local_internet_ip) return 1; - purple_debug_info("QQ", + purple_debug(PURPLE_DEBUG_INFO, "QQ", "Not in the same LAN, remote internet ip[%x], local internet ip[%x]\n", info->remote_internet_ip , info->local_internet_ip); @@ -87,7 +87,7 @@ info = (ft_info *) xfer->data; sinlen = sizeof(sin); r = recvfrom(info->recv_fd, buf, len, 0, (struct sockaddr *) &sin, &sinlen); - purple_debug_info("QQ", + purple_debug(PURPLE_DEBUG_INFO, "QQ", "==> recv %d bytes from File UDP Channel, remote ip[%s], remote port[%d]\n", r, inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port)); return r; @@ -121,12 +121,12 @@ sin.sin_port = g_htons(info->remote_minor_port); sin.sin_addr.s_addr = g_htonl(info->remote_real_ip); } - purple_debug_info("QQ", "sending to channel: %d.%d.%d.%d:%d\n", - sin.sin_addr.s_addr & 0xff, - (sin.sin_addr.s_addr >> 8) & 0xff, - (sin.sin_addr.s_addr >> 16) & 0xff, - sin.sin_addr.s_addr >> 24, - g_ntohs(sin.sin_port) + purple_debug(PURPLE_DEBUG_INFO, "QQ", "sending to channel: %d.%d.%d.%d:%d\n", + (int)sin.sin_addr.s_addr & 0xff, + (int)(sin.sin_addr.s_addr >> 8) & 0xff, + (int)(sin.sin_addr.s_addr >> 16) & 0xff, + (int)sin.sin_addr.s_addr >> 24, + (int)g_ntohs(sin.sin_port) ); return sendto(info->sender_fd, buf, len, 0, (struct sockaddr *) &sin, sizeof(sin)); } @@ -207,20 +207,20 @@ qq_xfer_close_file(xfer); if (info->dest_fp != NULL) { fclose(info->dest_fp); - purple_debug_info("QQ", "file closed\n"); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "file closed\n"); } if (info->major_fd != 0) { close(info->major_fd); - purple_debug_info("QQ", "major port closed\n"); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "major port closed\n"); } if (info->minor_fd != 0) { close(info->minor_fd); - purple_debug_info("QQ", "minor port closed\n"); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "minor port closed\n"); } /* if (info->buffer != NULL) { munmap(info->buffer, purple_xfer_get_size(xfer)); - purple_debug_info("QQ", "file mapping buffer is freed.\n"); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "file mapping buffer is freed.\n"); } */ g_free(info); @@ -235,7 +235,7 @@ real_ip_str = gen_ip_str((guint8 *) &ip); ip = g_htonl(info->remote_internet_ip); internet_ip_str = gen_ip_str((guint8 *) &ip); - purple_debug_info("QQ", "remote internet ip[%s:%d], major port[%d], real ip[%s], minor port[%d]\n", + purple_debug(PURPLE_DEBUG_INFO, "QQ", "remote internet ip[%s:%d], major port[%d], real ip[%s], minor port[%d]\n", internet_ip_str, info->remote_internet_port, info->remote_major_port, real_ip_str, info->remote_minor_port ); @@ -393,7 +393,7 @@ info->local_real_ip = 0x7f000001; */ info->local_real_ip = g_ntohl(inet_addr(purple_network_get_my_ip(-1))); - purple_debug_info("QQ", "local real ip is %x", info->local_real_ip); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "local real ip is %x", info->local_real_ip); for (i = 0; i < 2; i++) { sockfd = socket(PF_INET, SOCK_DGRAM, 0); @@ -412,13 +412,13 @@ case 0: info->local_major_port = listen_port; info->major_fd = sockfd; - purple_debug_info("QQ", "UDP Major Channel created on port[%d]\n", + purple_debug(PURPLE_DEBUG_INFO, "QQ", "UDP Major Channel created on port[%d]\n", info->local_major_port); break; case 1: info->local_minor_port = listen_port; info->minor_fd = sockfd; - purple_debug_info("QQ", "UDP Minor Channel created on port[%d]\n", + purple_debug(PURPLE_DEBUG_INFO, "QQ", "UDP Minor Channel created on port[%d]\n", info->local_minor_port); break; } @@ -475,9 +475,9 @@ bytes += qq_putdata (raw_data + bytes, (guint8 *) filelen_str, filelen_strlen); if (packet_len == bytes) - qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes); + qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes); else - purple_debug_info("qq_send_packet_file_request", + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_request", "%d bytes expected but got %d bytes\n", packet_len, bytes); @@ -497,7 +497,7 @@ qd = (qq_data *) gc->proto_data; info = (ft_info *) qd->xfer->data; - purple_debug_info("QQ", "I've accepted the file transfer request from %d\n", to_uid); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "I've accepted the file transfer request from %d\n", to_uid); _qq_xfer_init_socket(qd->xfer); packet_len = 79; @@ -516,9 +516,9 @@ info->local_real_ip = real_ip; if (packet_len == bytes) - qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes); + qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes); else - purple_debug_info("qq_send_packet_file_accept", + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_accept", "%d bytes expected but got %d bytes\n", packet_len, bytes); } @@ -539,13 +539,13 @@ raw_data = g_newa (guint8, packet_len); bytes = 0; - purple_debug_info("QQ", "<== sending qq file notify ip packet\n"); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "<== sending qq file notify ip packet\n"); bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_NOTIFY, qd, TRUE); bytes += qq_fill_conn_info(raw_data + bytes, info); if (packet_len == bytes) - qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes); + qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes); else - purple_debug_info("qq_send_packet_file_notify", + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_notify", "%d bytes expected but got %d bytes\n", packet_len, bytes); @@ -561,7 +561,7 @@ guint8 *raw_data; gint packet_len, bytes; - purple_debug_info("_qq_send_packet_file_reject", "start"); + purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_reject", "start"); qd = (qq_data *) gc->proto_data; packet_len = 64; @@ -571,9 +571,9 @@ bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_DENY_UDP, qd, TRUE); if (packet_len == bytes) - qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes); + qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes); else - purple_debug_info("qq_send_packet_file", + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file", "%d bytes expected but got %d bytes\n", packet_len, bytes); } @@ -585,27 +585,27 @@ guint8 *raw_data; gint packet_len, bytes; - purple_debug_info("_qq_send_packet_file_cancel", "start\n"); + purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "start\n"); qd = (qq_data *) gc->proto_data; packet_len = 64; raw_data = g_newa (guint8, packet_len); bytes = 0; - purple_debug_info("_qq_send_packet_file_cancel", "before create header\n"); + purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "before create header\n"); bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_CANCEL, qd, TRUE); - purple_debug_info("_qq_send_packet_file_cancel", "end create header\n"); + purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "end create header\n"); if (packet_len == bytes) { - purple_debug_info("_qq_send_packet_file_cancel", "before send cmd\n"); - qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes); + purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "before send cmd\n"); + qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes); } else - purple_debug_info("qq_send_packet_file", + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file", "%d bytes expected but got %d bytes\n", packet_len, bytes); - purple_debug_info("qq_send_packet_file_cancel", "end\n"); + purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_cancel", "end\n"); } /* request to send a file */ @@ -694,7 +694,7 @@ /* border has been checked before if (*cursor >= (data + data_len - 1)) { - purple_debug_warning("QQ", + purple_debug (PURPLE_DEBUG_WARNING, "QQ", "Received file reject message is empty\n"); return; } @@ -724,7 +724,8 @@ /* border has been checked before if (*cursor >= (data + data_len - 1)) { - purple_debug_warning("QQ", "Received file reject message is empty\n"); + purple_debug (PURPLE_DEBUG_WARNING, "QQ", + "Received file reject message is empty\n"); return; } */ @@ -754,7 +755,8 @@ info = (ft_info *) qd->xfer->data; if (data_len <= 30 + QQ_CONN_INFO_LEN) { - purple_debug_warning("QQ", "Received file reject message is empty\n"); + purple_debug (PURPLE_DEBUG_WARNING, "QQ", + "Received file reject message is empty\n"); return; } @@ -787,7 +789,8 @@ info->to_uid = sender_uid; if (data_len <= 2 + 30 + QQ_CONN_INFO_LEN) { - purple_debug_warning("QQ", "Received file request message is empty\n"); + purple_debug (PURPLE_DEBUG_WARNING, "QQ", + "Received file request message is empty\n"); return; } bytes = 0; @@ -803,7 +806,7 @@ /* FACE from IP detector, ignored by gfhuang */ if(g_ascii_strcasecmp(fileinfo[0], "FACE") == 0) { - purple_debug_warning("QQ", + purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Received a FACE ip detect from qq-%d, so he/she must be online :)\n", sender_uid); b = purple_find_buddy(gc->account, sender_name); @@ -823,11 +826,11 @@ qq_update_buddy_contact(gc, q_bud); } else - purple_debug_info("QQ", "buddy %d is already online\n", sender_uid); + purple_debug(PURPLE_DEBUG_INFO, "QQ", "buddy %d is already online\n", sender_uid); } else - purple_debug_warning("QQ", "buddy %d is not in list\n", sender_uid); + purple_debug(PURPLE_DEBUG_WARNING, "QQ", "buddy %d is not in list\n", sender_uid); g_free(sender_name); g_strfreev(fileinfo); @@ -889,7 +892,8 @@ xfer = qd->xfer; info = (ft_info *) qd->xfer->data; if (data_len <= 2 + 30 + QQ_CONN_INFO_LEN) { - purple_debug_warning("QQ", "Received file notify message is empty\n"); + purple_debug (PURPLE_DEBUG_WARNING, "QQ", + "Received file notify message is empty\n"); return; }