- Fri Aug 3 14:19:37 EDT 2001

[libfaim.git] / src / buddylist.c

diff --git a/src/buddylist.c b/src/buddylist.c
index 28492aae465070ced1fa98ebffc18595c7f02285..cebcb6fe39ad4fa255064375e0e87cc35f738a74 100644 (file)
--- a/src/buddylist.c
+++ b/src/buddylist.c
@@ -7,11 +7,14 @@
  * user information structure.  Its close enough to run
  * through aim_extractuserinfo() however.
  *
+ * Although the offgoing notification contains no information,
+ * it is still in a format parsable by extractuserinfo.
+ *
  */
-static int oncoming(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
+static int buddychange(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
   struct aim_userinfo_s userinfo;
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
 
   aim_extractuserinfo(sess, data, &userinfo);
 
@@ -21,27 +24,9 @@ static int oncoming(struct aim_session_t *sess, aim_module_t *mod, struct comman
   return 0;
 }
 
-/*
- * Offgoing Buddy notifications contain no useful
- * information other than the name it applies to.
- *
- */
-static int offgoing(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
-{
-  char sn[MAXSNLEN+1];
-  rxcallback_t userfunc;
-
-  strncpy(sn, (char *)data+1, (int)*data);
-
-  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-    return userfunc(sess, rx, sn);
-
-  return 0;
-}
-
 static int rights(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
-  rxcallback_t userfunc;
+  aim_rxcallback_t userfunc;
   struct aim_tlvlist_t *tlvlist;
   unsigned short maxbuddies = 0, maxwatchers = 0;
   int ret = 0;
@@ -78,19 +63,10 @@ static int rights(struct aim_session_t *sess, aim_module_t *mod, struct command_
 static int snachandler(struct aim_session_t *sess, aim_module_t *mod, struct command_rx_struct *rx, aim_modsnac_t *snac, unsigned char *data, int datalen)
 {
 
-  faimdprintf(sess, 0, "%s: snachandler: got %x/%x\n", mod->name, snac->family, snac->subtype);
-
-  if (snac->family != mod->family)
-    return 0;
-
-  if (snac->subtype == 0x0001)
-    ;
-  else if (snac->subtype == 0x0003)
+  if (snac->subtype == 0x0003)
     return rights(sess, mod, rx, snac, data, datalen);
-  else if (snac->subtype == 0x000b)
-    return oncoming(sess, mod, rx, snac, data, datalen);
-  else if (snac->subtype == 0x000c)
-    return offgoing(sess, mod, rx, snac, data, datalen);
+  else if ((snac->subtype == 0x000b) || (snac->subtype == 0x000c))
+    return buddychange(sess, mod, rx, snac, data, datalen);
 
   return 0;
 }