Changes in / [cfcc587:cf13671]

Files:

• Makefile (modified) (2 diffs)
• bitlbee.h (modified) (2 diffs)
• crypting.c (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/Makefile (modified) (1 diff)
• doc/bitlbee.8 (modified) (2 diffs)
• doc/user-guide/Usage.xml (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (2 diffs)
• doc/user-guide/docbook.xsl (modified) (1 diff)
• doc/user-guide/quickstart.xml (modified) (4 diffs)
• irc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (4 diffs)
• protocols/nogaim.c (modified) (4 diffs)
• protocols/oscar/Makefile (modified) (1 diff)
• protocols/oscar/aim.h (modified) (4 diffs)
• protocols/oscar/aim_internal.h (modified) (1 diff)
• protocols/oscar/conn.c (modified) (2 diffs)
• protocols/oscar/ft.c (added)
• protocols/oscar/ft.h (added)
• protocols/oscar/im.c (modified) (1 diff)
• protocols/oscar/msgcookie.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/oscar/rxhandlers.c (modified) (1 diff)
• protocols/oscar/rxqueue.c (modified) (2 diffs)
• protocols/oscar/txqueue.c (modified) (4 diffs)

Makefile

@@ -24 +24 @@
 
 all: $(OUTFILE)
-        $(MAKE) -C doc
 
 uninstall: uninstall-bin uninstall-doc
@@ -48 +47 @@
 distclean: clean $(subdirs)
         rm -f Makefile.settings config.h
-        find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
+        find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' | xargs rm -f
 
 install-doc:

bitlbee.h

@@ -30 +30 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.0pre"
+#define BITLBEE_VERSION "0.99"
 #define VERSION BITLBEE_VERSION
 
@@ -87 +87 @@
 
 #define DEFAULT_AWAY "Away from computer"
-#define CONTROL_TOPIC "Welcome to the control channel. Type \2help\2 for help information."
+#define CONTROL_TOPIC "Welcome to the control channel. Type help for help information."
 #define IRCD_INFO "BitlBee <http://www.bitlbee.org/>"
 

crypting.c

@@ -55 +55 @@
 #include <stdlib.h>
 
-#define irc_usermsg
-
 #endif
 

doc/CHANGES

@@ -8 +8 @@
 - HTML stripping is configurable again.
 - Quit messages (at least on crashes) should appear again.
-- Cleaned up some unnecessary code in the Jabber module, and implemented
-  handlers for headline messages (which allows you to use RSS-to-Jabber
-  gateways).
 
 Finished ...

doc/Makefile

@@ -1 +1 @@
 -include ../Makefile.settings
-
-all:
-        # Only build the docs if this is a bzr checkout
-        test ! -d ../.bzr || $(MAKE) -C user-guide
 
 install:

doc/bitlbee.8

@@ -39 +39 @@
 networks and acts as a gateway. Users can connect to the server
 with any normal IRC client and see their 'buddy list' in
-&bitlbee. BitlBee's protocol support is based on the gaim 
+#bitlbee. BitlBee's protocol support is based on the gaim 
 protocol plugins. BitlBee currently supports Oscar (aim and icq), 
 MSN, Jabber and Yahoo.
@@ -86 +86 @@
 .SH COMMANDS
 To get a complete list of commands, please use the \fBhelp commands\fP
-command in the &bitlbee channel.
+command in the #bitlbee channel.
 .SH "SEE ALSO"
 .BR ircd (8), 

doc/user-guide/Usage.xml

@@ -14 +14 @@
 
 <sect1>
-<title>The &amp;bitlbee control channel</title>
+<title>The #bitlbee control channel</title>
 
 <para>
 Once you are connected to the BitlBee server, you are automatically joined
-to &amp;bitlbee on that server. This channel acts like the 'buddy list' you have
+to #bitlbee on that server. This channel acts like the 'buddy list' you have
 on the various other chat networks.
 </para>
 
 <para>
-The user 'root' always hangs around in &amp;bitlbee and acts as your interface 
-to bitlbee. All commands you give on &amp;bitlbee are 'answered' by root.
-</para>
-
-<para>
-You might be slightly confused by the &amp; in the channel name. This is,
-however, completely allowed by the IRC standards. Just try it on a regular
-IRC server, it should work. The difference between the standard #channels
-and &amp;channels is that the #channels are distributed over all the servers
-on the IRC network, while &amp;channels are local to one server. Because
-the BitlBee control channel is local to one server (and in fact, to one person),
-this name seems more suitable. Also, with this name, it's harder to confuse
-the control channel with the #bitlbee channel on OFTC.
+The user 'root' always hangs around in #bitlbee and acts as your interface 
+to bitlbee. All commands you give on #bitlbee are 'answered' by root.
 </para>
 

doc/user-guide/commands.xml

@@ -154 +154 @@
                 <ircexample>
                         <ircline nick="ctrlsoft">add 3 gryp@jabber.org grijp</ircline>
-                        <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
+                        <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>#bitlbee</emphasis></ircaction>
                 </ircexample>
         </bitlbee-command>
@@ -357 +357 @@
                 <description>
                         <para>
-                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can change these states using this setting.
+                                Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
                         </para>
 

doc/user-guide/docbook.xsl

@@ -19 +19 @@
 
         <xsl:template match="ircaction">
-                <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
+                <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
         </xsl:template>
 

doc/user-guide/quickstart.xml

@@ -7 +7 @@
 
 <para>
-The center of BitlBee is the control channel, <emphasis>&amp;bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
+The center of BitlBee is the control channel, <emphasis>#bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
 </para>
 
@@ -97 +97 @@
 <ircexample>
         <ircline nick="you">add 0 r2d2@example.com</ircline>
-        <ircaction nick="r2d2"> has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
+        <ircaction nick="r2d2"> has joined <emphasis>#bitlbee</emphasis></ircaction>
 </ircexample>
 
@@ -122 +122 @@
 
 <para>
-First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in &amp;bitlbee:
+First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in #bitlbee:
 </para>
 
@@ -131 +131 @@
 
 <para>
-If you'd rather chat with them in a separate window use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the &amp;bitlbee channel, use the <emphasis>set private</emphasis> command: <emphasis>set private true</emphasis> (<emphasis>set private false</emphasis> to change back).
+If you'd rather chat with them in a separate window use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the #bitlbee channel, use the <emphasis>set private</emphasis> command: <emphasis>set private true</emphasis> (<emphasis>set private false</emphasis> to change back).
 </para>
 

irc.c

@@ -600 +600 @@
                 else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 
                 {
-                        irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); 
+                        irc_write( irc, ":%s!%s@%s PRIVMSG %s :%s", irc->nick, irc->user, irc->host, cmd[1], cmd[2] ); 
                 }
                 else 

protocols/jabber/jabber.c

@@ -757 +757 @@
 static void jabber_handlemessage(gjconn gjc, jpacket p)
 {
-        xmlnode y, xmlns, z;
+        xmlnode y, xmlns, subj, z;
         time_t time_sent = time(NULL);
 
-        char *from = NULL, *msg = NULL, *type = NULL;
+        char *from = NULL, *msg = NULL, *type = NULL, *topic = NULL;
         char m[BUF_LONG * 2];
 
@@ -798 +798 @@
 
                 if (type && !g_strcasecmp(type, "jabber:x:conference")) {
-                        /* do nothing */
+                        char *room;
+                        GList *m = NULL;
+                        char **data;
+
+                        room = xmlnode_get_attrib(xmlns, "jid");
+                        data = g_strsplit(room, "@", 2);
+                        m = g_list_append(m, g_strdup(data[0]));
+                        m = g_list_append(m, g_strdup(data[1]));
+                        m = g_list_append(m, g_strdup(gjc->user->user));
+                        g_strfreev(data);
+
+                        /* ** Bitlbee ** serv_got_chat_invite(GJ_GC(gjc), room, from, msg, m); */
                 } else if (msg) { /* whisper */
                         struct jabber_chat *jc;
@@ -806 +817 @@
                         else {
                                 int flags = 0;
-                                
-                                if(p->from->user) {
-                                    from = g_strdup_printf("%s@%s", p->from->user, p->from->server);
-                                } else {
-                                    /* server message? */
-                                    from = g_strdup(p->from->server);
-                                }
-                                serv_got_im(GJ_GC(gjc), from, m, flags, time_sent, -1);
-                                g_free(from);
+                                /* ** Bitlbee **
+                                if (xmlnode_get_tag(p->x, "gaim"))
+                                        flags = IM_FLAG_GAIMUSER;
+                                if (find_conversation(jid_full(p->from)))
+                                        serv_got_im(GJ_GC(gjc), jid_full(p->from), m, flags, time_sent, -1);
+                                else {
+                                ** End - Bitlbee ** */
+                                        if(p->from->user) {
+                                            from = g_strdup_printf("%s@%s", p->from->user, p->from->server);
+                                        } else {
+                                            /* server message? */
+                                            from = g_strdup(p->from->server);
+                                        }
+                                        serv_got_im(GJ_GC(gjc), from, m, flags, time_sent, -1);
+                                        g_free(from);
+                                /* ** Bitlbee ** } ** End - Bitlbee ** */
                         }
                 }
@@ -829 +847 @@
                         g_free(from);
                 }
-        } else if (!g_strcasecmp(type, "headline")) {
-                char *subject, *body, *url;
+        } else if (!g_strcasecmp(type, "groupchat")) {
+                struct jabber_chat *jc;
+                static int i = 0;
+
+                /*
+                if ((y = xmlnode_get_tag(p->x, "html"))) {
+                        msg = xmlnode_get_data(y);
+                } else
+                */
+                if ((y = xmlnode_get_tag(p->x, "body"))) {
+                        msg = xmlnode_get_data(y);
+                }
+
+                msg = utf8_to_str(msg);
                 
-                y = xmlnode_get_tag( p->x, "body" );
-                body = y ? g_strdup( xmlnode_get_data( y ) ) : NULL;
-                
-                y = xmlnode_get_tag( p->x, "subject" );
-                subject = y ? g_strdup( xmlnode_get_data( y ) ) : NULL;
-                
-                url = NULL;
-                z = xmlnode_get_firstchild(p->x);
-                while( z )
-                {
-                        char *xtype = xmlnode_get_attrib( z, "xmlns" );
-                        
-                        if( xtype && g_strcasecmp( xtype, "jabber:x:oob" ) == 0 &&
-                                     ( y = xmlnode_get_tag( z, "url" ) ) )
-                        {
-                                url = g_strdup( xmlnode_get_data( y ) );
-                                break;
-                        }
-                        
-                        z = xmlnode_get_nextsibling( z );
-                }
-                
-                g_snprintf( m, BUF_LONG, "Subject: %s\nURL: %s\nMessage:\n%s", subject ? subject : "(none)",
-                                     url ? url : "(none)", body ? body : "(none)" );
-
-                if( p->from->user )
-                        from = g_strdup_printf( "%s@%s", p->from->user, p->from->server );
-                else
-                        from = g_strdup( p->from->server );
-                
-                serv_got_im( GJ_GC(gjc), from, m, 0, time_sent, -1 );
-                
-                g_free( from );
-                g_free( subject );
-                g_free( body );
-                g_free( url );
+                if ((subj = xmlnode_get_tag(p->x, "subject"))) {
+                        topic = xmlnode_get_data(subj);
+                } 
+                topic = utf8_to_str(topic);
+
+                jc = find_existing_chat(GJ_GC(gjc), p->from);
+                if (!jc) {
+                        /* we're not in this chat. are we supposed to be? */
+                        if ((jc = find_pending_chat(GJ_GC(gjc), p->from)) != NULL) {
+                                /* yes, we're supposed to be. so now we are. */
+                                jc->b = serv_got_joined_chat(GJ_GC(gjc), i++, p->from->user);
+                                jc->id = jc->b->id;
+                                jc->state = JCS_ACTIVE;
+                        } else {
+                                /* no, we're not supposed to be. */
+                                g_free(msg);
+                                return;
+                        }
+                }
+                if (p->from->resource) {
+                        if (!y) {
+                                if (!find_chat_buddy(jc->b, p->from->resource)) {
+                                        add_chat_buddy(jc->b, p->from->resource);
+                                } else if ((y = xmlnode_get_tag(p->x, "status"))) {
+                                        char *buf;
+
+                                        buf = g_strdup_printf("%s@%s/%s",
+                                                p->from->user, p->from->server, p->from->resource);
+                                        jabber_track_away(gjc, p, buf, NULL);
+                                        g_free(buf);
+
+                                }
+                        } else if (jc->b && msg) {
+                                char buf[8192];
+
+                                if (topic) {
+                                        char tbuf[8192];
+                                        g_snprintf(tbuf, sizeof(tbuf), "%s", topic);
+                                }
+                                
+
+                                g_snprintf(buf, sizeof(buf), "%s", msg);
+                                serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 0, buf, time_sent);
+                        }
+                } else { /* message from the server */
+                        if(jc->b && topic) {
+                                char tbuf[8192];
+                                g_snprintf(tbuf, sizeof(tbuf), "%s", topic);
+                        }
+                }
+
+                g_free(msg);
+                g_free(topic);
+
         }
 }

protocols/nogaim.c

@@ -295 +295 @@
 {
         va_list params;
-        char text[1024], buf[1024], acc_id[33];
+        char text[1024], buf[1024];
         char *msg;
-        account_t *a;
         
         va_start( params, format );
@@ -313 +312 @@
                 strip_html( msg );
         
-        /* Try to find a different connection on the same protocol. */
-        for( a = gc->irc->accounts; a; a = a->next )
-                if( a->prpl == gc->prpl && a->gc != gc )
-                        break;
-        
-        /* If we found one, add the screenname to the acc_id. */
-        if( a )
-                g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
-        else
-                g_snprintf( acc_id, 32, "%s", gc->prpl->name );
-        
-        irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
+        irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, msg );
 }
 
@@ -718 +706 @@
                 msg = buf;
         
-        while( strlen( msg ) > 425 )
+        while( strlen( msg ) > 450 )
         {
                 char tmp, *nl;
                 
-                tmp = msg[425];
-                msg[425] = 0;
-                
-                /* If there's a newline/space in this string, split up there,
-                   looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
-                {
-                        msg[425] = tmp;
-                        tmp = *nl;
+                tmp = msg[450];
+                msg[450] = 0;
+                
+                /* If there's a newline in this string, split up there so we're not
+                   going to split up lines. If there isn't a newline, well, too bad. */
+                if( ( nl = strrchr( msg, '\n' ) ) )
                         *nl = 0;
-                }
                 
                 irc_msgfrom( irc, u->nick, msg );
+                
+                msg[450] = tmp;
                 
                 /* Move on. */
                 if( nl )
                 {
-                        *nl = tmp;
+                        *nl = '\n';
                         msg = nl + 1;
                 }
                 else
                 {
-                        msg[425] = tmp;
-                        msg += 425;
+                        msg += 450;
                 }
         }
@@ -759 +744 @@
         
         if( ( u = user_findhandle( gc, handle ) ) )
-                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
+                irc_noticefrom( gc->irc, u->nick, "* Typing a message *" );
 }
 

protocols/oscar/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
+objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o ft.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
 
 CFLAGS += -Wall

protocols/oscar/aim.h

@@ -168 +168 @@
 #define AIM_CONN_TYPE_CHATNAV       0x000d
 
+/* they start getting arbitrary in rendezvous stuff =) */
+#define AIM_CONN_TYPE_RENDEZVOUS    0x0101 /* these do not speak FLAP! */
+#define AIM_CONN_TYPE_RENDEZVOUS_OUT 0x0102 /* socket waiting for accept() */
+
+/*
+ * Subtypes, we need these for OFT stuff.
+ */
+#define AIM_CONN_SUBTYPE_OFT_DIRECTIM  0x0001
+#define AIM_CONN_SUBTYPE_OFT_GETFILE   0x0002
+#define AIM_CONN_SUBTYPE_OFT_SENDFILE  0x0003
+#define AIM_CONN_SUBTYPE_OFT_BUDDYICON 0x0004
+#define AIM_CONN_SUBTYPE_OFT_VOICE     0x0005
+
 /*
  * Status values returned from aim_conn_new().  ORed together.
@@ -178 +191 @@
 
 #define AIM_FRAMETYPE_FLAP 0x0000
+#define AIM_FRAMETYPE_OFT  0x0001
 
 /*
@@ -244 +258 @@
                         flap_seqnum_t seqnum;     
                 } flap;
+                struct {
+                        guint16 type;
+                        guint8 magic[4]; /* ODC2 OFT2 */
+                        guint16 hdr2len;
+                        guint8 *hdr2; /* rest of bloated header */
+                } oft;
         } hdr;
         aim_bstream_t data;     /* payload stream */
@@ -650 +670 @@
 #define AIM_COOKIETYPE_CHATNAV  0x06
 #define AIM_COOKIETYPE_INVITE   0x07
+/* we'll move OFT up a bit to give breathing room.  not like it really
+ * matters. */
+#define AIM_COOKIETYPE_OFTIM    0x10
+#define AIM_COOKIETYPE_OFTGET   0x11
+#define AIM_COOKIETYPE_OFTSEND  0x12
+#define AIM_COOKIETYPE_OFTVOICE 0x13
+#define AIM_COOKIETYPE_OFTIMAGE 0x14
+#define AIM_COOKIETYPE_OFTICON  0x15
 
 int aim_handlerendconnect(aim_session_t *sess, aim_conn_t *cur);

protocols/oscar/aim_internal.h

@@ -192 +192 @@
 aim_msgcookie_t *aim_checkcookie(aim_session_t *sess, const unsigned char *, const int);
 int aim_freecookie(aim_session_t *sess, aim_msgcookie_t *cookie);
+int aim_msgcookie_gettype(int reqclass);
 int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie);
 

protocols/oscar/conn.c

@@ -164 +164 @@
          * This will free ->internal if it necessary...
          */
-        if ((*deadconn)->type == AIM_CONN_TYPE_CHAT)
+        if ((*deadconn)->type == AIM_CONN_TYPE_RENDEZVOUS)
+                aim_conn_kill_rend(sess, *deadconn);
+        else if ((*deadconn)->type == AIM_CONN_TYPE_CHAT)
                 aim_conn_kill_chat(sess, *deadconn);
 
@@ -312 +314 @@
         if (deadconn->handlerlist)
                 aim_clearhandlers(deadconn);
+        if (deadconn->type == AIM_CONN_TYPE_RENDEZVOUS)
+                aim_conn_close_rend((aim_session_t *)deadconn->sessv, deadconn);
 
         return;

protocols/oscar/im.c

@@ -2039 +2039 @@
          */
         aimbs_put8(&fr->data, strlen(sn));
-        aimbs_putraw(&fr->data, (const guint8*)sn, strlen(sn));
+        aimbs_putraw(&fr->data, sn, strlen(sn));
 
         /*

protocols/oscar/msgcookie.c

@@ -178 +178 @@
         return 0;
 } 
+
+/* XXX I hate switch */
+int aim_msgcookie_gettype(int reqclass) 
+{
+        /* XXX: hokey-assed. needs fixed. */
+        switch(reqclass) {
+        case AIM_CAPS_BUDDYICON: return AIM_COOKIETYPE_OFTICON;
+        case AIM_CAPS_VOICE: return AIM_COOKIETYPE_OFTVOICE;
+        case AIM_CAPS_IMIMAGE: return AIM_COOKIETYPE_OFTIMAGE;
+        case AIM_CAPS_CHAT: return AIM_COOKIETYPE_CHAT;
+        case AIM_CAPS_GETFILE: return AIM_COOKIETYPE_OFTGET;
+        case AIM_CAPS_SENDFILE: return AIM_COOKIETYPE_OFTSEND;
+        default: return AIM_COOKIETYPE_UNKNOWN;
+        }           
+}
+
+

protocols/oscar/oscar.c

@@ -275 +275 @@
 
         if (condition & GAIM_INPUT_READ) {
-                if (aim_get_command(odata->sess, conn) >= 0) {
-                        aim_rxdispatch(odata->sess);
-                               if (odata->killme)
-                                       signoff(gc);
+                if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+                        if (aim_handlerendconnect(odata->sess, conn) < 0) {
+                                aim_conn_kill(odata->sess, &conn);
+                        }
                 } else {
-                        if ((conn->type == AIM_CONN_TYPE_BOS) ||
-                                   !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
-                                hide_login_progress_error(gc, _("Disconnected."));
-                                signoff(gc);
-                        } else if (conn->type == AIM_CONN_TYPE_CHAT) {
-                                struct chat_connection *c = find_oscar_chat_by_conn(gc, conn);
-                                char buf[BUF_LONG];
-                                c->conn = NULL;
-                                if (c->inpa > 0)
-                                        gaim_input_remove(c->inpa);
-                                c->inpa = 0;
-                                c->fd = -1;
-                                aim_conn_kill(odata->sess, &conn);
-                                sprintf(buf, _("You have been disconnected from chat room %s."), c->name);
-                                do_error_dialog(sess->aux_data, buf, _("Chat Error!"));
-                        } else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
-                                if (odata->cnpa > 0)
-                                        gaim_input_remove(odata->cnpa);
-                                odata->cnpa = 0;
-                                while (odata->create_rooms) {
-                                        struct create_room *cr = odata->create_rooms->data;
-                                        g_free(cr->name);
-                                        odata->create_rooms =
-                                                g_slist_remove(odata->create_rooms, cr);
-                                        g_free(cr);
-                                        do_error_dialog(sess->aux_data, _("Chat is currently unavailable"),
-                                                        _("Gaim - Chat"));
+                        if (aim_get_command(odata->sess, conn) >= 0) {
+                                aim_rxdispatch(odata->sess);
+                                if (odata->killme)
+                                        signoff(gc);
+                        } else {
+                                if ((conn->type == AIM_CONN_TYPE_BOS) ||
+                                           !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
+                                        hide_login_progress_error(gc, _("Disconnected."));
+                                        signoff(gc);
+                                } else if (conn->type == AIM_CONN_TYPE_CHAT) {
+                                        struct chat_connection *c = find_oscar_chat_by_conn(gc, conn);
+                                        char buf[BUF_LONG];
+                                        c->conn = NULL;
+                                        if (c->inpa > 0)
+                                                gaim_input_remove(c->inpa);
+                                        c->inpa = 0;
+                                        c->fd = -1;
+                                        aim_conn_kill(odata->sess, &conn);
+                                        sprintf(buf, _("You have been disconnected from chat room %s."), c->name);
+                                        do_error_dialog(sess->aux_data, buf, _("Chat Error!"));
+                                } else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
+                                        if (odata->cnpa > 0)
+                                                gaim_input_remove(odata->cnpa);
+                                        odata->cnpa = 0;
+                                        while (odata->create_rooms) {
+                                                struct create_room *cr = odata->create_rooms->data;
+                                                g_free(cr->name);
+                                                odata->create_rooms =
+                                                        g_slist_remove(odata->create_rooms, cr);
+                                                g_free(cr);
+                                                do_error_dialog(sess->aux_data, _("Chat is currently unavailable"),
+                                                                _("Gaim - Chat"));
+                                        }
+                                        aim_conn_kill(odata->sess, &conn);
+                                } else if (conn->type == AIM_CONN_TYPE_AUTH) {
+                                        if (odata->paspa > 0)
+                                                gaim_input_remove(odata->paspa);
+                                        odata->paspa = 0;
+                                        aim_conn_kill(odata->sess, &conn);
+                                } else {
+                                        aim_conn_kill(odata->sess, &conn);
                                 }
-                                aim_conn_kill(odata->sess, &conn);
-                        } else if (conn->type == AIM_CONN_TYPE_AUTH) {
-                                if (odata->paspa > 0)
-                                        gaim_input_remove(odata->paspa);
-                                odata->paspa = 0;
-                                aim_conn_kill(odata->sess, &conn);
-                        } else {
-                                aim_conn_kill(odata->sess, &conn);
                         }
                 }

protocols/oscar/rxhandlers.c

@@ -341 +341 @@
                         continue;
 
+                /*
+                 * This is a debugging/sanity check only and probably 
+                 * could/should be removed for stable code.
+                 */
+                if (((cur->hdrtype == AIM_FRAMETYPE_OFT) && 
+                   (cur->conn->type != AIM_CONN_TYPE_RENDEZVOUS)) || 
+                  ((cur->hdrtype == AIM_FRAMETYPE_FLAP) && 
+                   (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS))) {
+                        do_error_dialog(sess->aux_data, "incompatible frame type/connection type combination", "Gaim");
+                        cur->handled = 1;
+                        continue;
+                }
+
+                if (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS) {
+                        if (cur->hdrtype != AIM_FRAMETYPE_OFT) {
+                                do_error_dialog(sess->aux_data, "non-OFT frames on OFT connection", "Gaim");
+                                cur->handled = 1; /* get rid of it */
+                        } else {
+                                /* FIXME: implement this (OFT frame) */
+                                cur->handled = 1; /* get rid of it */
+                        }
+                        continue;
+                }
+
+                if (cur->conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+                        /* not possible */
+                        do_error_dialog(sess->aux_data, "RENDEZVOUS packet in rxqueue", "Gaim");
+                        cur->handled = 1;
+                        continue;
+                }
+
                 if (cur->hdr.flap.type == 0x01) {
                         

protocols/oscar/rxqueue.c

@@ -332 +332 @@
         g_free(frame->data.data); /* XXX aim_bstream_free */
 
+        if (frame->hdrtype == AIM_FRAMETYPE_OFT)
+                g_free(frame->hdr.oft.hdr2);
         g_free(frame);
+        
+        return;
 } 
 
@@ -358 +362 @@
         if (conn->status & AIM_CONN_STATUS_INPROGRESS)
                 return aim_conn_completeconnect(sess, conn);
+
+        /*
+         * Rendezvous (client-client) connections do not speak
+         * FLAP, so this function will break on them.
+         */
+        if (conn->type == AIM_CONN_TYPE_RENDEZVOUS) 
+                return aim_get_command_rendezvous(sess, conn);
+        else if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+                do_error_dialog(sess->aux_data,"AIM_CONN_TYPE_RENDEZVOUS_OUT shouldn't use FLAP", "Gaim");
+                return 0; 
+        }
 
         aim_bstream_init(&flaphdr, flaphdr_raw, sizeof(flaphdr_raw));

protocols/oscar/txqueue.c

@@ -34 +34 @@
         }
 
+        /* For sanity... */
+        if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) || 
+                        (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT)) {
+                if (framing != AIM_FRAMETYPE_OFT) {
+                        do_error_dialog(sess->aux_data, "attempted to allocate inappropriate frame type for rendezvous connection", "Gaim");
+                        return NULL;
+                }
+        } else {
+                if (framing != AIM_FRAMETYPE_FLAP) {
+                        do_error_dialog(sess->aux_data, "attempted to allocate inappropriate frame type for FLAP connection", "Gaim");
+                        return NULL;
+                }
+        }
+
         if (!(fr = (aim_frame_t *)g_new0(aim_frame_t,1)))
                 return NULL;
@@ -44 +58 @@
 
                 fr->hdr.flap.type = chan;
+
+        } else if (fr->hdrtype == AIM_FRAMETYPE_OFT) {
+
+                fr->hdr.oft.type = chan;
+                fr->hdr.oft.hdr2len = 0; /* this will get setup by caller */
 
         } else 
@@ -218 +237 @@
 
         if (count) {
+                if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) && 
+                    (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) {
+                        /* I strongly suspect that this is a horrible thing to do
+                         * and I feel really guilty doing it. */
+                        const char *sn = aim_directim_getsn(conn);
+                        aim_rxcallback_t userfunc;
+                        while (count - wrote > 1024) {
+                                wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
+                                if ((userfunc=aim_callhandler(conn->sessv, conn, 
+                                                              AIM_CB_FAM_SPECIAL, 
+                                                              AIM_CB_SPECIAL_IMAGETRANSFER)))
+                                  userfunc(conn->sessv, NULL, sn, 
+                                           count-wrote>1024 ? ((double)wrote / count) : 1);
+                        }
+                }
                 if (count - wrote) {
                         wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote);
@@ -265 +299 @@
 }
 
+static int sendframe_oft(aim_session_t *sess, aim_frame_t *fr)
+{
+        aim_bstream_t hbs;
+        guint8 *hbs_raw;
+        int hbslen;
+        int err = 0;
+        
+        hbslen = 8 + fr->hdr.oft.hdr2len;
+        if (!(hbs_raw = g_malloc(hbslen)))
+                return -1;
+
+        aim_bstream_init(&hbs, hbs_raw, hbslen);
+
+        aimbs_putraw(&hbs, fr->hdr.oft.magic, 4);
+        aimbs_put16(&hbs, fr->hdr.oft.hdr2len + 8);
+        aimbs_put16(&hbs, fr->hdr.oft.type);
+        aimbs_putraw(&hbs, fr->hdr.oft.hdr2, fr->hdr.oft.hdr2len);
+
+        aim_bstream_rewind(&hbs);
+        
+        
+        if (aim_bstream_send(&hbs, fr->conn, hbslen) != hbslen) {
+
+                err = -errno;
+                
+        } else if (aim_bstream_curpos(&fr->data)) {
+                int len;
+
+                len = aim_bstream_curpos(&fr->data);
+                aim_bstream_rewind(&fr->data);
+                
+                if (aim_bstream_send(&fr->data, fr->conn, len) != len)
+                        err = -errno;
+        }
+
+        g_free(hbs_raw); /* XXX aim_bstream_free */
+
+        fr->handled = 1;
+        fr->conn->lastactivity = time(NULL);
+
+
+        return err;
+
+
+}
+
 int aim_tx_sendframe(aim_session_t *sess, aim_frame_t *fr)
 {
         if (fr->hdrtype == AIM_FRAMETYPE_FLAP)
                 return sendframe_flap(sess, fr);
+        else if (fr->hdrtype == AIM_FRAMETYPE_OFT)
+                return sendframe_oft(sess, fr);
         return -1;
 }