X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/9f1a40132a2c6642e3544205c31c091051127ae0..e677fc4371dedb607e13d60a380a7e0d0becfd8b:/src/rxhandlers.c

diff --git a/src/rxhandlers.c b/src/rxhandlers.c
index 493d040..19baded 100644
--- a/src/rxhandlers.c
+++ b/src/rxhandlers.c
@@ -48,7 +48,7 @@ faim_internal int aim__registermodule(struct aim_session_t *sess, int (*modfirst
   mod->next = (aim_module_t *)sess->modlistv;
   (aim_module_t *)sess->modlistv = mod;
 
-  faimdprintf(sess, 0, "registered module %s (family 0x%04x)\n", mod->name, mod->family);
+  faimdprintf(sess, 1, "registered module %s (family 0x%04x)\n", mod->name, mod->family);
 
   return 0;
 }
@@ -295,11 +295,11 @@ faim_internal int bleck(struct aim_session_t *sess,struct command_rx_struct *wor
 }
 
 faim_export int aim_conn_addhandler(struct aim_session_t *sess,
-			struct aim_conn_t *conn,
-			u_short family,
-			u_short type,
-			rxcallback_t newhandler,
-			u_short flags)
+				    struct aim_conn_t *conn,
+				    u_short family,
+				    u_short type,
+				    aim_rxcallback_t newhandler,
+				    u_short flags)
 {
   struct aim_rxcblist_t *newcb;
 
@@ -353,10 +353,10 @@ faim_export int aim_clearhandlers(struct aim_conn_t *conn)
  return 0;
 }
 
-faim_internal rxcallback_t aim_callhandler(struct aim_session_t *sess,
-					   struct aim_conn_t *conn,
-					   unsigned short family,
-					   unsigned short type)
+faim_internal aim_rxcallback_t aim_callhandler(struct aim_session_t *sess,
+					       struct aim_conn_t *conn,
+					       unsigned short family,
+					       unsigned short type)
 {
   struct aim_rxcblist_t *cur;
 
@@ -386,7 +386,7 @@ faim_internal int aim_callhandler_noparam(struct aim_session_t *sess,
 					  u_short type,
 					  struct command_rx_struct *ptr)
 {
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   userfunc = aim_callhandler(sess, conn, family, type);
   if (userfunc)
     return userfunc(sess, ptr);
@@ -487,89 +487,13 @@ faim_export int aim_rxdispatch(struct aim_session_t *sess)
       if ((workingPtr->handled = consumesnac(sess, workingPtr)))
 	continue;
 	  
-      family = aimutil_get16(workingPtr->data);
-      subtype = aimutil_get16(workingPtr->data+2);
-
-      if (family == 0x0001) {
-
-	if (subtype == 0x0001)
-	  workingPtr->handled = aim_parse_generalerrs(sess, workingPtr);
-	else if (subtype == 0x0003)
-	  workingPtr->handled = aim_parse_hostonline(sess, workingPtr);
-	else if (subtype == 0x0005)
-	  workingPtr->handled = aim_handleredirect_middle(sess, workingPtr);
-	else if (subtype == 0x0007)
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0001, 0x0007, workingPtr);
-	else if (subtype == 0x000a)
-	  workingPtr->handled = aim_parse_ratechange_middle(sess, workingPtr);
-	else if (subtype == 0x000f)
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0001, 0x000f, workingPtr);
-	else if (subtype == 0x0010)
-	  workingPtr->handled = aim_parse_evilnotify_middle(sess, workingPtr);
-	else if (subtype == 0x0013)
-	  workingPtr->handled = aim_parsemotd_middle(sess, workingPtr);
-	else if (subtype == 0x0018)
-	  workingPtr->handled = aim_parse_hostversions(sess, workingPtr);
-	else
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0001, 0xffff, workingPtr);
-
-      } else if (family == 0x0002) {
-
-	if (subtype == 0x0001)
-	    workingPtr->handled = aim_parse_locateerr(sess, workingPtr);
-	else if (subtype == 0x0003)
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0002, 0x0003, workingPtr);
-	else if (subtype == 0x0006)
-	  workingPtr->handled = aim_parse_userinfo_middle(sess, workingPtr);
-	else
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_LOC, AIM_CB_LOC_DEFAULT, workingPtr);
-
-      } else if (family == 0x0003) {
-
-	if (subtype == 0x0001)
-	  workingPtr->handled = aim_parse_generalerrs(sess, workingPtr);
-
-      } else if (family == 0x0004) {
-
-	if (subtype == 0x0001)
-	  workingPtr->handled = aim_parse_msgerror_middle(sess, workingPtr);
-	else if (subtype == 0x0005)
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0004, 0x0005, workingPtr);
-	else if (subtype == 0x0006)
-	  workingPtr->handled = aim_parse_outgoing_im_middle(sess, workingPtr);
-	else if (subtype == 0x0007)
-	  workingPtr->handled = aim_parse_incoming_im_middle(sess, workingPtr);
-	else if (subtype == 0x000a)
-	  workingPtr->handled = aim_parse_missedcall(sess, workingPtr);
-	else if (subtype == 0x000c)
-	  workingPtr->handled = aim_parse_msgack_middle(sess, workingPtr);
-	else
-	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_MSG, AIM_CB_MSG_DEFAULT, workingPtr);
-
-      } else if (family == 0x000d) {
-
-	if (subtype == 0x0009)
-	  workingPtr->handled = aim_chatnav_parse_info(sess, workingPtr);
-
-      } else if (family == 0x000e) {
-
-	if (subtype == 0x0002)
-	  workingPtr->handled = aim_chat_parse_infoupdate(sess, workingPtr);
-	else if (subtype == 0x0003)
-	  workingPtr->handled = aim_chat_parse_joined(sess, workingPtr);
-	else if (subtype == 0x0004)
-	  workingPtr->handled = aim_chat_parse_leave(sess, workingPtr);
-	else if (subtype == 0x0006)
-	  workingPtr->handled = aim_chat_parse_incoming(sess, workingPtr);
-
-      } else if (family == 0x0013) {
-
-	faimdprintf(sess, 0, "lalala: 0x%04x/0x%04x\n", family, subtype);
-
-      } else if (family == AIM_CB_FAM_SPECIAL) {
-
-	workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, family, subtype, workingPtr);
+      if (!workingPtr->handled) {
+	family = aimutil_get16(workingPtr->data);
+	subtype = aimutil_get16(workingPtr->data+2);
 
+	faimdprintf(sess, 1, "warning: unhandled packet %04x/%04x\n", family, subtype);
+	consumenonsnac(sess, workingPtr, 0xffff, 0xffff); /* last chance! */
+	workingPtr->handled = 1;
       }
     }
   }
@@ -587,266 +511,6 @@ faim_export int aim_rxdispatch(struct aim_session_t *sess)
   return 0;
 }
 
-faim_internal int aim_parse_msgack_middle(struct aim_session_t *sess, struct command_rx_struct *command)
-{
-  rxcallback_t userfunc = NULL;
-  char sn[MAXSNLEN];
-  unsigned short type;
-  int i = 10+8; /* skip SNAC and cookie */
-  int ret = 1;
-  unsigned char snlen;
-
-  type = aimutil_get16(command->data+i);
-  i += 2;
-
-  snlen = aimutil_get8(command->data+i);
-  i++;
-
-  memset(sn, 0, sizeof(sn));
-  strncpy(sn, (char *)command->data+i, snlen);
-
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0004, 0x000c)))
-    ret =  userfunc(sess, command, type, sn);
-
-  return ret;
-}
-
-/*
- * The Rate Limiting System, An Abridged Guide to Nonsense.
- *
- * OSCAR defines several 'rate classes'.  Each class has seperate
- * rate limiting properties (limit level, alert level, disconnect
- * level, etc), and a set of SNAC family/type pairs associated with
- * it.  The rate classes, their limiting properties, and the definitions
- * of which SNACs are belong to which class, are defined in the
- * Rate Response packet at login to each host.  
- *
- * Logically, all rate offenses within one class count against further
- * offenses for other SNACs in the same class (ie, sending messages
- * too fast will limit the number of user info requests you can send,
- * since those two SNACs are in the same rate class).
- *
- * Since the rate classes are defined dynamically at login, the values
- * below may change. But they seem to be fairly constant.
- *
- * Currently, BOS defines five rate classes, with the commonly used
- * members as follows...
- *
- *  Rate class 0x0001:
- *  	- Everything thats not in any of the other classes
- *
- *  Rate class 0x0002:
- * 	- Buddy list add/remove
- *	- Permit list add/remove
- *	- Deny list add/remove
- *
- *  Rate class 0x0003:
- *	- User information requests
- *	- Outgoing ICBMs
- *
- *  Rate class 0x0004:
- *	- A few unknowns: 2/9, 2/b, and f/2
- *
- *  Rate class 0x0005:
- *	- Chat room create
- *	- Outgoing chat ICBMs
- *
- * The only other thing of note is that class 5 (chat) has slightly looser
- * limiting properties than class 3 (normal messages).  But thats just a 
- * small bit of trivia for you.
- *
- * The last thing that needs to be learned about the rate limiting
- * system is how the actual numbers relate to the passing of time.  This
- * seems to be a big mystery.
- * 
- */
-faim_internal int aim_parse_ratechange_middle(struct aim_session_t *sess, struct command_rx_struct *command)
-{
-  rxcallback_t userfunc = NULL;
-  int ret = 1;
-  int i;
-  int code;
-  unsigned long rateclass, windowsize, clear, alert, limit, disconnect;
-  unsigned long currentavg, maxavg;
-
-  i = 10;
-
-  code = aimutil_get16(command->data+i);
-  i += 2;
-
-  rateclass = aimutil_get16(command->data+i);
-  i += 2;
-
-  windowsize = aimutil_get32(command->data+i);
-  i += 4;
-  clear = aimutil_get32(command->data+i);
-  i += 4;
-  alert = aimutil_get32(command->data+i);
-  i += 4;
-  limit = aimutil_get32(command->data+i);
-  i += 4;
-  disconnect = aimutil_get32(command->data+i);
-  i += 4;
-  currentavg = aimutil_get32(command->data+i);
-  i += 4;
-  maxavg = aimutil_get32(command->data+i);
-  i += 4;
-
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x000a)))
-    ret =  userfunc(sess, command, code, rateclass, windowsize, clear, alert, limit, disconnect, currentavg, maxavg);
-
-  return ret;
-}
-
-faim_internal int aim_parse_evilnotify_middle(struct aim_session_t *sess, struct command_rx_struct *command)
-{
-  rxcallback_t userfunc = NULL;
-  int ret = 1;
-  int i;
-  unsigned short newevil;
-  struct aim_userinfo_s userinfo;
-
-  i = 10;
-  newevil = aimutil_get16(command->data+10);
-  i += 2;
-
-  memset(&userinfo, 0, sizeof(struct aim_userinfo_s));
-  if (command->commandlen-i)
-    i += aim_extractuserinfo(sess, command->data+i, &userinfo);
-
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0010)))
-    ret = userfunc(sess, command, newevil, &userinfo);
-  
-  return ret;
-}
-
-faim_internal int aim_parsemotd_middle(struct aim_session_t *sess,
-				       struct command_rx_struct *command, ...)
-{
-  rxcallback_t userfunc = NULL;
-  char *msg;
-  int ret=1;
-  struct aim_tlvlist_t *tlvlist;
-  u_short id;
-
-  /*
-   * Code.
-   *
-   * Valid values:
-   *   1 Mandatory upgrade
-   *   2 Advisory upgrade
-   *   3 System bulletin
-   *   4 Nothing's wrong ("top o the world" -- normal)
-   *
-   */
-  id = aimutil_get16(command->data+10);
-
-  /* 
-   * TLVs follow 
-   */
-  if (!(tlvlist = aim_readtlvchain(command->data+12, command->commandlen-12)))
-    return ret;
-
-  if (!(msg = aim_gettlv_str(tlvlist, 0x000b, 1))) {
-    aim_freetlvchain(&tlvlist);
-    return ret;
-  }
-  
-  userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0013);
-  if (userfunc)
-    ret =  userfunc(sess, command, id, msg);
-
-  aim_freetlvchain(&tlvlist);
-  free(msg);
-
-  return ret;  
-}
-
-faim_internal int aim_parse_hostonline(struct aim_session_t *sess,
-				       struct command_rx_struct *command, ...)
-{
-  rxcallback_t userfunc = NULL;
-  int ret = 1;
-  unsigned short *families = NULL;
-  int famcount = 0, i;
-
-  famcount = (command->commandlen-10)/2;
-  if (!(families = malloc(command->commandlen-10)))
-    return ret;
-
-  for (i = 0; i < famcount; i++)
-    families[i] = aimutil_get16(command->data+((i*2)+10));
-
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0003)))
-    ret = userfunc(sess, command, famcount, families);
-
-  free(families);
-
-  return ret;  
-}
-
-faim_internal int aim_parse_hostversions(struct aim_session_t *sess,
-					 struct command_rx_struct *command, ...)
-{
-  rxcallback_t userfunc = NULL;
-  int ret = 1;
-  int vercount;
-
-  vercount = (command->commandlen-10)/4;
-  
-  if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0018)))
-    ret = userfunc(sess, command, vercount, command->data+10);
-
-  return ret;  
-}
-
-faim_internal int aim_handleredirect_middle(struct aim_session_t *sess,
-					    struct command_rx_struct *command, ...)
-{
-  int serviceid = 0;
-  unsigned char *cookie = NULL;
-  char *ip = NULL;
-  rxcallback_t userfunc = NULL;
-  struct aim_tlvlist_t *tlvlist;
-  int ret = 1;
-  
-  tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
-
-  if (aim_gettlv(tlvlist, 0x000d, 1))
-    serviceid = aim_gettlv16(tlvlist, 0x000d, 1);
-  if (aim_gettlv(tlvlist, 0x0005, 1))
-    ip = aim_gettlv_str(tlvlist, 0x0005, 1);
-  if (aim_gettlv(tlvlist, 0x0006, 1))
-    cookie = aim_gettlv_str(tlvlist, 0x0006, 1);
-
-  if ((serviceid == AIM_CONN_TYPE_CHAT) && sess->pendingjoin) {
-
-    /*
-     * Chat hack.
-     *
-     */
-    if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0005)))
-      ret =  userfunc(sess, command, serviceid, ip, cookie, sess->pendingjoin, (int)sess->pendingjoinexchange);
-      free(sess->pendingjoin);
-      sess->pendingjoin = NULL;
-      sess->pendingjoinexchange = 0;
-  } else if (!serviceid || !ip || !cookie) { /* yeep! */
-    ret = 1;
-  } else {
-    if ((userfunc = aim_callhandler(sess, command->conn, 0x0001, 0x0005)))
-      ret =  userfunc(sess, command, serviceid, ip, cookie);
-  }
-
-  if (ip)
-    free(ip);
-  if (cookie)
-    free(cookie);
-
-  aim_freetlvchain(&tlvlist);
-
-  return ret;
-}
-
 faim_internal int aim_parse_unknown(struct aim_session_t *sess,
 					  struct command_rx_struct *command, ...)
 {
@@ -877,7 +541,7 @@ faim_internal int aim_negchan_middle(struct aim_session_t *sess,
   struct aim_tlvlist_t *tlvlist;
   char *msg = NULL;
   unsigned short code = 0;
-  rxcallback_t userfunc = NULL;
+  aim_rxcallback_t userfunc = NULL;
   int ret = 1;
 
   /* Used only by the older login protocol */
@@ -904,32 +568,3 @@ faim_internal int aim_negchan_middle(struct aim_session_t *sess,
   return ret;
 }
 
-/*
- * aim_parse_generalerrs()
- *
- * Middle handler for 0x0001 snac of each family.
- *
- */
-faim_internal int aim_parse_generalerrs(struct aim_session_t *sess,
-					struct command_rx_struct *command, ...)
-{
-  unsigned short family;
-  unsigned short subtype;
-  int ret = 1;
-  int error = 0;
-  rxcallback_t userfunc = NULL;
-  
-  family = aimutil_get16(command->data+0);
-  subtype= aimutil_get16(command->data+2);
-  
-  if (command->commandlen > 10)
-    error = aimutil_get16(command->data+10);
-
-  if ((userfunc = aim_callhandler(sess, command->conn, family, subtype))) 
-    ret = userfunc(sess, command, error);
-
-  return ret;
-}
-
-
-