diff src/protocols/oscar/im.c @ 4898:bd37db7531e4

[gaim-migrate @ 5230] I Nathan D. Walped the gaimrc file so that it writes a .gaimrc.save file and then renames it to .gaimrc, in the hopes of avoiding the loss of this data in a time that could be crucial to forward progress. Or something. I tested it with and without specifying -f I added a "Status: Not Available" (or whatever) string to ICQ tooltips. This should help at least until we get some new icons. AHEM. And then I dunno, I was planning on taking it out after that, but it could be useful. Also updated some comments and var names in oscar.c to keep things accurate, because I'm one of those people that actually does that. Go ask your Goddess if you've served her well committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/im.c	Thu Mar 27 18:32:22 2003 +0000
+++ b/src/protocols/oscar/im.c	Thu Mar 27 21:41:21 2003 +0000
@@ -1644,8 +1644,8 @@
 	fu8_t *cookie2;
 	int ret = 0;
 
-	char clientip1[30] = {""};
-	char clientip2[30] = {""};
+	char proxyip[30] = {""};
+	char clientip[30] = {""};
 	char verifiedip[30] = {""};
 
 	memset(&args, 0, sizeof(args));
@@ -1687,7 +1687,7 @@
 	list2 = aim_readtlvchain(&bbs);
 
 	/*
-	 * IP address from the perspective of the client.
+	 * IP address to proxy the file transfer through.
 	 *
 	 * XXX - I don't like this.  Maybe just read in an int?  Or inet_ntoa...
 	 */
@@ -1696,7 +1696,7 @@
 
 		iptlv = aim_gettlv(list2, 0x0002, 1);
 
-		snprintf(clientip1, sizeof(clientip1), "%d.%d.%d.%d",
+		snprintf(proxyip, sizeof(proxyip), "%d.%d.%d.%d",
 				aimutil_get8(iptlv->value+0),
 				aimutil_get8(iptlv->value+1),
 				aimutil_get8(iptlv->value+2),
@@ -1704,14 +1704,14 @@
 	}
 
 	/*
-	 * Secondary IP address from the perspective of the client.
+	 * IP address from the perspective of the client.
 	 */
 	if (aim_gettlv(list2, 0x0003, 1)) {
 		aim_tlv_t *iptlv;
 
 		iptlv = aim_gettlv(list2, 0x0003, 1);
 
-		snprintf(clientip2, sizeof(clientip2), "%d.%d.%d.%d",
+		snprintf(clientip, sizeof(clientip), "%d.%d.%d.%d",
 				aimutil_get8(iptlv->value+0),
 				aimutil_get8(iptlv->value+1),
 				aimutil_get8(iptlv->value+2),
@@ -1773,14 +1773,24 @@
 	if (aim_gettlv(list2, 0x000e, 1))
 		args.language = aim_gettlv_str(list2, 0x000e, 1);
 
-	/* Unknown -- no value */
+	/*
+	 * Unknown -- no value
+	 */
 	if (aim_gettlv(list2, 0x000f, 1))
 		;
 
-	if (strlen(clientip1))
-		args.clientip = (char *)clientip1;
-	if (strlen(clientip2))
-		args.clientip2 = (char *)clientip2;
+	/*
+	 * Unknown -- no value
+	 *
+	 * Maybe means we should proxy the file transfer through an AIM server?
+	 */
+	if (aim_gettlv(list2, 0x0010, 1))
+		;
+
+	if (strlen(proxyip))
+		args.proxyip = (char *)proxyip;
+	if (strlen(clientip))
+		args.clientip = (char *)clientip;
 	if (strlen(verifiedip))
 		args.verifiedip = (char *)verifiedip;