Changeset dce3903 for protocols/jabber/si.c

Timestamp:

2007-12-04T00:48:57Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

8076ec0, fa30fa5

Parents:

2ff2076

Message:

Send and receive seems to work now! Also adopted the new buffering strategy,
only one buffer of 2k per transfer now.

File:

• protocols/jabber/si.c (modified) (8 diffs)

protocols/jabber/si.c

@@ -84 +84 @@
         struct jabber_data *jd = ic->proto_data;
 
-        imcb_log( ic, "Incoming file from %s : %s %zd bytes", ic->irc->nick, ft->file_name, ft->file_size );
+        imcb_log( ic, "Trying to send %s(%zd bytes) to %s", ft->file_name, ft->file_size, who );
 
         tf = g_new0( struct jabber_transfer, 1 );
@@ -224 +224 @@
 
 /*
- * imcb called the accept callback which probably means that the user accepted this file transfer.
+ * imc called the accept callback which probably means that the user accepted this file transfer.
  * We send our response to the initiator.
  * In the next step, the initiator will send us a request for the given stream type.
@@ -275 +275 @@
 {
         struct xt_node *c, *d;
-        char *ini_jid, *tgt_jid;
+        char *ini_jid, *tgt_jid, *iq_id;
         GSList *tflist;
         struct jabber_transfer *tf=NULL;
         struct jabber_data *jd = ic->proto_data;
-        char *sid;
 
         if( !( tgt_jid = xt_find_attr( node, "from" ) ) ||
@@ -288 +287 @@
         }
         
-        imcb_log( ic, "GOT RESPONSE TO FILE" );
         /* All this means we expect something like this: ( I think )
-         * <iq from=... to=...>
+         * <iq from=... to=... id=...>
          *      <si xmlns=si>
-         *              <file xmlns=ft/>
+         *      [       <file xmlns=ft/>    ] <-- not neccessary
          *              <feature xmlns=feature>
          *                      <x xmlns=xdata type=submit>
@@ -300 +298 @@
         if( !( tgt_jid = xt_find_attr( node, "from" ) ) ||
             !( ini_jid = xt_find_attr( node, "to" ) ) ||
+            !( iq_id   = xt_find_attr( node, "id" ) ) ||
             !( c = xt_find_node( node->children, "si" ) ) ||
             !( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) ||
-            !( sid = xt_find_attr( c, "id" ) )||
-            !( d = xt_find_node( c->children, "file" ) ) ||
-            !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FILETRANSFER ) == 0 ) ||
+/*          !( d = xt_find_node( c->children, "file" ) ) ||
+            !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FILETRANSFER ) == 0 ) || */
             !( d = xt_find_node( c->children, "feature" ) ) ||
             !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0 ) ||
@@ -331 +329 @@
         {
                 struct jabber_transfer *tft = tflist->data;
-                if( ( strcmp( tft->sid, sid ) == 0 ) )
+                if( ( strcmp( tft->iq_id, iq_id ) == 0 ) )
                 {
                         tf = tft;
@@ -346 +344 @@
         tf->ini_jid = g_strdup( ini_jid );
         tf->tgt_jid = g_strdup( tgt_jid );
+
+        imcb_log( ic, "File %s: %s accepted the transfer!", tf->ft->file_name, tgt_jid );
 
         jabber_bs_send_start( tf );
@@ -423 +423 @@
         node = jabber_make_packet( "iq", "set", bud ? bud->full_jid : who, sinode );
         jabber_cache_add( ic, node, jabber_si_handle_response );
+        tf->iq_id = g_strdup( xt_find_attr( node, "id" ) );
         
         return jabber_write_packet( ic, node );