Changeset 2ff2076 for protocols

Timestamp:

2007-12-03T14:28:45Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

dce3903

Parents:

2c2df7d

Message:

Intermediate commit. Sending seems to work. TODOs:

• move from out_of_data to is_writable, eliminate buffers
• implement "transfers reject [id]"
• documentation in commands.xml
• implement throughput and cummulative throughput boundaries
• feature discovery before sending
• implement sending over a proxy (proxy discovery, socks5 client handshake for sending, activate message)
• integrate toxik-mek-ft

Location:

protocols

Files:

• ft.h (modified) (4 diffs)
• jabber/Makefile (modified) (1 diff)
• jabber/iq.c (modified) (1 diff)
• jabber/jabber.c (modified) (1 diff)
• jabber/jabber.h (modified) (2 diffs)
• jabber/jabber_util.c (modified) (1 diff)
• jabber/s5bytestream.c (added)
• jabber/si.c (modified) (7 diffs)
• jabber/stream.c (deleted)
• nogaim.h (modified) (1 diff)

protocols/ft.h

@@ -29 +29 @@
 typedef enum {
         FT_STATUS_LISTENING     = 1,
-        FT_STATUS_TRANSFERING   = 2,
+        FT_STATUS_TRANSFERRING  = 2,
         FT_STATUS_FINISHED      = 4,
-        FT_STATUS_CANCELED      = 8
+        FT_STATUS_CANCELED      = 8,
+        FT_STATUS_CONNECTING    = 16
 } file_status_t;
 
@@ -61 +62 @@
  */
 typedef struct file_transfer {
+
+        /* Are we sending something? */
+        int sending;
+
         /*
          * The current status of this file transfer.
@@ -131 +136 @@
         void (*out_of_data) ( struct file_transfer *file );
 
+        /*
+         * When sending files, protocols register this function to receive data.
+         */
+        gboolean (*write) (struct file_transfer *file, char *buffer, int len );
+
 } file_transfer_t;
 
@@ -151 +161 @@
 gboolean imcb_file_write( file_transfer_t *file, gpointer data, size_t data_size );
 
+gboolean imcb_file_recv_start( file_transfer_t *ft );
 #endif

protocols/jabber/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o si.o stream.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o si.o s5bytestream.o
 
 CFLAGS += -Wall

protocols/jabber/iq.c

@@ -168 +168 @@
                 {
                         /* Bytestream Request (stage 2 of file transfer) */
-                        return jabber_bs_request( ic, node, c );
+                        return jabber_bs_recv_request( ic, node, c );
                 } else
                 {

protocols/jabber/jabber.c

@@ -502 +502 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );

protocols/jabber/jabber.h

@@ -148 +148 @@
         int receiver_overflow;
         int fd;
+        struct sockaddr_storage saddr;
 };
 
@@ -201 +202 @@
 
 /* si.c */
-int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, struct xt_node *sinode);
-
-/* stream.c */
-int jabber_bs_request( struct im_connection *ic, struct xt_node *node, struct xt_node *qnode);
+int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, struct xt_node *sinode );
+void jabber_si_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
+void jabber_si_free_transfer( file_transfer_t *ft);
+
+/* s5bytestream.c */
+int jabber_bs_recv_request( struct im_connection *ic, struct xt_node *node, struct xt_node *qnode);
+gboolean jabber_bs_send_start( struct jabber_transfer *tf );
+gboolean jabber_bs_send_write( file_transfer_t *ft, char *buffer, int len );
 
 /* message.c */

protocols/jabber/jabber_util.c

@@ -265 +265 @@
         new = g_new( char, len + 1 );
         for( i = 0; i < len; i ++ )
+        {
+                /* don't normalize the resource */
+                if( orig[i] == '/' )
+                        break;
                 new[i] = tolower( orig[i] );
+        }
+        for( ; i < len; i ++ )
+                new[i] = orig[i];
         
         new[i] = 0;

protocols/jabber/si.c

@@ -26 +26 @@
 
 void jabber_si_answer_request( file_transfer_t *ft );
-
-/* imcb callback */
+int jabber_si_send_request(struct im_connection *ic, char *who, struct jabber_transfer *tf );
+
+/* file_transfer free() callback */
 void jabber_si_free_transfer( file_transfer_t *ft)
 {
@@ -50 +51 @@
 }
 
-/* imcb callback */
+/* file_transfer finished() callback */
 void jabber_si_finished( file_transfer_t *ft )
 {
@@ -58 +59 @@
 }
 
-/* imcb callback */
+/* file_transfer canceled() callback */
 void jabber_si_canceled( file_transfer_t *ft, char *reason )
 {
@@ -76 +77 @@
         xt_free_node( reply );
 
+}
+
+void jabber_si_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who ) 
+{
+        struct jabber_transfer *tf;
+        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 );
+
+        tf = g_new0( struct jabber_transfer, 1 );
+
+        tf->ic = ic;
+        tf->ft = ft;
+        tf->ft->data = tf;
+        tf->ft->free = jabber_si_free_transfer;
+        tf->ft->finished = jabber_si_finished;
+        ft->write = jabber_bs_send_write;
+
+        jd->filetransfers = g_slist_prepend( jd->filetransfers, tf );
+
+        jabber_si_send_request( ic, who, tf );
+
+        imcb_file_recv_start( ft );
 }
 
@@ -136 +160 @@
                                 break;
                         }
+
+                if ( !requestok )
+                        imcb_log( ic, "WARNING: Unsupported file transfer request from %s", ini_jid);
         }
         
@@ -160 +187 @@
 
                 *s = '/';
-        } else 
-                imcb_log( ic, "WARNING: Unsupported file transfer request from %s", ini_jid);
+        }
 
         if ( !requestok )
@@ -245 +271 @@
         xt_free_node( reply );
 }
+
+static xt_status jabber_si_handle_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *c, *d;
+        char *ini_jid, *tgt_jid;
+        GSList *tflist;
+        struct jabber_transfer *tf=NULL;
+        struct jabber_data *jd = ic->proto_data;
+        char *sid;
+
+        if( !( tgt_jid = xt_find_attr( node, "from" ) ) ||
+            !( ini_jid = xt_find_attr( node, "to" ) ) )
+        {
+                imcb_log( ic, "Invalid SI response from=%s to=%s", tgt_jid, ini_jid );
+                return XT_HANDLED;
+        }
+        
+        imcb_log( ic, "GOT RESPONSE TO FILE" );
+        /* All this means we expect something like this: ( I think )
+         * <iq from=... to=...>
+         *      <si xmlns=si>
+         *              <file xmlns=ft/>
+         *              <feature xmlns=feature>
+         *                      <x xmlns=xdata type=submit>
+         *                              <field var=stream-method>
+         *                                      <value>
+         */
+        if( !( tgt_jid = xt_find_attr( node, "from" ) ) ||
+            !( ini_jid = xt_find_attr( node, "to" ) ) ||
+            !( 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, "feature" ) ) ||
+            !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0 ) ||
+            !( d = xt_find_node( d->children, "x" ) ) ||
+            !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_XDATA ) == 0 ) ||
+            !( strcmp( xt_find_attr( d, "type" ), "submit" ) == 0 ) ||
+            !( d = xt_find_node( d->children, "field" ) ) ||
+            !( strcmp( xt_find_attr( d, "var" ), "stream-method" ) == 0 ) ||
+            !( d = xt_find_node( d->children, "value" ) ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete Stream Initiation response" );
+                return XT_HANDLED;
+        }
+
+        if( !( strcmp( d->text, XMLNS_BYTESTREAMS ) == 0 ) ) { 
+                /* since we should only have advertised what we can do and the peer should
+                 * only have chosen what we offered, this should never happen */
+                imcb_log( ic, "WARNING: Received invalid Stream Initiation response, method %s", d->text );
+                        
+                return XT_HANDLED;
+        }
+        
+        /* Let's see if we can find out what this bytestream should be for... */
+
+        for( tflist = jd->filetransfers ; tflist; tflist = g_slist_next(tflist) )
+        {
+                struct jabber_transfer *tft = tflist->data;
+                if( ( strcmp( tft->sid, sid ) == 0 ) )
+                {
+                        tf = tft;
+                        break;
+                }
+        }
+
+        if (!tf) 
+        {
+                imcb_log( ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid );
+                return XT_HANDLED;
+        }
+
+        tf->ini_jid = g_strdup( ini_jid );
+        tf->tgt_jid = g_strdup( tgt_jid );
+
+        jabber_bs_send_start( tf );
+
+        return XT_HANDLED;
+}
+
+int jabber_si_send_request(struct im_connection *ic, char *who, struct jabber_transfer *tf )
+{
+        struct xt_node *node, *sinode;
+        struct jabber_buddy *bud;
+
+        /* who knows how many bits the future holds :) */
+        char filesizestr[ 1 + ( int ) ( 0.301029995663981198f * sizeof( size_t ) * 8 ) ];
+
+        const char *methods[] = 
+        {       
+                XMLNS_BYTESTREAMS,
+                //XMLNS_IBB,
+                NULL 
+        };
+        const char **m;
+        char *s;
+
+        /* Maybe we should hash this? */
+        tf->sid = g_strdup_printf( "BitlBeeJabberSID%d", tf->ft->local_id );
+        
+        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_name( ic, s + 1 ) )
+                bud = jabber_buddy_by_ext_jid( ic, who, 0 );
+        else
+                bud = jabber_buddy_by_jid( ic, who, 0 );
+
+        /* start with the SI tag */
+        sinode = xt_new_node( "si", NULL, NULL );
+        xt_add_attr( sinode, "xmlns", XMLNS_SI );
+        xt_add_attr( sinode, "profile", XMLNS_FILETRANSFER );
+        xt_add_attr( sinode, "id", tf->sid );
+
+/*      if( mimetype ) 
+                xt_add_attr( node, "mime-type", mimetype ); */
+
+        /* now the file tag */
+/*      if( desc )
+                node = xt_new_node( "desc", descr, NULL ); */
+        node = xt_new_node( "range", NULL, NULL );
+
+        sprintf( filesizestr, "%zd", tf->ft->file_size );
+        node = xt_new_node( "file", NULL, node );
+        xt_add_attr( node, "xmlns", XMLNS_FILETRANSFER );
+        xt_add_attr( node, "name", tf->ft->file_name );
+        xt_add_attr( node, "size", filesizestr );
+/*      if (hash)
+                xt_add_attr( node, "hash", hash );
+        if (date)
+                xt_add_attr( node, "date", date ); */
+
+        xt_add_child( sinode, node );
+
+        /* and finally the feature tag */
+        node = xt_new_node( "field", NULL, NULL );
+        xt_add_attr( node, "var", "stream-method" );
+        xt_add_attr( node, "type", "list-single" );
+
+        for ( m = methods ; *m ; m ++ )
+                xt_add_child( node, xt_new_node( "option", NULL, xt_new_node( "value", (char *)*m, NULL ) ) );
+
+        node = xt_new_node( "x", NULL, node );
+        xt_add_attr( node, "xmlns", XMLNS_XDATA );
+        xt_add_attr( node, "type", "form" );
+
+        node = xt_new_node( "feature", NULL, node );
+        xt_add_attr( node, "xmlns", XMLNS_FEATURE );
+
+        xt_add_child( sinode, node );
+
+        /* and we are there... */
+        node = jabber_make_packet( "iq", "set", bud ? bud->full_jid : who, sinode );
+        jabber_cache_add( ic, node, jabber_si_handle_response );
+        
+        return jabber_write_packet( ic, node );
+}

protocols/nogaim.h

@@ -229 +229 @@
          * - Most protocols will just want to set this to g_strcasecmp().*/
         int (* handle_cmp) (const char *who1, const char *who2);
+
+        /* Incoming transfer request */
+        void (* transfer_request) (struct im_connection *, file_transfer_t *ft, char *handle );
 };