[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.41,1.42 auth.c,1.6,1.7 buddylist.c,1.5,1.6 info.c,1.14,1.15

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv23989/src/protocols/oscar

Modified Files:
	aim.h auth.c buddylist.c info.c 
Log Message:
More stuff from Kingant


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- aim.h	5 May 2002 19:02:05 -0000	1.41
+++ aim.h	5 May 2002 19:07:05 -0000	1.42
@@ -953,12 +953,12 @@
 
 
 struct aim_icbmparameters {
-	unsigned short maxchan;
-	unsigned long flags; /* AIM_IMPARAM_FLAG_ */
-	unsigned short maxmsglen; /* message size that you will accept */
-	unsigned short maxsenderwarn; /* this and below are *10 (999=99.9%) */
-	unsigned short maxrecverwarn;
-	unsigned long minmsginterval; /* in milliseconds? */
+	fu16_t maxchan;
+	fu32_t flags; /* AIM_IMPARAM_FLAG_ */
+	fu16_t maxmsglen; /* message size that you will accept */
+	fu16_t maxsenderwarn; /* this and below are *10 (999=99.9%) */
+	fu16_t maxrecverwarn;
+	fu32_t minmsginterval; /* in milliseconds? */
 };
 
 faim_export int aim_reqicbmparams(aim_session_t *sess);

Index: auth.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/auth.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- auth.c	17 Mar 2002 04:24:52 -0000	1.6
+++ auth.c	5 May 2002 19:07:05 -0000	1.7
@@ -290,6 +290,10 @@
 	aim_encode_password_md5(password, key, digest);
 	aim_addtlvtochain_raw(&tl, 0x0025, 16, digest);
 
+	/*
+	 * Newer versions of winaim have an empty type x004c TLV here.
+	 */
+
 	if (ci->clientstring)
 		aim_addtlvtochain_raw(&tl, 0x0003, strlen(ci->clientstring), ci->clientstring);
 	aim_addtlvtochain16(&tl, 0x0016, (fu16_t)ci->clientid);
@@ -304,7 +308,6 @@
 	 * If set, old-fashioned buddy lists will not work. You will need
 	 * to use SSI.
 	 */
-	
 	aim_addtlvtochain8(&tl, 0x004a, 0x01);
 
 	aim_writetlvchain(&fr->data, &tl);

Index: buddylist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/buddylist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- buddylist.c	5 Nov 2001 02:05:06 -0000	1.5
+++ buddylist.c	5 May 2002 19:07:05 -0000	1.6
@@ -53,6 +53,12 @@
 	if (aim_gettlv(tlvlist, 0x0002, 1))
 		maxwatchers = aim_gettlv16(tlvlist, 0x0002, 1);
 
+	/*
+	 * TLV type 0x0003: Unknown.
+	 *
+	 * ICQ only?
+	 */
+
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
 		ret = userfunc(sess, rx, maxbuddies, maxwatchers);
 

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- info.c	2 Mar 2002 04:52:21 -0000	1.14
+++ info.c	5 May 2002 19:07:05 -0000	1.15
@@ -579,6 +579,7 @@
  *   t(0001)  - short containing max profile length (value = 1024)
  *   t(0002)  - short - unknown (value = 16) [max MIME type length?]
  *   t(0003)  - short - unknown (value = 10)
+ *   t(0004)  - short - unknown (value = 2048) [ICQ only?]
  */
 static int rights(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {