X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/646c6b5273a2272632e50e7393f090f7c8bf06eb..e80a0fa9198d4acd23acebd7e1bd5f6113b469bb:/src/buddylist.c

diff --git a/src/buddylist.c b/src/buddylist.c
index 55a3571..6e3ae9c 100644
--- a/src/buddylist.c
+++ b/src/buddylist.c
@@ -2,6 +2,104 @@
 #define FAIM_INTERNAL
 #include <aim.h>
 
+/*
+ * Oncoming Buddy notifications contain a subset of the
+ * user information structure.  Its close enough to run
+ * through aim_extractuserinfo() however.
+ *
+ */
+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)
+{
+  struct aim_userinfo_s userinfo;
+  rxcallback_t userfunc;
+
+  aim_extractuserinfo(sess, data, &userinfo);
+
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    return userfunc(sess, rx, &userinfo);
+
+  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;
+  struct aim_tlvlist_t *tlvlist;
+  unsigned short maxbuddies = 0, maxwatchers = 0;
+  int ret = 0;
+
+  /* 
+   * TLVs follow 
+   */
+  if (!(tlvlist = aim_readtlvchain(data, datalen)))
+    return 0;
+
+  /*
+   * TLV type 0x0001: Maximum number of buddies.
+   */
+  if (aim_gettlv(tlvlist, 0x0001, 1))
+    maxbuddies = aim_gettlv16(tlvlist, 0x0001, 1);
+
+  /*
+   * TLV type 0x0002: Maximum number of watchers.
+   *
+   * XXX: what the hell is a watcher? 
+   *
+   */
+  if (aim_gettlv(tlvlist, 0x0002, 1))
+    maxwatchers = aim_gettlv16(tlvlist, 0x0002, 1);
+  
+  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+    ret = userfunc(sess, rx, maxbuddies, maxwatchers);
+
+  aim_freetlvchain(&tlvlist);
+
+  return ret;  
+}
+
+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)
+{
+
+  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);
+
+  return 0;
+}
+
+faim_internal int buddylist_modfirst(struct aim_session_t *sess, aim_module_t *mod)
+{
+
+  mod->family = 0x0003;
+  mod->version = 0x0000;
+  mod->flags = 0;
+  strncpy(mod->name, "buddylist", sizeof(mod->name));
+  mod->snachandler = snachandler;
+
+  return 0;
+}
+
 /*
  * aim_add_buddy()
  *
@@ -68,39 +166,3 @@ faim_export unsigned long aim_remove_buddy(struct aim_session_t *sess,
    return sess->snac_nextid;
 }
 
-faim_internal int aim_parse_buddyrights(struct aim_session_t *sess,
-					struct command_rx_struct *command, ...)
-{
-  rxcallback_t userfunc = NULL;
-  int ret=1;
-  struct aim_tlvlist_t *tlvlist;
-  unsigned short maxbuddies = 0, maxwatchers = 0;
-
-  /* 
-   * TLVs follow 
-   */
-  if (!(tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10)))
-    return ret;
-
-  /*
-   * TLV type 0x0001: Maximum number of buddies.
-   */
-  if (aim_gettlv(tlvlist, 0x0001, 1))
-    maxbuddies = aim_gettlv16(tlvlist, 0x0001, 1);
-
-  /*
-   * TLV type 0x0002: Maximum number of watchers.
-   *
-   * XXX: what the hell is a watcher? 
-   *
-   */
-  if (aim_gettlv(tlvlist, 0x0002, 1))
-    maxwatchers = aim_gettlv16(tlvlist, 0x0002, 1);
-  
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0003, 0x0003)))
-    ret =  userfunc(sess, command, maxbuddies, maxwatchers);
-
-  aim_freetlvchain(&tlvlist);
-
-  return ret;  
-}