[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.19,1.20 aim_internal.h,1.9,1.10 conn.c,1.7,1.8 info.c,1.7,1.8 oscar.c,1.65,1.66 service.c,1.1,1.2

[Eric W. <war...@us...>]

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

Modified Files:
	aim.h aim_internal.h conn.c info.c oscar.c service.c 
Log Message:
it's 6am


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- aim.h	2001/11/14 19:21:20	1.19
+++ aim.h	2001/11/17 13:57:30	1.20
@@ -416,12 +416,13 @@
 #define AIM_FLAG_OSCAR_PAY	0x0008
 #define AIM_FLAG_FREE 		0x0010
 #define AIM_FLAG_AWAY		0x0020
-#define AIM_FLAG_UNKNOWN40	0x0040
+#define AIM_FLAG_ICQ		0x0040
 #define AIM_FLAG_UNKNOWN80	0x0080
 #define AIM_FLAG_UNKNOWN100	0x0100
 #define AIM_FLAG_UNKNOWN200	0x0200
 #define AIM_FLAG_ACTIVEBUDDY    0x0400
 #define AIM_FLAG_UNKNOWN800	0x0800
+#define AIM_FLAG_ABINTERNAL     0x1000
 
 #define AIM_FLAG_ALLUSERS	0x001f
 
@@ -822,7 +823,8 @@
 #define AIM_CAPS_SAVESTOCKS     0x0080
 #define AIM_CAPS_SENDBUDDYLIST  0x0100
 #define AIM_CAPS_GAMES2         0x0200
-#define AIM_CAPS_EVERYBUDDY     0x0400
+#define AIM_CAPS_ICQ            0x0400
+#define AIM_CAPS_ABINTERNAL     0x0800
 #define AIM_CAPS_LAST           0x8000
 
 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
@@ -880,7 +882,7 @@
 	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
 	512, /* !! Note how small this is. */ \
 	(99.9)*10, (99.9)*10, \
-	1000 \
+	1000 /* !! And how large this is. */ \
 }
 
 /* This is what most AIM versions use. */

Index: aim_internal.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim_internal.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- aim_internal.h	2001/11/14 19:21:20	1.9
+++ aim_internal.h	2001/11/17 13:57:30	1.10
@@ -151,6 +151,7 @@
 	struct snacgroup *next;
 };
 
+#ifdef FAIM_NEED_CONN_INTERNAL
 struct snacpair {
 	fu16_t group;
 	fu16_t subtype;
@@ -170,6 +171,7 @@
 	struct snacpair *members;
 	struct rateclass *next;
 };
+#endif /* FAIM_NEED_CONN_INTERNAL */
 
 /*
  * This is inside every connection.  But it is a void * to anything

Index: conn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/conn.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- conn.c	2001/11/10 01:48:17	1.7
+++ conn.c	2001/11/17 13:57:30	1.8
@@ -7,6 +7,7 @@
  */
 
 #define FAIM_INTERNAL
+#define FAIM_NEED_CONN_INTERNAL
 #include <aim.h> 
 
 #ifndef _WIN32
@@ -127,9 +128,19 @@
 
 	for (rc = *head; rc; ) {
 		struct rateclass *tmp;
+		struct snacpair *sp;
 
 		tmp = rc->next;
+
+		for (sp = rc->members; sp; ) {
+			struct snacpair *tmpsp;
+
+			tmpsp = sp->next;
+			free(sp);
+			sp = tmpsp;
+		}
 		free(rc);
+
 		rc = tmp;
 	}
 

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- info.c	2001/11/05 02:05:06	1.7
+++ info.c	2001/11/17 13:57:30	1.8
@@ -145,7 +145,7 @@
 	/*
 	 * Advertised by the EveryBuddy client.
 	 */
-	{AIM_CAPS_EVERYBUDDY,
+	{AIM_CAPS_ICQ,
 	 {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
@@ -180,6 +180,10 @@
 
 	{AIM_CAPS_SENDBUDDYLIST,
 	 {0x09, 0x46, 0x13, 0x4b, 0x4c, 0x7f, 0x11, 0xd1,
+	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
+	{AIM_CAPS_ABINTERNAL,
+	 {0x09, 0x46, 0x13, 0x4f, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
 	{AIM_CAPS_LAST}

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- oscar.c	2001/11/14 19:21:20	1.65
+++ oscar.c	2001/11/17 13:57:30	1.66
@@ -1115,8 +1115,8 @@
 			if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT))
 				type |= UC_UNAVAILABLE;
 		}
-		if (caps & AIM_CAPS_EVERYBUDDY)
-			caps ^= AIM_CAPS_EVERYBUDDY;
+		if (caps & AIM_CAPS_ICQ)
+			caps ^= AIM_CAPS_ICQ;
 		debug_printf("icq status: %d\n", info->icqinfo.status);
 	}
 

Index: service.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- service.c	2001/11/10 01:48:17	1.1
+++ service.c	2001/11/17 13:57:30	1.2
@@ -4,6 +4,7 @@
  */
 
 #define FAIM_INTERNAL
+#define FAIM_NEED_CONN_INTERNAL
 #include <aim.h>
 
 #include "md5.h"
@@ -288,6 +289,8 @@
 		 */
 		if (mod->version >= 3)
 			aimbs_getrawbuf(bs, rc.unknown, sizeof(rc.unknown));
+
+		faimdprintf(sess, 1, "--- Adding rate class %d to connection type %d: window size = %ld, clear = %ld, alert = %ld, limit = %ld, disconnect = %ld, current = %ld, max = %ld\n", rx->conn->type, rc.classid, rc.windowsize, rc.clear, rc.alert, rc.limit, rc.disconnect, rc.current, rc.max);
 
 		rc_addclass(&ins->rates, &rc);
 	}