Changes in libfaim/chat.c [cf02dd6:7869e48]

File:

• libfaim/chat.c (modified) (27 diffs)

libfaim/chat.c

@@ -5 +5 @@
 
 #define FAIM_INTERNAL
-#include <aim.h> 
+#include <aim.h>
 
 #include <string.h>
@@ -93 +93 @@
 
         buflen = 2 + 1 + strlen(roomname) + 2;
-        
+
         if (!(buf = malloc(buflen)))
                 return 0;
@@ -112 +112 @@
 
 /*
- * Join a room of name roomname.  This is the first step to joining an 
- * already created room.  It's basically a Service Request for 
- * family 0x000e, with a little added on to specify the exchange and room 
+ * Join a room of name roomname.  This is the first step to joining an
+ * already created room.  It's basically a Service Request for
+ * family 0x000e, with a little added on to specify the exchange and room
  * name.
  */
@@ -123 +123 @@
         aim_tlvlist_t *tl = NULL;
         struct chatsnacinfo csi;
-        
+
         if (!sess || !conn || !roomname || !strlen(roomname))
                 return -EINVAL;
@@ -149 +149 @@
         aim_tx_enqueue(sess, fr);
 
-        return 0; 
+        return 0;
 }
 
@@ -194 +194 @@
         int hdrlen;
         aim_bstream_t hdrbs;
-        
+
         if (!sess || !conn || !sn || !msg || !roomname)
                 return -EINVAL;
@@ -239 +239 @@
          * Sigh.  AOL was rather inconsistent right here.  So we have
          * to play some minor tricks.  Right inside the type 5 is some
-         * raw data, followed by a series of TLVs.  
+         * raw data, followed by a series of TLVs.
          *
          */
@@ -245 +245 @@
         hdr = malloc(hdrlen);
         aim_bstream_init(&hdrbs, hdr, hdrlen);
-        
+
         aimbs_put16(&hdrbs, 0x0000); /* Unknown! */
         aimbs_putraw(&hdrbs, ckstr, sizeof(ckstr)); /* I think... */
@@ -255 +255 @@
         aim_addtlvtochain_chatroom(&itl, 0x2711, exchange, roomname, instance);
         aim_tlvlist_write(&hdrbs, &itl);
-        
+
         aim_tlvlist_add_raw(&otl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
 
@@ -263 +263 @@
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
-        
+
         aim_tx_enqueue(sess, fr);
 
@@ -307 +307 @@
         /*
          * Everything else are TLVs.
-         */ 
+         */
         tlvlist = aim_tlvlist_read(bs);
 
@@ -325 +325 @@
          * Type 0x0073:  Occupant list.
          */
-        if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {       
+        if (aim_tlv_gettlv(tlvlist, 0x0073, 1)) {
                 int curoccupant = 0;
                 aim_tlv_t *tmptlv;
@@ -341 +341 @@
         }
 
-        /* 
+        /*
          * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
          */
@@ -347 +347 @@
                 flags = aim_tlv_get16(tlvlist, 0x00c9, 1);
 
-        /* 
+        /*
          * Type 0x00ca: Creation time (4 bytes)
          */
@@ -353 +353 @@
                 creationtime = aim_tlv_get32(tlvlist, 0x00ca, 1);
 
-        /* 
+        /*
          * Type 0x00d1: Maximum Message Length
          */
@@ -359 +359 @@
                 maxmsglen = aim_tlv_get16(tlvlist, 0x00d1, 1);
 
-        /* 
+        /*
          * Type 0x00d2: Unknown. (2 bytes)
          */
@@ -365 +365 @@
                 unknown_d2 = aim_tlv_get16(tlvlist, 0x00d2, 1);
 
-        /* 
+        /*
          * Type 0x00d3: Room Description
          */
@@ -377 +377 @@
                 ;
 
-        /* 
+        /*
          * Type 0x00d5: Unknown. (1 byte)
          */
@@ -389 +389 @@
         if (aim_tlv_gettlv(tlvlist, 0x000d6, 1))
                 ;
-        
+
         /*
          * Type 0x00d7: Language 1 ("en")
@@ -401 +401 @@
         if (aim_tlv_gettlv(tlvlist, 0x000d8, 1))
                 ;
-        
+
         /*
          * Type 0x00d9: Language 2 ("en")
@@ -475 +475 @@
  *                                 and displays the message as normal.)
  *
- * XXX convert this to use tlvchains 
+ * XXX convert this to use tlvchains
  */
 faim_export int aim_chat_send_im(aim_session_t *sess, aim_conn_t *conn, fu16_t flags, const char *msg, int msglen)
-{   
+{
         int i;
         aim_frame_t *fr;
@@ -539 +539 @@
          *
          * This could include other information... We just
-         * put in a message TLV however.  
-         * 
+         * put in a message TLV however.
+         *
          */
         aim_tlvlist_add_frozentlvlist(&otl, 0x0005, &itl);
 
         aim_tlvlist_write(&fr->data, &otl);
-        
+
         aim_tlvlist_free(&itl);
         aim_tlvlist_free(&otl);
-        
+
         aim_tx_enqueue(sess, fr);
 
@@ -557 +557 @@
  * Subtype 0x0006
  *
- * We could probably include this in the normal ICBM parsing 
+ * We could probably include this in the normal ICBM parsing
  * code as channel 0x0003, however, since only the start
  * would be the same, we might as well do it here.
@@ -577 +577 @@
  *         message string
  *       possibly others
- *  
+ *
  */
 static int incomingmsg(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
         aim_userinfo_t userinfo;
-        aim_rxcallback_t userfunc;      
+        aim_rxcallback_t userfunc;
         int ret = 0;
         fu8_t *cookie;
@@ -619 +619 @@
 
         /*
-         * Start parsing TLVs right away. 
+         * Start parsing TLVs right away.
          */
         otl = aim_tlvlist_read(bs);
@@ -637 +637 @@
 
         /*
-         * Type 0x0001: If present, it means it was a message to the 
+         * Type 0x0001: If present, it means it was a message to the
          * room (as opposed to a whisper).
          */
@@ -655 +655 @@
                 itl = aim_tlvlist_read(&tbs);
 
-                /* 
+                /*
                  * Type 0x0001: Message.
-                 */     
+                 */
                 if (aim_tlv_gettlv(itl, 0x0001, 1))
                         msg = aim_tlv_getstr(itl, 0x0001, 1);
 
-                aim_tlvlist_free(&itl); 
+                aim_tlvlist_free(&itl);
         }