X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/98c88242811131668c416faa1e8775b1ff386a88..999b6d5f9b44b76b9597aecbe29e8d1a16ca137d:/aim_rxhandlers.c

diff --git a/aim_rxhandlers.c b/aim_rxhandlers.c
index bf83e61..91db4a0 100644
--- a/aim_rxhandlers.c
+++ b/aim_rxhandlers.c
@@ -13,7 +13,7 @@
  * Bleck functions get called when there's no non-bleck functions
  * around to cleanup the mess...
  */
-int bleck(struct aim_session_t *sess,struct command_rx_struct *workingPtr, ...)
+faim_internal int bleck(struct aim_session_t *sess,struct command_rx_struct *workingPtr, ...)
 {
   u_short family;
   u_short subtype;
@@ -181,7 +181,7 @@ int bleck(struct aim_session_t *sess,struct command_rx_struct *workingPtr, ...)
   return 1;
 }
 
-int aim_conn_addhandler(struct aim_session_t *sess,
+faim_export int aim_conn_addhandler(struct aim_session_t *sess,
 			struct aim_conn_t *conn,
 			u_short family,
 			u_short type,
@@ -218,7 +218,7 @@ int aim_conn_addhandler(struct aim_session_t *sess,
   return 0;
 }
 
-int aim_clearhandlers(struct aim_conn_t *conn)
+faim_export int aim_clearhandlers(struct aim_conn_t *conn)
 {
  struct aim_rxcblist_t *cur,*tmp;
  if (!conn)
@@ -234,9 +234,9 @@ int aim_clearhandlers(struct aim_conn_t *conn)
  return 0;
 }
 
-rxcallback_t aim_callhandler(struct aim_conn_t *conn,
-		    u_short family,
-		    u_short type)
+faim_internal rxcallback_t aim_callhandler(struct aim_conn_t *conn,
+					 u_short family,
+					 u_short type)
 {
   struct aim_rxcblist_t *cur;
 
@@ -258,11 +258,11 @@ rxcallback_t aim_callhandler(struct aim_conn_t *conn,
   return aim_callhandler(conn, family, 0xffff);
 }
 
-int aim_callhandler_noparam(struct aim_session_t *sess,
-			    struct aim_conn_t *conn,
-			    u_short family,
-			    u_short type,
-			    struct command_rx_struct *ptr)
+faim_internal int aim_callhandler_noparam(struct aim_session_t *sess,
+					  struct aim_conn_t *conn,
+					  u_short family,
+					  u_short type,
+					  struct command_rx_struct *ptr)
 {
   rxcallback_t userfunc = NULL;
   userfunc = aim_callhandler(conn, family, type);
@@ -294,7 +294,7 @@ int aim_callhandler_noparam(struct aim_session_t *sess,
   TODO: Allow for NULL handlers.
   
  */
-int aim_rxdispatch(struct aim_session_t *sess)
+faim_export int aim_rxdispatch(struct aim_session_t *sess)
 {
   int i = 0;
   struct command_rx_struct *workingPtr = NULL;
@@ -376,8 +376,8 @@ int aim_rxdispatch(struct aim_session_t *sess)
            /* Old login protocol */
            /* any user callbacks will be called from here */
            workingPtr->handled = aim_authparse(sess, workingPtr);
-	    break;
 #endif
+	    break;
 	  }
 	}
 	break;
@@ -431,10 +431,11 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_GEN, AIM_CB_GEN_DEFAULT, workingPtr);
 	    break;
 	  }
+	  break;
 	case 0x0002: /* Family: Location */
 	  switch (subtype) {
 	  case 0x0001:
-	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0002, 0x0001, workingPtr);
+	    workingPtr->handled = aim_parse_locateerr(sess, workingPtr);
 	    break;
 	  case 0x0003:
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0002, 0x0003, workingPtr);
@@ -446,13 +447,14 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_LOC, AIM_CB_LOC_DEFAULT, workingPtr);
 	    break;
 	  }
+	  break;
 	case 0x0003: /* Family: Buddy List */
 	  switch (subtype) {
 	  case 0x0001:
 	    workingPtr->handled = aim_parse_generalerrs(sess, workingPtr);
 	    break;
 	  case 0x0003:
-	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0003, 0x0003, workingPtr);
+	    workingPtr->handled = aim_parse_buddyrights(sess, workingPtr);
 	    break;
 	  case 0x000b: /* oncoming buddy */
 	    workingPtr->handled = aim_parse_oncoming_middle(sess, workingPtr);
@@ -479,7 +481,7 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	    workingPtr->handled = aim_parse_incoming_im_middle(sess, workingPtr);
 	    break;
 	  case 0x000a:
-	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0004, 0x000a, workingPtr);
+	    workingPtr->handled = aim_parse_missedcall(sess, workingPtr);
 	    break;
 	  case 0x000c:
 	    workingPtr->handled = aim_parse_msgack_middle(sess, workingPtr);
@@ -492,7 +494,7 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	  if (subtype == 0x0001)
 	    workingPtr->handled = aim_parse_generalerrs(sess, workingPtr);
 	  else if (subtype == 0x0003)
-	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0009, 0x0003, workingPtr);
+	    workingPtr->handled = aim_parse_bosrights(sess, workingPtr);
 	  else
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_BOS, AIM_CB_BOS_DEFAULT, workingPtr);
 	  break;
@@ -508,7 +510,7 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_LOK, AIM_CB_LOK_DEFAULT, workingPtr);
 	  }
 	  break;
-	case 0x000b:
+	case 0x000b: {
 	  if (subtype == 0x0001)
 	    workingPtr->handled = aim_parse_generalerrs(sess, workingPtr);
 	  else if (subtype == 0x0002)
@@ -516,15 +518,16 @@ int aim_rxdispatch(struct aim_session_t *sess)
 	  else
 	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_STS, AIM_CB_STS_DEFAULT, workingPtr);
 	  break;
-      case AIM_CB_FAM_SPECIAL: 
-	workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, family, subtype, workingPtr);
-	break;
+	}
+	case AIM_CB_FAM_SPECIAL: 
+	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, family, subtype, workingPtr);
+	  break;
 	default:
 	  workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_UNKNOWN, workingPtr);
 	  break;
-	}
+	} /* switch(family) */
 	break;
-      }
+      } /* AIM_CONN_TYPE_BOS */
       case AIM_CONN_TYPE_CHATNAV: {
 	u_short family;
 	u_short subtype;
@@ -611,7 +614,7 @@ int aim_rxdispatch(struct aim_session_t *sess)
   return 0;
 }
 
-int aim_parse_msgack_middle(struct aim_session_t *sess, struct command_rx_struct *command)
+faim_internal int aim_parse_msgack_middle(struct aim_session_t *sess, struct command_rx_struct *command)
 {
   rxcallback_t userfunc = NULL;
   char sn[MAXSNLEN];
@@ -627,7 +630,7 @@ int aim_parse_msgack_middle(struct aim_session_t *sess, struct command_rx_struct
   i++;
 
   memset(sn, 0, sizeof(sn));
-  strncpy(sn, command->data+i, snlen);
+  strncpy(sn, (char *)command->data+i, snlen);
 
   if ((userfunc = aim_callhandler(command->conn, 0x0004, 0x000c)))
     ret =  userfunc(sess, command, type, sn);
@@ -635,7 +638,7 @@ int aim_parse_msgack_middle(struct aim_session_t *sess, struct command_rx_struct
   return ret;
 }
 
-int aim_parse_ratechange_middle(struct aim_session_t *sess, struct command_rx_struct *command)
+faim_internal int aim_parse_ratechange_middle(struct aim_session_t *sess, struct command_rx_struct *command)
 {
   rxcallback_t userfunc = NULL;
   int ret = 1;
@@ -654,7 +657,7 @@ int aim_parse_ratechange_middle(struct aim_session_t *sess, struct command_rx_st
   return ret;
 }
 
-int aim_parse_evilnotify_middle(struct aim_session_t *sess, struct command_rx_struct *command)
+faim_internal int aim_parse_evilnotify_middle(struct aim_session_t *sess, struct command_rx_struct *command)
 {
   rxcallback_t userfunc = NULL;
   int ret = 1, pos;
@@ -674,11 +677,13 @@ int aim_parse_evilnotify_middle(struct aim_session_t *sess, struct command_rx_st
   if ((userfunc = aim_callhandler(command->conn, 0x0001, 0x0010)))
     ret = userfunc(sess, command, sn);
   
+  free(sn);
+
   return ret;
 }
 
-int aim_parsemotd_middle(struct aim_session_t *sess,
-			 struct command_rx_struct *command, ...)
+faim_internal int aim_parsemotd_middle(struct aim_session_t *sess,
+				       struct command_rx_struct *command, ...)
 {
   rxcallback_t userfunc = NULL;
   char *msg;
@@ -719,12 +724,12 @@ int aim_parsemotd_middle(struct aim_session_t *sess,
   return ret;  
 }
 
-int aim_handleredirect_middle(struct aim_session_t *sess,
+faim_internal int aim_handleredirect_middle(struct aim_session_t *sess,
 			      struct command_rx_struct *command, ...)
 {
   struct aim_tlv_t *tmptlv = NULL;
   int serviceid = 0x00;
-  char cookie[AIM_COOKIELEN];
+  unsigned char cookie[AIM_COOKIELEN];
   char *ip = NULL;
   rxcallback_t userfunc = NULL;
   struct aim_tlvlist_t *tlvlist;
@@ -786,8 +791,8 @@ int aim_handleredirect_middle(struct aim_session_t *sess,
   return ret;
 }
 
-int aim_parse_unknown(struct aim_session_t *sess,
-		      struct command_rx_struct *command, ...)
+faim_internal int aim_parse_unknown(struct aim_session_t *sess,
+					  struct command_rx_struct *command, ...)
 {
   u_int i = 0;
 
@@ -807,8 +812,8 @@ int aim_parse_unknown(struct aim_session_t *sess,
 }
 
 
-int aim_negchan_middle(struct aim_session_t *sess,
-		       struct command_rx_struct *command)
+faim_internal int aim_negchan_middle(struct aim_session_t *sess,
+				     struct command_rx_struct *command)
 {
   struct aim_tlvlist_t *tlvlist;
   char *msg = NULL;
@@ -842,8 +847,8 @@ int aim_negchan_middle(struct aim_session_t *sess,
  * Middle handler for 0x0001 snac of each family.
  *
  */
-int aim_parse_generalerrs(struct aim_session_t *sess,
-			  struct command_rx_struct *command, ...)
+faim_internal int aim_parse_generalerrs(struct aim_session_t *sess,
+					struct command_rx_struct *command, ...)
 {
   u_short family;
   u_short subtype;