- Mon Sep 3 18:48:26 PDT 2001

[libfaim.git] / src / bos.c

diff --git a/src/bos.c b/src/bos.c
index 9a6a0deee0d43657173f541af298d5d880ff09e5..3149111feb6b2ce0b096edc2970a8518a9e6b2bd 100644 (file)
--- a/src/bos.c
+++ b/src/bos.c
@@ -12,64 +12,62 @@
  * a bitwise OR of all the user classes you want to see you.
  *
  */
-faim_export unsigned long aim_bos_setgroupperm(struct aim_session_t *sess,
-                                              struct aim_conn_t *conn, 
-                                              u_long mask)
+faim_export int aim_bos_setgroupperm(aim_session_t *sess, aim_conn_t *conn, fu32_t mask)
 {
-  return aim_genericreq_l(sess, conn, 0x0009, 0x0004, &mask);
+       return aim_genericreq_l(sess, conn, 0x0009, 0x0004, &mask);
 }
 
-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)
+static int rights(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
-  rxcallback_t userfunc;
-  int ret = 0;
-  struct aim_tlvlist_t *tlvlist;
-  unsigned short maxpermits = 0, maxdenies = 0;
-
-  /* 
-   * TLVs follow 
-   */
-  if (!(tlvlist = aim_readtlvchain(data, datalen)))
-    return 0;
-
-  /*
-   * TLV type 0x0001: Maximum number of buddies on permit list.
-   */
-  if (aim_gettlv(tlvlist, 0x0001, 1))
-    maxpermits = aim_gettlv16(tlvlist, 0x0001, 1);
-
-  /*
-   * TLV type 0x0002: Maximum number of buddies on deny list.
-   *
-   */
-  if (aim_gettlv(tlvlist, 0x0002, 1)) 
-    maxdenies = aim_gettlv16(tlvlist, 0x0002, 1);
-  
-  if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-    ret = userfunc(sess, rx, maxpermits, maxdenies);
-
-  aim_freetlvchain(&tlvlist);
-
-  return ret;  
+       aim_rxcallback_t userfunc;
+       aim_tlvlist_t *tlvlist;
+       fu16_t maxpermits = 0, maxdenies = 0;
+       int ret = 0;
+
+       /* 
+        * TLVs follow 
+        */
+       tlvlist = aim_readtlvchain(bs);
+
+       /*
+        * TLV type 0x0001: Maximum number of buddies on permit list.
+        */
+       if (aim_gettlv(tlvlist, 0x0001, 1))
+               maxpermits = aim_gettlv16(tlvlist, 0x0001, 1);
+
+       /*
+        * TLV type 0x0002: Maximum number of buddies on deny list.
+        */
+       if (aim_gettlv(tlvlist, 0x0002, 1)) 
+               maxdenies = aim_gettlv16(tlvlist, 0x0002, 1);
+
+       if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+               ret = userfunc(sess, rx, maxpermits, maxdenies);
+
+       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)
+static int snachandler(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
 
-  if (snac->subtype == 0x0003)
-    return rights(sess, mod, rx, snac, data, datalen);
+       if (snac->subtype == 0x0003)
+               return rights(sess, mod, rx, snac, bs);
 
-  return 0;
+       return 0;
 }
 
-faim_internal int bos_modfirst(struct aim_session_t *sess, aim_module_t *mod)
+faim_internal int bos_modfirst(aim_session_t *sess, aim_module_t *mod)
 {
 
-  mod->family = 0x0009;
-  mod->version = 0x0000;
-  mod->flags = 0;
-  strncpy(mod->name, "bos", sizeof(mod->name));
-  mod->snachandler = snachandler;
+       mod->family = 0x0009;
+       mod->version = 0x0000;
+       mod->flags = 0;
+       strncpy(mod->name, "bos", sizeof(mod->name));
+       mod->snachandler = snachandler;
 
-  return 0;
+       return 0;
 }
+
+