Changeset 4aa0f6b for protocols/jabber

Timestamp:

2010-06-07T14:31:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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:

Merging killerbee stuff, bringing all the bleeding-edge stuff together.

Location:

protocols/jabber

Files:

• Makefile (modified) (2 diffs)
• io.c (modified) (2 diffs)
• s5bytestream.c (modified) (7 diffs)

protocols/jabber/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/jabber/
+endif
 
 # [SH] Program variables
@@ -33 +36 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

protocols/jabber/io.c

@@ -64 +64 @@
                    most cases it probably won't be necessary.) */
                 if( ( ret = jabber_write_queue( ic ) ) && jd->tx_len > 0 )
-                        jd->w_inpa = b_input_add( jd->fd, GAIM_INPUT_WRITE, jabber_write_callback, ic );
+                        jd->w_inpa = b_input_add( jd->fd, B_EV_IO_WRITE, jabber_write_callback, ic );
         }
         else
@@ -504 +504 @@
         
         if( jd->r_inpa <= 0 )
-                jd->r_inpa = b_input_add( jd->fd, GAIM_INPUT_READ, jabber_read_callback, ic );
+                jd->r_inpa = b_input_add( jd->fd, B_EV_IO_READ, jabber_read_callback, ic );
         
         greet = g_strdup_printf( "%s<stream:stream to=\"%s\" xmlns=\"jabber:client\" "

protocols/jabber/s5bytestream.c

@@ -406 +406 @@
                         bt->phase = BS_PHASE_CONNECTED;
                         
-                        bt->tf->watch_out = b_input_add( fd, GAIM_INPUT_WRITE, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_out = b_input_add( fd, B_EV_IO_WRITE, jabber_bs_recv_handshake, bt );
 
                         /* since it takes forever(3mins?) till connect() fails on itself we schedule a timeout */
@@ -433 +433 @@
                         bt->phase = BS_PHASE_REQUEST;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_recv_handshake, bt );
 
                         bt->tf->watch_out = 0;
@@ -590 +590 @@
 
         tf->ft->data = tf;
-        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
         tf->ft->write_request = jabber_bs_recv_write_request;
 
@@ -632 +632 @@
                 if( ( ret == -1 ) && ( errno == EAGAIN ) )
                 {
-                        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+                        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
                         return FALSE;
                 }
@@ -708 +708 @@
                 imcb_file_finished( tf->ic, ft );
         else
-                bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
+                bt->tf->watch_out = b_input_add( tf->fd, B_EV_IO_WRITE, jabber_bs_send_can_write, bt );
                 
         return TRUE;
@@ -919 +919 @@
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );
 
-                                bt->tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                                bt->tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                                 bt->connect_timeout = b_timeout_add( JABBER_BS_LISTEN_TIMEOUT * 1000, jabber_bs_connect_timeout, bt );
                         } else {
@@ -1056 +1056 @@
                         bt->phase = BS_PHASE_CONNECTED;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                         return FALSE;
                 }