diff libgaim/protocols/qq/send_file.c @ 14610:473b225e7352

[gaim-migrate @ 17338] Eliminate a dependency in crypt.c by replacing ntohl() (etc) with g_ntohl() (etc). Also replace those calls in the rest of the QQ prpl, to be consistent. committer: Tailor Script <[e-mail]>

--- a/libgaim/protocols/qq/send_file.c	Fri Sep 22 06:45:01 2006 +0000
+++ b/libgaim/protocols/qq/send_file.c	Fri Sep 22 16:05:09 2006 +0000
@@ -67,11 +67,11 @@
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
 	if (!_qq_in_same_lan(info)) {
-		sin.sin_port = htons(info->remote_major_port);
-		sin.sin_addr.s_addr = htonl(info->remote_internet_ip);
+		sin.sin_port = g_htons(info->remote_major_port);
+		sin.sin_addr.s_addr = g_htonl(info->remote_internet_ip);
 	} else {
-		sin.sin_port = htons(info->remote_minor_port);
-		sin.sin_addr.s_addr = htonl(info->remote_real_ip);
+		sin.sin_port = g_htons(info->remote_minor_port);
+		sin.sin_addr.s_addr = g_htonl(info->remote_real_ip);
 	}
 	return 0;
 }
@@ -89,7 +89,7 @@
 	r = recvfrom(info->recv_fd, buf, len, 0, (struct sockaddr *) &sin, &sinlen);
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", 
 			"==> recv %d bytes from File UDP Channel, remote ip[%s], remote port[%d]\n",
-			r, inet_ntoa(sin.sin_addr), ntohs(sin.sin_port));
+			r, inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
 	return r;
 }
 
@@ -111,21 +111,21 @@
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
 	if (!_qq_in_same_lan(info)) {
-		sin.sin_port = htons(info->remote_major_port);
-		sin.sin_addr.s_addr = htonl(info->remote_internet_ip);
+		sin.sin_port = g_htons(info->remote_major_port);
+		sin.sin_addr.s_addr = g_htonl(info->remote_internet_ip);
 	} else if (info->use_major) {
-		sin.sin_port = htons(info->remote_major_port);
-		sin.sin_addr.s_addr = htonl(info->remote_real_ip);
+		sin.sin_port = g_htons(info->remote_major_port);
+		sin.sin_addr.s_addr = g_htonl(info->remote_real_ip);
 	} else {
-		sin.sin_port = htons(info->remote_minor_port);
-		sin.sin_addr.s_addr = htonl(info->remote_real_ip);
+		sin.sin_port = g_htons(info->remote_minor_port);
+		sin.sin_addr.s_addr = g_htonl(info->remote_real_ip);
 	}
 	gaim_debug(GAIM_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,
-			ntohs(sin.sin_port)
+			g_ntohs(sin.sin_port)
 		  );
 	return sendto(info->sender_fd, buf, len, 0, (struct sockaddr *) &sin, sizeof(sin));
 }
@@ -230,9 +230,9 @@
 	gchar *internet_ip_str, *real_ip_str;
 	guint32 ip;
 
-	ip = htonl(info->remote_real_ip);
+	ip = g_htonl(info->remote_real_ip);
 	real_ip_str = gen_ip_str((guint8 *) &ip);
-	ip = htonl(info->remote_internet_ip);
+	ip = g_htonl(info->remote_internet_ip);
 	internet_ip_str = gen_ip_str((guint8 *) &ip);
 	gaim_debug(GAIM_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,
@@ -369,7 +369,7 @@
 		if (ioctl(fd, SIOCGIFADDR, (char *) &buf[i]) >= 0)
 		{
 			ret = (((struct sockaddr_in *)(&buf[i].ifr_addr))->sin_addr).s_addr;
-			if (ret == ntohl(0x7f000001)) continue;
+			if (ret == g_ntohl(0x7f000001)) continue;
 			return ret;
 		}
 	}
@@ -391,7 +391,7 @@
 	/* debug 
 	info->local_real_ip = 0x7f000001;
 	*/
-	info->local_real_ip = ntohl(inet_addr(gaim_network_get_my_ip(-1)));
+	info->local_real_ip = g_ntohl(inet_addr(gaim_network_get_my_ip(-1)));
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "local real ip is %x", info->local_real_ip);
 
 	for (i = 0; i < 2; i++) {
@@ -405,7 +405,7 @@
 		sin_len = sizeof(sin);
 		bind(sockfd, (struct sockaddr *) &sin, sin_len);
 		getsockname(sockfd, (struct sockaddr *) &sin, &sin_len);
-		listen_port = ntohs(sin.sin_port);
+		listen_port = g_ntohs(sin.sin_port);
 
 		switch (i) {
 			case 0:
@@ -445,7 +445,7 @@
 	info = g_new0(ft_info, 1);
 	info->to_uid = to_uid;
 	info->send_seq = qd->send_seq;
-	info->local_internet_ip = ntohl(inet_addr(qd->my_ip));
+	info->local_internet_ip = g_ntohl(inet_addr(qd->my_ip));
 	info->local_internet_port = qd->my_port;
 	info->local_real_ip = 0x00000000;
 	info->conn_method = 0x00;
@@ -800,7 +800,7 @@
 	}
 
 	info = g_new0(ft_info, 1);
-	info->local_internet_ip = ntohl(inet_addr(qd->my_ip));
+	info->local_internet_ip = g_ntohl(inet_addr(qd->my_ip));
 	info->local_internet_port = qd->my_port;
 	info->local_real_ip = 0x00000000;
 	info->to_uid = sender_uid;