Changeset 4485285 for aim.c

Timestamp:

Jan 12, 2013, 1:43:31 PM (12 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Parents:

4626016 (diff), 7869e48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 7869e4801e577613b7db987d11bddb0a31fe755c into 46260161946c87dfed4fef9e3223b2327895f139

File:

• aim.c (modified) (70 diffs)

aim.c

@@ -107 +107 @@
    * future.  It's still called by Owl.
    */
-     
+
 }
 
@@ -131 +131 @@
   aim_setdebuggingcb(sess, faimtest_debugcb);
   aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
-  
+
   /* this will leak, I know and just don't care right now */
   priv=g_new0(struct owlfaim_priv, 1);
@@ -165 +165 @@
   */
 
-    
+
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0);
   aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
@@ -174 +174 @@
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0); */
   /* aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0); */
-    
+
   /* start processing AIM events */
   owl_global_set_doaimevents(&g);
@@ -338 +338 @@
 
   owl_function_debugmsg("owl_aim_search: doing search for %s", email);
-  ret=aim_search_address(owl_global_get_aimsess(&g), 
+  ret=aim_search_address(owl_global_get_aimsess(&g),
                          aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_BOS),
                          email);
@@ -358 +358 @@
     len=499;
   }
-    
+
   aim_locate_setprofile(owl_global_get_aimsess(&g),
                         NULL, NULL, 0,
@@ -367 +367 @@
   aim_bos_setprofile(owl_global_get_aimsess(&g),
                      owl_global_get_bosconn(&g),
-                     NULL, NULL, 0, "us-ascii", msg, 
+                     NULL, NULL, 0, "us-ascii", msg,
                      strlen(msg), 0);
   */
@@ -421 +421 @@
                                aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV), name, exchange);
    ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, name, 0x0000);
-  
+
 }
 
@@ -468 +468 @@
   if (selstat == -1) {
     owl_aim_logged_out();
-  } else if (selstat == 0) { 
+  } else if (selstat == 0) {
     /* no events pending */
   } else if (selstat == 1) { /* outgoing data pending */
@@ -474 +474 @@
   } else if (selstat == 2) { /* incoming data pending */
     /* printf("selstat == 2\n"); */
-    
+
     if (aim_get_command(aimsess, waitingconn) >= 0) {
       aim_rxdispatch(aimsess);
@@ -510 +510 @@
   struct owlfaim_priv *priv = sess->aux_data;
   struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
-    
+
   const char *key;
   va_list ap;
@@ -519 +519 @@
 
   aim_send_login(sess, fr->conn, priv->screenname, priv->password, &info, key);
-  
+
   return(1);
 }
@@ -649 +649 @@
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOK, 0x0003, faimtest_parse_searchreply, 0);
   */
-  
+
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR,              faimtest_parse_msgerr, 0);
   aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO,           faimtest_parse_userinfo, 0);
@@ -733 +733 @@
   fu16_t code;
   const char *msg;
-  
+
   va_start(ap, fr);
   code = va_arg(ap, int);
   msg = va_arg(ap, const char *);
   va_end(ap);
-  
+
   owl_function_error("faimtest_parse_connerr: Code 0x%04x: %s\n", code, msg);
   aim_conn_kill(sess, &fr->conn); /* this will break the main loop */
-  
+
   priv->connected = 0;
-  
+
   return 1;
 }
@@ -751 +751 @@
   int status;
   va_list ap;
-  
+
   va_start(ap, fr);
   status = va_arg(ap, int); /* status code of confirmation request */
@@ -758 +758 @@
   /* owl_function_debugmsg("faimtest_accountconfirm: Code 0x%04x: %s\n", code, msg); */
   owl_function_debugmsg("faimtest_accountconfirm: account confirmation returned status 0x%04x (%s)\n", status, (status==0x0000)?"email sent":"unknown");
-  
+
   return 1;
 }
@@ -768 +768 @@
   const char *val;
   va_list ap;
-  
+
   va_start(ap, fr);
   change = va_arg(ap, int);
@@ -777 +777 @@
   str = va_arg(ap, int);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_infochange: info%s: perms = %d, type = %x, length = %d, val = %s", change?" change":"", perms, type, length, str?val:"(not string)");
-  
+
   return(1);
 }
@@ -790 +790 @@
 
   owl_function_debugmsg("faimtest_handledirect:");
-  
+
   va_start(ap, fr);
   redir = va_arg(ap, struct aim_redirect_data *);
-  
+
   if (redir->group == 0x0005) {  /* Adverts */
-    
+
   } else if (redir->group == 0x0007) {  /* Authorizer */
     aim_conn_t *tstconn;
 
     owl_function_debugmsg("faimtest_handledirect: autorizer");
-    
+
     tstconn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, redir->ip);
     if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
@@ -832 +832 @@
   struct aim_icbmparameters *params;
   va_list ap;
-  
+
   va_start(ap, fr);
   params = va_arg(ap, struct aim_icbmparameters *);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08x, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %u",
                        params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
-     
+
   /*
   * Set these to your taste, or client medium.  Setting minmsginterval
@@ -850 +850 @@
   /* aim_seticbmparam(sess, params); */
   aim_im_setparams(sess, params);
-  
+
   return 1;
 }
@@ -858 +858 @@
   va_list ap;
   fu16_t maxbuddies, maxwatchers;
-  
+
   va_start(ap, fr);
   maxbuddies = va_arg(ap, int);
   maxwatchers = va_arg(ap, int);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_parse_buddyrights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers);
-  
+
   /* aim_ssi_reqrights(sess, fr->conn); */
   aim_ssi_reqrights(sess);
-  
+
   return 1;
 }
@@ -876 +876 @@
   va_list ap;
   fu16_t maxpermits, maxdenies;
-  
+
   va_start(ap, fr);
   maxpermits = va_arg(ap, int);
   maxdenies = va_arg(ap, int);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_bosrights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies);
   aim_clientready(sess, fr->conn);
@@ -893 +893 @@
   va_list ap;
   fu16_t maxsiglen;
-  
+
   va_start(ap, fr);
   maxsiglen = va_arg(ap, int);
@@ -899 +899 @@
 
   owl_function_debugmsg("faimtest_locrights: rights: max signature length = %d\n", maxsiglen);
-  
+
   return(1);
 }
@@ -944 +944 @@
 
   owl_function_debugmsg("faimtest_parse_motd: %s (%d / %s)\n", msg?msg:"nomsg", id, (id < codeslen)?codes[id]:"unknown");
-  
+
   return 1;
 }
@@ -960 +960 @@
   if (flags & AIM_FLAG_WIRELESS) printf("WIRELESS ");
   if (flags & AIM_FLAG_ACTIVEBUDDY) printf("ACTIVEBUDDY ");
-  
+
   return;
 }
@@ -1073 +1073 @@
 static int faimtest_parse_incoming_im_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args)
 {
-  /* 
+  /*
   printf("rendezvous: source sn = %s\n", userinfo->sn);
   printf("rendezvous: \twarnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
@@ -1079 +1079 @@
   printuserflags(userinfo->flags);
   printf("\n");
-  
+
   printf("rendezvous: \tonlinesince = %lu\n", userinfo->onlinesince);
   printf("rendezvous: \tidletime = 0x%04x\n", userinfo->idletime);
-  
+
   printf("rendezvous: message/description = %s\n", args->msg);
   printf("rendezvous: encoding = %s\n", args->encoding);
   printf("rendezvous: language = %s\n", args->language);
   */
-  
+
   if (args->reqclass == AIM_CAPS_SENDFILE) {
     owl_function_debugmsg("faimtest_parse_incoming_im_chan2: send file!");
@@ -1119 +1119 @@
   va_list ap;
   int ret = 0;
-  
+
   va_start(ap, fr);
   channel = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
-  
+
   if (channel == 1) {
     struct aim_incomingim_ch1_args *args;
@@ -1151 +1151 @@
 
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
-  
+
   owl_buddylist_oncoming(owl_global_get_buddylist(&g), nz_screenname);
 
@@ -1173 +1173 @@
     owl_function_debugmsg("parse_oncoming sn: %s away flag!", userinfo->sn);
   }
-  
+
   owl_function_debugmsg("parse_oncoming sn: %s idle: %i", userinfo->sn, userinfo->idletime);
-    
+
   g_free(nz_screenname);
-  
+
   /*
     printf("%ld  %s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = %s = 0x%08lx)\n",
@@ -1201 +1201 @@
   char *nz_screenname;
   va_list ap;
-  
+
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);
@@ -1229 +1229 @@
          userinfo->capabilities);
   */
-  
+
   return 1;
 }
@@ -1238 +1238 @@
   va_list ap;
   fu16_t reason;
-  
+
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
-  
+
   /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
-  
+
   return 1;
 }
@@ -1254 +1254 @@
   const char *destsn;
   fu16_t reason;
-  
+
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
-  
+
   /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
@@ -1266 +1266 @@
     owl_function_adminmsg("", "Could not send AIM message, user not logged on");
   }
-  
+
   return 1;
 }
@@ -1275 +1275 @@
   const char *destsn;
   fu16_t reason;
-  
+
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
   destsn = va_arg(ap, const char *);
   va_end(ap);
-  
+
   /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
   if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
-  
+
   return 1;
 }
@@ -1297 +1297 @@
   };
   static int missedreasonslen = 5;
-  
+
   va_list ap;
   fu16_t chan, nummissed, reason;
   aim_userinfo_t *userinfo;
-  
+
   va_start(ap, fr);
   chan = (fu16_t)va_arg(ap, unsigned int);
@@ -1308 +1308 @@
   reason = (fu16_t)va_arg(ap, unsigned int);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_parse_misses: missed %d messages from %s on channel %d (reason %d: %s)\n", nummissed, userinfo->sn, chan, reason, (reason<missedreasonslen)?missedreasons[reason]:"unknown");
-  
+
   return 1;
 }
@@ -1322 +1322 @@
   fu16_t type;
   const char *sn = NULL;
-  
+
   va_start(ap, fr);
   type = (fu16_t)va_arg(ap, unsigned int);
   sn = va_arg(ap, const char *);
   va_end(ap);
-  
+
   owl_function_debugmsg("faimtest_parse_msgack: 0x%04x / %s\n", type, sn);
-  
+
   return 1;
 }
@@ -1346 +1346 @@
   fu32_t windowsize, clear, alert, limit, disconnect;
   fu32_t currentavg, maxavg;
-  
-  va_start(ap, fr); 
-  
+
+  va_start(ap, fr);
+
   /* See code explanations below */
   code = (fu16_t)va_arg(ap, unsigned int);
-  
+
   /*
    * See comments above aim_parse_ratechange_middle() in aim_rxhandlers.c.
    */
   rateclass = (fu16_t)va_arg(ap, unsigned int);
-  
-  /*
-   * Not sure what this is exactly.  I think its the temporal 
+
+  /*
+   * Not sure what this is exactly.  I think its the temporal
    * relation factor (ie, how to make the rest of the numbers
-   * make sense in the real world). 
+   * make sense in the real world).
    */
   windowsize = va_arg(ap, fu32_t);
-  
+
   /* Explained below */
   clear = va_arg(ap, fu32_t);
@@ -1371 +1371 @@
   currentavg = va_arg(ap, fu32_t);
   maxavg = va_arg(ap, fu32_t);
-  
-  va_end(ap);
-  
+
+  va_end(ap);
+
   owl_function_debugmsg("faimtest_parse_ratechange: rate %s (rate class 0x%04x): curavg = %u, maxavg = %u, alert at %u, clear warning at %u, limit at %u, disconnect at %u (window size = %u)",
                         (code < 5)?codes[code]:"invalid",
@@ -1389 +1389 @@
   fu16_t newevil;
   aim_userinfo_t *userinfo;
-  
+
   va_start(ap, fr);
   newevil = (fu16_t)va_arg(ap, unsigned int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
-  
+
   /*
    * Evil Notifications that are lacking userinfo->sn are anon-warns
@@ -1404 +1404 @@
    */
   owl_function_debugmsg("faimtest_parse_evilnotify: new value = %2.1f%% (caused by %s)\n", ((float)newevil)/10, (userinfo && strlen(userinfo->sn))?userinfo->sn:"anonymous");
-  
+
   return 1;
 }
@@ -1414 +1414 @@
   int num, i;
   GPtrArray *list;
-  
+
   va_start(ap, fr);
   address = va_arg(ap, const char *);
@@ -1422 +1422 @@
 
   list = g_ptr_array_new();
-  
+
   owl_function_debugmsg("faimtest_parse_searchreply: E-Mail Search Results for %s: ", address);
   for (i=0; i<num; i++) {
@@ -1437 +1437 @@
   va_list ap;
   const char *address;
-  
+
   va_start(ap, fr);
   address = va_arg(ap, const char *);
@@ -1444 +1444 @@
   owl_function_error("No results searching for %s", address);
   owl_function_debugmsg("faimtest_parse_searcherror: E-Mail Search Results for %s: No Results or Invalid Email\n", address);
-  
+
   return(1);
 }
@@ -1453 +1453 @@
   const char *msg, *url;
   fu16_t width, height, delay;
-  
+
   va_start(ap, fr);
   msg = va_arg(ap, const char *);
@@ -1461 +1461 @@
   delay = va_arg(ap, unsigned int);
   va_end(ap);
-  
+
   owl_function_debugmsg("handlepopup: (%dx%x:%d) %s (%s)\n", width, height, delay, msg, url);
-  
+
   return 1;
 }
@@ -1479 +1479 @@
   const char *bosip;
   fu8_t *cookie;
-  
+
   va_start(ap, fr);
   bosip = va_arg(ap, const char *);
   cookie = va_arg(ap, fu8_t *);
   va_end(ap);
-  
+
   owl_function_debugmsg("migrate: migration in progress -- new BOS is %s -- disconnecting", bosip);
   aim_conn_kill(sess, &fr->conn);
-  
+
   if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, bosip))) {
     owl_function_debugmsg("migrate: could not connect to BOS: internal error");
     return 1;
-  } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {       
+  } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
     owl_function_debugmsg("migrate: could not connect to BOS");
     aim_conn_kill(sess, &bosconn);
     return 1;
   }
-  
+
   /* Login will happen all over again. */
   addcb_bos(sess, bosconn);
@@ -1508 +1508 @@
   /* aim_ssi_reqdata(sess, fr->conn, 0, 0x0000); */
   aim_ssi_reqdata(sess);
-  
+
   return(1);
 }
@@ -1523 +1523 @@
   struct aim_ssi_item *l;
   */
-  
+
   va_start(ap, fr);
   fmtver = va_arg(ap, unsigned int);
@@ -1530 +1530 @@
   list = va_arg(ap, struct aim_ssi_item *);
   va_end(ap);
-  
+
   owl_function_debugmsg("ssiddata: got SSI data (0x%02x, %d items, %u)", fmtver, itemcount, stamp);
   /*
@@ -1540 +1540 @@
   */
   aim_ssi_enable(sess);
-  
+
   return 1;
 }
@@ -1556 +1556 @@
   va_list ap;
   struct aim_icq_offlinemsg *msg;
-  
+
   va_start(ap, fr);
   msg = va_arg(ap, struct aim_icq_offlinemsg *);
   va_end(ap);
-  
+
   if (msg->type == 0x0001) {
     owl_function_debugmsg("offlinemsg: from %u at %d/%d/%d %02d:%02d : %s", msg->sender, msg->year, msg->month, msg->day, msg->hour, msg->minute, msg->msg);
@@ -1586 +1586 @@
   int count;
   /* int i; */
-  
+
   va_start(ap, fr);
   count = va_arg(ap, int);
@@ -1608 +1608 @@
   /* int i; */
 
-  
+
   va_start(ap, fr);
   count = va_arg(ap, int);
   userinfo = va_arg(ap, aim_userinfo_t *);
   va_end(ap);
-  
+
   /*
     printf("chat: %s:  Some occupants have left:\n", aim_chat_getname(fr->conn));
-    
+
     for (i = 0; i < count; i++)
     printf("chat: %s: \t%s\n", aim_chat_getname(fr->conn), userinfo[i].sn);
@@ -1635 +1635 @@
   const char *croomname;
   /* int i; */
-  
+
   croomname = aim_chat_getname(fr->conn);
-  
+
   va_start(ap, fr);
   roominfo = va_arg(ap, struct aim_chat_roominfo *);
@@ -1662 +1662 @@
   for (i = 0; i < usercount; i++)
     printf("chat: %s:  \t\t%s\n", croomname, userinfo[i].sn);
-  
-  owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n", 
+
+  owl_function_debugmsg("chat: %s:  \tRoom flags: 0x%04x (%s%s%s%s)\n",
          croomname, flags,
          (flags & AIM_CHATROOM_FLAG_EVILABLE) ? "Evilable, " : "",
@@ -1675 +1675 @@
   printf("chat: %s:  \tMax visible message length: %d bytes\n", croomname, maxvisiblemsglen);
   */
-  
+
   return(1);
 }
@@ -1685 +1685 @@
   const char *msg;
   char tmpbuf[1152];
-  
-  va_start(ap, fr);
-  userinfo = va_arg(ap, aim_userinfo_t *);      
+
+  va_start(ap, fr);
+  userinfo = va_arg(ap, aim_userinfo_t *);
   msg = va_arg(ap, const char *);
   va_end(ap);
@@ -1696 +1696 @@
   printf("chat: %s: incoming msg from %s: %s\n", aim_chat_getname(fr->conn), userinfo->sn, msg);
   */
-  
+
   /*
    * Do an echo for testing purposes.  But not for ourselves ("oops!")
@@ -1704 +1704 @@
     aim_chat_send_im(sess, fr->conn, 0, tmpbuf, strlen(tmpbuf));
   }
-  
+
   return 1;
 }
@@ -1717 +1717 @@
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0);
   aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0);
-  
+
   aim_clientready(sess, fr->conn);
-  
+
   owl_function_debugmsg("Chat ready");
 
@@ -1735 +1735 @@
 
   owl_function_debugmsg("in faimtest_chatnav_redirect");
-  
+
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
@@ -1743 +1743 @@
     return;
   }
-  
+
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
@@ -1757 +1757 @@
 
   owl_function_debugmsg("in chat_redirect");
-  
+
   tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, redir->ip);
   if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
     /* printf("unable to connect to chat server\n"); */
     if (tstconn) aim_conn_kill(sess, &tstconn);
-    return; 
-  }             
+    return;
+  }
   /* printf("chat: connected to %s instance %d on exchange %d\n", redir->chat.room, redir->chat.instance, redir->chat.exchange); */
-  
+
   /*
    * We must do this to attach the stored name to the connection!
@@ -1773 +1773 @@
   aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
   aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
-  return;       
+  return;
 }