* 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;
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,
rxcallback_t newhandler,
u_short flags)
{
- struct aim_rxcblist_t *new,*cur;
+ struct aim_rxcblist_t *newcb;
if (!conn)
return -1;
faimdprintf(1, "aim_conn_addhandler: adding for %04x/%04x\n", family, type);
- new = (struct aim_rxcblist_t *)calloc(1, sizeof(struct aim_rxcblist_t));
- new->family = family;
- new->type = type;
- new->flags = flags;
+ if (!(newcb = (struct aim_rxcblist_t *)calloc(1, sizeof(struct aim_rxcblist_t))))
+ return -1;
+ newcb->family = family;
+ newcb->type = type;
+ newcb->flags = flags;
if (!newhandler)
- new->handler = &bleck;
+ newcb->handler = &bleck;
else
- new->handler = newhandler;
- new->next = NULL;
+ newcb->handler = newhandler;
+ newcb->next = NULL;
- cur = conn->handlerlist;
- if (!cur)
- conn->handlerlist = new;
- else
- {
- while (cur->next)
- cur = cur->next;
- cur->next = new;
- }
+ if (!conn->handlerlist)
+ conn->handlerlist = newcb;
+ else {
+ struct aim_rxcblist_t *cur;
+
+ cur = conn->handlerlist;
+
+ while (cur->next)
+ cur = cur->next;
+ cur->next = newcb;
+ }
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;
+ struct aim_rxcblist_t *cur;
+
if (!conn)
return -1;
cur = conn->handlerlist;
- while(cur)
- {
- tmp = cur->next;
- free(cur);
- cur = tmp;
- }
+ while(cur) {
+ struct aim_rxcblist_t *tmp;
+
+ tmp = cur->next;
+ free(cur);
+ cur = tmp;
+ }
+
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;
if (type==0xffff)
return NULL;
+
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);
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;
workingPtr->handled = 1;
break;
case AIM_CONN_TYPE_AUTH: {
- u_long head;
+ unsigned long head;
head = aimutil_get32(workingPtr->data);
- if (head == 0x00000001) {
+ if ((head == 0x00000001) && (workingPtr->commandlen == 4)) {
faimdprintf(1, "got connection ack on auth line\n");
- workingPtr->handled = 1;
- } else if (workingPtr->hdr.oscar.type == 0x0004) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
+ } else if (workingPtr->hdr.oscar.type == 0x04) {
+ /* Used only by the older login protocol */
workingPtr->handled = aim_authparse(sess, workingPtr);
} else {
- u_short family,subtype;
+ unsigned short family,subtype;
family = aimutil_get16(workingPtr->data);
subtype = aimutil_get16(workingPtr->data+2);
/* Old login protocol */
/* any user callbacks will be called from here */
workingPtr->handled = aim_authparse(sess, workingPtr);
- break;
#endif
+ break;
}
}
break;
switch (family) {
case 0x0000: /* not really a family, but it works */
if (subtype == 0x0001)
- workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0000, 0x0001, workingPtr);
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
else
workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_UNKNOWN, workingPtr);
break;
u_short subtype;
family = aimutil_get16(workingPtr->data);
subtype= aimutil_get16(workingPtr->data+2);
-
- if ((family == 0x0002) && (subtype == 0x0006)) {
- workingPtr->handled = 1;
- aim_conn_setstatus(workingPtr->conn, AIM_CONN_STATUS_READY);
+
+ if ((family == 0x0000) && (subtype == 0x00001)) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
} else if ((family == 0x000d) && (subtype == 0x0009)) {
workingPtr->handled = aim_chatnav_parse_info(sess, workingPtr);
} else {
family = aimutil_get16(workingPtr->data);
subtype= aimutil_get16(workingPtr->data+2);
- if ((family == 0x0000) && (subtype == 0x00001))
- workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0000, 0x0001, workingPtr);
- else if (family == 0x0001) {
+ if ((family == 0x0000) && (subtype == 0x00001)) {
+ workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, workingPtr);
+ } else if (family == 0x0001) {
if (subtype == 0x0001)
workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0001, 0x0001, workingPtr);
else if (subtype == 0x0003)
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];
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);
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;
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;
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;
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;
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;
+ if (!sess || !command)
+ return 1;
+
faimdprintf(1, "\nRecieved unknown packet:");
for (i = 0; i < command->commandlen; i++)
}
-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;
* 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;