pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17873] trunk/libgaim/protocols/oscar/family_oservice.c

[<the...@us...>]

Revision: 17873
          http://svn.sourceforge.net/gaim/?rev=17873&view=rev
Author:   thekingant
Date:     2006-12-02 00:56:35 -0800 (Sat, 02 Dec 2006)

Log Message:
-----------
Update our current rate information stuff when the server
slaps us on the wrist for sending SNACs too rapidly

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/family_oservice.c

Modified: trunk/libgaim/protocols/oscar/family_oservice.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_oservice.c	2006-12-02 08:37:24 UTC (rev 17872)
+++ trunk/libgaim/protocols/oscar/family_oservice.c	2006-12-02 08:56:35 UTC (rev 17873)
@@ -430,22 +430,27 @@
 {
 	int ret = 0;
 	aim_rxcallback_t userfunc;
-	guint16 code, rateclass;
-	guint32 currentavg, maxavg, windowsize, clear, alert, limit, disconnect;
+	guint16 code, classid;
+	struct rateclass *rateclass;
 
 	code = byte_stream_get16(bs);
-	rateclass = byte_stream_get16(bs);
+	classid = byte_stream_get16(bs);
 
-	windowsize = byte_stream_get32(bs);
-	clear = byte_stream_get32(bs);
-	alert = byte_stream_get32(bs);
-	limit = byte_stream_get32(bs);
-	disconnect = byte_stream_get32(bs);
-	currentavg = byte_stream_get32(bs);
-	maxavg = byte_stream_get32(bs);
+	rateclass = rateclass_find(conn->rateclasses, classid);
+	if (rateclass == NULL)
+		/* This should never really happen */
+		return 0;
 
+	rateclass->windowsize = byte_stream_get32(bs);
+	rateclass->clear = byte_stream_get32(bs);
+	rateclass->alert = byte_stream_get32(bs);
+	rateclass->limit = byte_stream_get32(bs);
+	rateclass->disconnect = byte_stream_get32(bs);
+	rateclass->current = byte_stream_get32(bs);
+	rateclass->max = byte_stream_get32(bs);
+
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, code, rateclass, windowsize, clear, alert, limit, disconnect, currentavg, maxavg);
+		ret = userfunc(od, conn, frame, code, classid, rateclass->windowsize, rateclass->clear, rateclass->alert, rateclass->limit, rateclass->disconnect, rateclass->current, rateclass->max);
 
 	return ret;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [18069] trunk/libgaim/protocols/oscar/family_oservice.c

[<ev...@us...>]

Revision: 18069
          http://svn.sourceforge.net/gaim/?rev=18069&view=rev
Author:   evands
Date:     2007-01-03 12:52:40 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Patch from Graham Booker which prevents the following crash:
Thread 0 Crashed: 
0 Libgaim 0x0fbbbe3a flap_connection_send + 17 (flap_connection.c:977) 
1 Libgaim 0x0fbb2c04 aim_srv_setidle + 61 (family_oservice.c:588) 
2 Libgaim 0x0fb1470e set_account_unidle + 122 (idle.c:93) 
3 Libgaim 0x0fafd75c gaim_signal_emit_vargs + 234 (signals.c:485) 
4 Libgaim 0x0fafd7c4 gaim_signal_emit + 90 (signals.c:435) 
5 Libgaim 0x0fb1da57 gaim_connection_destroy + 186 (connection.c:180) 
6 Libgaim 0x0fb2cb46 gaim_account_disconnect + 119 (account.c:1017) 
7 Libgaim 0x0fb1d3ee gaim_connection_disconnect_cb + 37 (connection.c:425) 

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/family_oservice.c

Modified: trunk/libgaim/protocols/oscar/family_oservice.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_oservice.c	2007-01-03 19:43:33 UTC (rev 18068)
+++ trunk/libgaim/protocols/oscar/family_oservice.c	2007-01-03 20:52:40 UTC (rev 18069)
@@ -105,6 +105,8 @@
 	FlapConnection *conn;
 
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
+	if(!conn)
+		return;
 
 	aim_genericreq_s(od, conn, 0x0001, 0x0004, &serviceid);
 }
@@ -584,6 +586,9 @@
 	FlapConnection *conn;
 
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
+	if(!conn)
+		return;
+	
 	aim_genericreq_l(od, conn, 0x0001, 0x0011, &idletime);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.