diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | bitlbee.h | 4 | ||||
| -rw-r--r-- | crypting.c | 2 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/bitlbee.8 | 4 | ||||
| -rw-r--r-- | doc/user-guide/Usage.xml | 19 | ||||
| -rw-r--r-- | doc/user-guide/commands.xml | 4 | ||||
| -rw-r--r-- | doc/user-guide/docbook.xsl | 2 | ||||
| -rw-r--r-- | doc/user-guide/quickstart.xml | 8 | ||||
| -rw-r--r-- | irc.c | 2 | ||||
| -rw-r--r-- | protocols/jabber/jabber.c | 142 | ||||
| -rw-r--r-- | protocols/nogaim.c | 41 | ||||
| -rw-r--r-- | protocols/oscar/Makefile | 2 | ||||
| -rw-r--r-- | protocols/oscar/aim.h | 28 | ||||
| -rw-r--r-- | protocols/oscar/aim_internal.h | 1 | ||||
| -rw-r--r-- | protocols/oscar/conn.c | 6 | ||||
| -rw-r--r-- | protocols/oscar/ft.c | 2005 | ||||
| -rw-r--r-- | protocols/oscar/ft.h | 78 | ||||
| -rw-r--r-- | protocols/oscar/im.c | 2 | ||||
| -rw-r--r-- | protocols/oscar/msgcookie.c | 17 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 84 | ||||
| -rw-r--r-- | protocols/oscar/rxhandlers.c | 31 | ||||
| -rw-r--r-- | protocols/oscar/rxqueue.c | 15 | ||||
| -rw-r--r-- | protocols/oscar/txqueue.c | 82 |
25 files changed, 155 insertions, 2434 deletions
@@ -23,6 +23,7 @@ subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o) CFLAGS += -Wall all: $(OUTFILE) + $(MAKE) -C doc uninstall: uninstall-bin uninstall-doc @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n' @@ -46,7 +47,7 @@ clean: $(subdirs) distclean: clean $(subdirs) rm -f Makefile.settings config.h - find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' | xargs rm -f + find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \; install-doc: $(MAKE) -C doc install @@ -29,7 +29,7 @@ #define _GNU_SOURCE /* Stupid GNU :-P */ #define PACKAGE "BitlBee" -#define BITLBEE_VERSION "0.99" +#define BITLBEE_VERSION "1.0pre" #define VERSION BITLBEE_VERSION #define MAX_STRING 128 @@ -86,7 +86,7 @@ #define NS_NICK "NickServ" #define DEFAULT_AWAY "Away from computer" -#define CONTROL_TOPIC "Welcome to the control channel. Type help for help information." +#define CONTROL_TOPIC "Welcome to the control channel. Type \2help\2 for help information." #define IRCD_INFO "BitlBee <http://www.bitlbee.org/>" #define MAX_NICK_LENGTH 24 @@ -54,6 +54,8 @@ typedef struct irc #include <stdio.h> #include <stdlib.h> +#define irc_usermsg + #endif /*\ diff --git a/doc/CHANGES b/doc/CHANGES index 2fe8b960..2981a378 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -7,6 +7,9 @@ Version 1.0: - Reviewed the xinetd file and installation instructions. - 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 ... diff --git a/doc/Makefile b/doc/Makefile index e3dde912..9b473df3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,9 @@ -include ../Makefile.settings +all: + # Only build the docs if this is a bzr checkout + test ! -d ../.bzr || $(MAKE) -C user-guide + install: mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ diff --git a/doc/bitlbee.8 b/doc/bitlbee.8 index 27819a4e..f1d4dbce 100644 --- a/doc/bitlbee.8 +++ b/doc/bitlbee.8 @@ -38,7 +38,7 @@ BitlBee \- IRC gateway to IM chat networks BitlBee is an IRC daemon that can talk to instant messaging 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. @@ -85,7 +85,7 @@ have write permissions in the default location), use this option. Show help information. .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), .BR inetd (8), diff --git a/doc/user-guide/Usage.xml b/doc/user-guide/Usage.xml index 5d87e32b..167a74e0 100644 --- a/doc/user-guide/Usage.xml +++ b/doc/user-guide/Usage.xml @@ -13,17 +13,28 @@ it with your favorite irc client. Launch it and connect to localhost port 6667 </sect1> <sect1> -<title>The #bitlbee control channel</title> +<title>The &bitlbee control channel</title> <para> Once you are connected to the BitlBee server, you are automatically joined -to #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 #bitlbee and acts as your interface -to bitlbee. All commands you give on #bitlbee are 'answered' by root. +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> + +<para> +You might be slightly confused by the & 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 &channels is that the #channels are distributed over all the servers +on the IRC network, while &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. </para> </sect1> diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 933fb5b6..b04a6b0a 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -153,7 +153,7 @@ <ircexample> <ircline nick="ctrlsoft">add 3 gryp@jabber.org grijp</ircline> - <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>#bitlbee</emphasis></ircaction> + <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>&bitlbee</emphasis></ircaction> </ircexample> </bitlbee-command> @@ -356,7 +356,7 @@ <description> <para> - Some people prefer themself and root to have operator status in #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> <para> diff --git a/doc/user-guide/docbook.xsl b/doc/user-guide/docbook.xsl index cfb27702..9adff305 100644 --- a/doc/user-guide/docbook.xsl +++ b/doc/user-guide/docbook.xsl @@ -18,7 +18,7 @@ </xsl:template> <xsl:template match="ircaction"> - <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text> </xsl:text> + <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text> </xsl:text> </xsl:template> <xsl:template match="ircexample"> diff --git a/doc/user-guide/quickstart.xml b/doc/user-guide/quickstart.xml index 9a8b8770..520f240f 100644 --- a/doc/user-guide/quickstart.xml +++ b/doc/user-guide/quickstart.xml @@ -6,7 +6,7 @@ Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant </para> <para> -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>. +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> <para> @@ -96,7 +96,7 @@ Now you might want to add some contacts, to do this we will use the <emphasis>ad <ircexample> <ircline nick="you">add 0 r2d2@example.com</ircline> - <ircaction nick="r2d2"> has joined <emphasis>#bitlbee</emphasis></ircaction> + <ircaction nick="r2d2"> has joined <emphasis>&bitlbee</emphasis></ircaction> </ircexample> <para> @@ -121,7 +121,7 @@ When finished, type <emphasis>help quickstart5</emphasis> to continue. </para> <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 #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> <ircexample> @@ -130,7 +130,7 @@ First of all, a person must be on your contact list for you to chat with them (u </ircexample> <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 #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> <para> @@ -599,7 +599,7 @@ int irc_exec( irc_t *irc, char **cmd ) } else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) { - irc_write( irc, ":%s!%s@%s PRIVMSG %s :%s", irc->nick, irc->user, irc->host, cmd[1], cmd[2] ); + irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); } else { diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index b6dcf4b7..413f77ef 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -756,10 +756,10 @@ static time_t iso8601_to_time(char *timestamp) static void jabber_handlemessage(gjconn gjc, jpacket p) { - xmlnode y, xmlns, subj, z; + xmlnode y, xmlns, z; time_t time_sent = time(NULL); - char *from = NULL, *msg = NULL, *type = NULL, *topic = NULL; + char *from = NULL, *msg = NULL, *type = NULL; char m[BUF_LONG * 2]; type = xmlnode_get_attrib(p->x, "type"); @@ -797,18 +797,7 @@ static void jabber_handlemessage(gjconn gjc, jpacket p) return; if (type && !g_strcasecmp(type, "jabber:x:conference")) { - 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); */ + /* do nothing */ } else if (msg) { /* whisper */ struct jabber_chat *jc; g_snprintf(m, sizeof(m), "%s", msg); @@ -816,22 +805,15 @@ static void jabber_handlemessage(gjconn gjc, jpacket p) serv_got_chat_in(GJ_GC(gjc), jc->b->id, p->from->resource, 1, m, time_sent); else { int flags = 0; - /* ** 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 ** */ + + 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); } } @@ -846,75 +828,45 @@ static void jabber_handlemessage(gjconn gjc, jpacket p) do_error_dialog(GJ_GC(gjc), msg, from); g_free(from); } - } 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); + } else if (!g_strcasecmp(type, "headline")) { + char *subject, *body, *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); + 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)" ); - g_free(msg); - g_free(topic); - + 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 ); } } diff --git a/protocols/nogaim.c b/protocols/nogaim.c index ead86f65..474b91b2 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -294,8 +294,9 @@ void hide_login_progress_error( struct gaim_connection *gc, char *msg ) void serv_got_crap( struct gaim_connection *gc, char *format, ... ) { va_list params; - char text[1024], buf[1024]; + char text[1024], buf[1024], acc_id[33]; char *msg; + account_t *a; va_start( params, format ); g_vsnprintf( text, sizeof( text ), format, params ); @@ -311,7 +312,18 @@ void serv_got_crap( struct gaim_connection *gc, char *format, ... ) ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) ) strip_html( msg ); - irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, 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 ); } static gboolean send_keepalive( gpointer d ) @@ -705,31 +717,34 @@ void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 f do_iconv( "UTF-8", set_getstr( irc, "charset" ), msg, buf, 0, 8192 ) != -1 ) msg = buf; - while( strlen( msg ) > 450 ) + while( strlen( msg ) > 425 ) { char tmp, *nl; - tmp = msg[450]; - msg[450] = 0; + tmp = msg[425]; + msg[425] = 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' ) ) ) + /* 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; *nl = 0; + } irc_msgfrom( irc, u->nick, msg ); - msg[450] = tmp; - /* Move on. */ if( nl ) { - *nl = '\n'; + *nl = tmp; msg = nl + 1; } else { - msg += 450; + msg[425] = tmp; + msg += 425; } } irc_msgfrom( irc, u->nick, msg ); @@ -743,7 +758,7 @@ void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout ) return; if( ( u = user_findhandle( gc, handle ) ) ) - irc_noticefrom( gc->irc, u->nick, "* Typing a message *" ); + irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" ); } void serv_got_chat_left( struct gaim_connection *gc, int id ) diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile index acf4794a..5ef996a1 100644 --- a/protocols/oscar/Makefile +++ b/protocols/oscar/Makefile @@ -9,7 +9,7 @@ -include ../../Makefile.settings # [SH] Program variables -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 +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 CFLAGS += -Wall LFLAGS += -r diff --git a/protocols/oscar/aim.h b/protocols/oscar/aim.h index 2ba29c8b..f7bf1a8e 100644 --- a/protocols/oscar/aim.h +++ b/protocols/oscar/aim.h @@ -167,19 +167,6 @@ struct client_info_s { #define AIM_CONN_TYPE_CHAT 0x000e #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. */ @@ -190,7 +177,6 @@ struct client_info_s { #define AIM_CONN_STATUS_INPROGRESS 0x0100 #define AIM_FRAMETYPE_FLAP 0x0000 -#define AIM_FRAMETYPE_OFT 0x0001 /* * message type flags @@ -257,12 +243,6 @@ typedef struct aim_frame_s { guint8 type; 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 */ guint8 handled; /* 0 = new, !0 = been handled */ @@ -669,14 +649,6 @@ struct aim_invite_priv { #define AIM_COOKIETYPE_CHAT 0x05 #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); diff --git a/protocols/oscar/aim_internal.h b/protocols/oscar/aim_internal.h index 29c16b9f..80a9c758 100644 --- a/protocols/oscar/aim_internal.h +++ b/protocols/oscar/aim_internal.h @@ -191,7 +191,6 @@ aim_msgcookie_t *aim_uncachecookie(aim_session_t *sess, guint8 *cookie, int type aim_msgcookie_t *aim_mkcookie(guint8 *, int, void *); 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); int aim_extractuserinfo(aim_session_t *sess, aim_bstream_t *bs, aim_userinfo_t *); diff --git a/protocols/oscar/conn.c b/protocols/oscar/conn.c index 711e3458..0155e5bc 100644 --- a/protocols/oscar/conn.c +++ b/protocols/oscar/conn.c @@ -163,9 +163,7 @@ static void connkill_real(aim_session_t *sess, aim_conn_t **deadconn) /* * This will free ->internal if it necessary... */ - if ((*deadconn)->type == AIM_CONN_TYPE_RENDEZVOUS) - aim_conn_kill_rend(sess, *deadconn); - else if ((*deadconn)->type == AIM_CONN_TYPE_CHAT) + if ((*deadconn)->type == AIM_CONN_TYPE_CHAT) aim_conn_kill_chat(sess, *deadconn); if ((*deadconn)->inside) { @@ -313,8 +311,6 @@ void aim_conn_close(aim_conn_t *deadconn) deadconn->fd = -1; if (deadconn->handlerlist) aim_clearhandlers(deadconn); - if (deadconn->type == AIM_CONN_TYPE_RENDEZVOUS) - aim_conn_close_rend((aim_session_t *)deadconn->sessv, deadconn); return; } diff --git a/protocols/oscar/ft.c b/protocols/oscar/ft.c deleted file mode 100644 index ddb64e7a..00000000 --- a/protocols/oscar/ft.c +++ /dev/null @@ -1,2005 +0,0 @@ -/* - * File transfer (OFT) and DirectIM (ODC). - * (OSCAR File Transfer, Oscar Direct Connect(ion?) - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <aim.h> -#include <glib.h> -#include "ft.h" - -#ifndef _WIN32 -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <sys/utsname.h> /* for aim_directim_initiate */ -#include <arpa/inet.h> /* for inet_ntoa */ -#endif - -/* TODO: - o look for memory leaks.. there's going to be shitloads, i'm sure. -*/ - -struct aim_directim_intdata { - guint8 cookie[8]; - char sn[MAXSNLEN+1]; - char ip[22]; -}; - -static int listenestablish(guint16 portnum); - -/** - * aim_handlerendconnect - call this to accept OFT connections and set up the required structures - * @sess: the session - * @cur: the conn the incoming connection is on - * - * call this when you get an outstanding read on a conn with subtype - * AIM_CONN_SUBTYPE_RENDEZVOUS_OUT, it will clone the current - * &aim_conn_t and tweak things as appropriate. the new conn and the - * listener conn are both returned to the client in the - * %AIM_CB_FAM_OFT, %AIM_CB_OFT_<CLASS>INITIATE callback. - */ -int aim_handlerendconnect(aim_session_t *sess, aim_conn_t *cur) -{ - int acceptfd = 0; - struct sockaddr cliaddr; - unsigned int clilen = sizeof(cliaddr); - int ret = 0; - aim_conn_t *newconn; - - if ((acceptfd = accept(cur->fd, &cliaddr, &clilen)) == -1) - return 0; /* not an error */ - - if (cliaddr.sa_family != AF_INET) { /* just in case IPv6 really is happening */ - closesocket(acceptfd); - aim_conn_close(cur); - return -1; - } - - if (!(newconn = aim_cloneconn(sess, cur))) { - closesocket(acceptfd); - aim_conn_close(cur); - return -1; - } - - newconn->type = AIM_CONN_TYPE_RENDEZVOUS; - newconn->fd = acceptfd; - - if (newconn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) { - struct aim_directim_intdata *priv; - aim_rxcallback_t userfunc; - - priv = (struct aim_directim_intdata *)(newconn->internal = cur->internal); - cur->internal = NULL; - - g_snprintf(priv->ip, sizeof(priv->ip), "%s:%u", - inet_ntoa(((struct sockaddr_in *)&cliaddr)->sin_addr), - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); - - if ((userfunc = aim_callhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE))) - ret = userfunc(sess, NULL, newconn, cur); - - } else if (newconn->subtype == AIM_CONN_SUBTYPE_OFT_GETFILE) { -#if 0 - struct aim_filetransfer_priv *priv; - aim_rxcallback_t userfunc; - - - newconn->priv = cur->priv; - cur->priv = NULL; - priv = (struct aim_filetransfer_priv *)newconn->priv; - - g_snprintf(priv->ip, sizeof(priv->ip), "%s:%u", inet_ntoa(((struct sockaddr_in *)&cliaddr)->sin_addr), ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); - - if ((userfunc = aim_callhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEINITIATE))) - ret = userfunc(sess, NULL, newconn, cur); -#endif - } else { - do_error_dialog(sess->aux_data, "Got a Connection on a listener that's not Rendezvous Closing conn.", "Gaim"); - aim_conn_close(newconn); - ret = -1; - } - - return ret; -} - -/** - * aim_send_typing - send client-to-client typing notification over established connection - * @sess: session to conn - * @conn: directim connection - * @typing: If true, notify user has started typing; if false, notify user has stopped. - * - * The connection must have been previously established. - */ -int aim_send_typing(aim_session_t *sess, aim_conn_t *conn, int typing) -{ - -struct aim_directim_intdata *intdata = (struct aim_directim_intdata *)conn->internal; - aim_frame_t *fr; - aim_bstream_t hdrbs; /* XXX this should be within aim_frame_t */ - - if (!sess || !conn || (conn->type != AIM_CONN_TYPE_RENDEZVOUS)) - return -EINVAL; - - if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x01, 0))) - return -ENOMEM; - - memcpy(fr->hdr.oft.magic, "ODC2", 4); - - fr->hdr.oft.hdr2len = 0x44; - - if (!(fr->hdr.oft.hdr2 = g_malloc(fr->hdr.oft.hdr2len))) { - aim_frame_destroy(fr); - return -ENOMEM; - } - memset(fr->hdr.oft.hdr2, 0, fr->hdr.oft.hdr2len); - - aim_bstream_init(&hdrbs, fr->hdr.oft.hdr2, fr->hdr.oft.hdr2len); - - aimbs_put16(&hdrbs, 0x0006); - aimbs_put16(&hdrbs, 0x0000); - aimbs_putraw(&hdrbs, intdata->cookie, 8); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put32(&hdrbs, 0x00000000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - - /* flags -- 0x000e for "started typing", 0x0002 for "stopped typing */ - aimbs_put16(&hdrbs, ( typing ? 0x000e : 0x0002)); - - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_putraw(&hdrbs, (guint8 *)sess->sn, strlen(sess->sn)); - - aim_bstream_setpos(&hdrbs, 52); /* bleeehh */ - - aimbs_put8(&hdrbs, 0x00); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - - /* end of hdr2 */ - - aim_tx_enqueue(sess, fr); - - return 0; -} - -/** - * aim_send_im_direct - send IM client-to-client over established connection - * @sess: session to conn - * @conn: directim connection - * @msg: null-terminated string to send. - * len: The length of the message to send, including binary data. - * - * Call this just like you would aim_send_im, to send a directim. You - * _must_ have previously established the directim connection. - */ -int aim_send_im_direct(aim_session_t *sess, aim_conn_t *conn, const char *msg, int len) -{ - struct aim_directim_intdata *intdata = (struct aim_directim_intdata *)conn->internal; - aim_frame_t *fr; - aim_bstream_t hdrbs; /* XXX this should be within aim_frame_t */ - - if (!sess || !conn || !msg || (conn->type != AIM_CONN_TYPE_RENDEZVOUS)) - return -EINVAL; - - if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x01, len))) - return -ENOMEM; - - memcpy(fr->hdr.oft.magic, "ODC2", 4); - - fr->hdr.oft.hdr2len = 0x44; - - if (!(fr->hdr.oft.hdr2 = g_malloc(fr->hdr.oft.hdr2len))) { - aim_frame_destroy(fr); - return -ENOMEM; - } - memset(fr->hdr.oft.hdr2, 0, fr->hdr.oft.hdr2len); - - aim_bstream_init(&hdrbs, fr->hdr.oft.hdr2, fr->hdr.oft.hdr2len); - - aimbs_put16(&hdrbs, 0x0006); - aimbs_put16(&hdrbs, 0x0000); - aimbs_putraw(&hdrbs, intdata->cookie, 8); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put32(&hdrbs, len); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - - /* flags -- 0x000e for "started typing", 0x0002 for "stopped typing, 0x0000 for message */ - aimbs_put16(&hdrbs, 0x0000); - - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_putraw(&hdrbs, (guint8 *)sess->sn, strlen(sess->sn)); - - aim_bstream_setpos(&hdrbs, 52); /* bleeehh */ - - aimbs_put8(&hdrbs, 0x00); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - aimbs_put16(&hdrbs, 0x0000); - - /* end of hdr2 */ - -#if 0 /* XXX this is how you send buddy icon info... */ - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0008); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x000c); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0000); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x1466); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x0001); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x2e0f); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0x393e); - i += aimutil_put16(newpacket->hdr.oft.hdr2+i, 0xcac8); -#endif - aimbs_putraw(&fr->data, (guint8 *)msg, len); - - aim_tx_enqueue(sess, fr); - - return 0; -} - -static int getlocalip(guint8 *ip) -{ - struct hostent *hptr; - char localhost[129]; - - /* XXX if available, use getaddrinfo() */ - /* XXX allow client to specify which IP to use for multihomed boxes */ - - if (gethostname(localhost, 128) < 0) - return -1; - - if (!(hptr = gethostbyname(localhost))) - return -1; - - memcpy(ip, hptr->h_addr_list[0], 4); - - return 0; -} - -/** - * aim_directim_intitiate - For those times when we want to open up the directim channel ourselves. - * @sess: your session, - * @conn: the BOS conn, - * @priv: a dummy priv value (we'll let it get filled in later) (if you pass a %NULL, we alloc one) - * @destsn: the SN to connect to. - * - */ -aim_conn_t *aim_directim_initiate(aim_session_t *sess, const char *destsn) -{ - aim_conn_t *newconn; - aim_msgcookie_t *cookie; - struct aim_directim_intdata *priv; - int listenfd; - guint16 port = 4443; - guint8 localip[4]; - guint8 ck[8]; - - if (getlocalip(localip) == -1) - return NULL; - - if ((listenfd = listenestablish(port)) == -1) - return NULL; - - aim_request_directim(sess, destsn, localip, port, ck); - - cookie = (aim_msgcookie_t *)g_new0(aim_msgcookie_t,1); - memcpy(cookie->cookie, ck, 8); - cookie->type = AIM_COOKIETYPE_OFTIM; - - /* this one is for the cookie */ - priv = (struct aim_directim_intdata *)g_new0(struct aim_directim_intdata,1); - - memcpy(priv->cookie, ck, 8); - strncpy(priv->sn, destsn, sizeof(priv->sn)); - cookie->data = priv; - aim_cachecookie(sess, cookie); - - /* XXX switch to aim_cloneconn()? */ - if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS_OUT, NULL))) { - closesocket(listenfd); - return NULL; - } - - /* this one is for the conn */ - priv = (struct aim_directim_intdata *)g_new0(struct aim_directim_intdata, 1); - - memcpy(priv->cookie, ck, 8); - strncpy(priv->sn, destsn, sizeof(priv->sn)); - - newconn->fd = listenfd; - newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM; - newconn->internal = priv; - newconn->lastactivity = time(NULL); - - return newconn; -} - -/** - * aim_sendfile_intitiate - For those times when we want to send the file ourselves. - * @sess: your session, - * @conn: the BOS conn, - * @destsn: the SN to connect to. - * @filename: the name of the files you want to send - * - */ -aim_conn_t *aim_sendfile_initiate(aim_session_t *sess, const char *destsn, const char *filename, guint16 numfiles, guint32 totsize) -{ - aim_conn_t *newconn; - aim_msgcookie_t *cookie; - struct aim_directim_intdata *priv; - int listenfd; - guint16 port = 4443; - guint8 localip[4]; - guint8 ck[8]; - - if (getlocalip(localip) == -1) - return NULL; - - if ((listenfd = listenestablish(port)) == -1) - return NULL; - - aim_request_sendfile(sess, destsn, filename, numfiles, totsize, localip, port, ck); - - cookie = (aim_msgcookie_t *)g_new0(aim_msgcookie_t,1); - memcpy(cookie->cookie, ck, 8); - cookie->type = AIM_COOKIETYPE_OFTIM; - - /* this one is for the cookie */ - priv = (struct aim_directim_intdata *)g_new0(struct aim_directim_intdata,1); - - memcpy(priv->cookie, ck, 8); - strncpy(priv->sn, destsn, sizeof(priv->sn)); - cookie->data = priv; - aim_cachecookie(sess, cookie); - - /* XXX switch to aim_cloneconn()? */ - if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS_OUT, NULL))) { - closesocket(listenfd); - return NULL; - } - - /* this one is for the conn */ - priv = (struct aim_directim_intdata *)g_new0(struct aim_directim_intdata,1); - - memcpy(priv->cookie, ck, 8); - strncpy(priv->sn, destsn, sizeof(priv->sn)); - - newconn->fd = listenfd; - newconn->subtype = AIM_CONN_SUBTYPE_OFT_SENDFILE; - newconn->internal = priv; - newconn->lastactivity = time(NULL); - - return newconn; -} - -#if 0 -/** - * unsigned int aim_oft_listener_clean - close up old listeners - * @sess: session to clean up in - * @age: maximum age in seconds - * - * returns number closed, -1 on error. - */ -unsigned int aim_oft_listener_clean(struct aim_session_t *sess, time_t age) -{ - struct aim_conn_t *cur; - time_t now; - unsigned int hit = 0; - - if (!sess) - return -1; - now = time(NULL); - faim_mutex_lock(&sess->connlistlock); - for(cur = sess->connlist;cur; cur = cur->next) - if (cur->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) { - faim_mutex_lock(&cur->active); - if (cur->lastactivity < (now - age) ) { - faim_mutex_unlock(&cur->active); - aim_conn_close(cur); - hit++; - } else - faim_mutex_unlock(&cur->active); - } - faim_mutex_unlock(&sess->connlistlock); - return hit; -} -#endif - -const char *aim_directim_getsn(aim_conn_t *conn) -{ - struct aim_directim_intdata *intdata; - - if (!conn) - return NULL; - - if ((conn->type != AIM_CONN_TYPE_RENDEZVOUS) || - (conn->subtype != AIM_CONN_SUBTYPE_OFT_DIRECTIM)) - return NULL; - - if (!conn->internal) - return NULL; - - intdata = (struct aim_directim_intdata *)conn->internal; - - return intdata->sn; -} - -/** - * aim_directim_connect - connect to buddy for directim - * @sess: the session to append the conn to, - * @sn: the SN we're connecting to - * @addr: address to connect to - * - * This is a wrapper for aim_newconn. - * - * If addr is NULL, the socket is not created, but the connection is - * allocated and setup to connect. - * - */ -aim_conn_t *aim_directim_connect(aim_session_t *sess, const char *sn, const char *addr, const guint8 *cookie) -{ - aim_conn_t *newconn; - struct aim_directim_intdata *intdata; - - if (!sess || !sn) - return NULL; - - if (!(intdata = g_new0(struct aim_directim_intdata, 1))) - return NULL; - - memcpy(intdata->cookie, cookie, 8); - strncpy(intdata->sn, sn, sizeof(intdata->sn)); - if (addr) - strncpy(intdata->ip, addr, sizeof(intdata->ip)); - - /* XXX verify that non-blocking connects actually work */ - if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS, addr))) { - g_free(intdata); - return NULL; - } - - if (!newconn) { - g_free(intdata); - return newconn; - } - - newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM; - newconn->internal = intdata; - - return newconn; -} - -/** - * aim_directim_getconn - find a directim conn for buddy name - * @sess: your session, - * @name: the name to get, - * - * returns conn for directim with name, %NULL if none found. - * - */ -aim_conn_t *aim_directim_getconn(aim_session_t *sess, const char *name) -{ - aim_conn_t *cur; - - if (!sess || !name || !strlen(name)) - return NULL; - - for (cur = sess->connlist; cur; cur = cur->next) { - struct aim_directim_intdata *intdata; - - if ((cur->type != AIM_CONN_TYPE_RENDEZVOUS) || (cur->subtype != AIM_CONN_SUBTYPE_OFT_DIRECTIM)) - continue; - - intdata = cur->internal; - - if (aim_sncmp(intdata->sn, name) == 0) - break; - } - - return cur; -} - -/** - * aim_accepttransfer - accept a file transfer request - * @sess: the session, - * @conn: the BOS conn for the CAP reply - * @sn: the screenname to send it to, - * @cookie: the cookie used - * @ip: the ip to connect to - * @listingfiles: number of files to share - * @listingtotsize: total size of shared files - * @listingsize: length of the listing file(buffer) - * @listingchecksum: checksum of the listing - * @rendid: capability type (%AIM_CAPS_GETFILE or %AIM_CAPS_SENDFILE) - * - * Returns new connection or %NULL on error. - * - * XXX this should take a struct. - */ -aim_conn_t *aim_accepttransfer(aim_session_t *sess, - aim_conn_t *conn, - const char *sn, const guint8 *cookie, - const guint8 *ip, - guint16 listingfiles, - guint16 listingtotsize, - guint16 listingsize, - guint32 listingchecksum, - guint16 rendid) -{ - return NULL; -#if 0 - struct command_tx_struct *newpacket, *newoft; - struct aim_conn_t *newconn; - struct aim_fileheader_t *fh; - struct aim_filetransfer_priv *priv; - struct aim_msgcookie_t *cachedcook; - int curbyte, i; - - if (!sess || !conn || !sn || !cookie || !ip) { - return NULL; - } - - newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS, ip); - - if (!newconn || (newconn->fd == -1)) { - perror("aim_newconn"); - faimdprintf(sess, 2, "could not connect to %s (fd: %i)\n", ip, newconn?newconn->fd:0); - return newconn; - } else { - priv = (struct aim_filetransfer_priv *)g_new0(struct aim_filetransfer_priv,1); - - memcpy(priv->cookie, cookie, 8); - priv->state = 0; - strncpy(priv->sn, sn, MAXSNLEN); - strncpy(priv->ip, ip, sizeof(priv->ip)); - newconn->priv = (void *)priv; - - faimdprintf(sess, 2, "faim: connected to peer (fd = %d)\n", newconn->fd); - } - - if (rendid == AIM_CAPS_GETFILE) { - newconn->subtype = AIM_CONN_SUBTYPE_OFT_GETFILE; - - faimdprintf(sess, 2, "faim: getfile request accept\n"); - - if (!(newoft = aim_tx_new(sess, newconn, AIM_FRAMETYPE_OFT, 0x1108, 0))) { - faimdprintf(sess, 2, "faim: aim_accepttransfer: tx_new OFT failed\n"); - /* XXX: conn leak here */ - return NULL; - } - - newoft->lock = 1; - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - if (!(fh = (struct aim_fileheader_t*)g_new0(struct aim_fileheader_t,1))) { - /* XXX: conn leak here */ - perror("calloc"); - return NULL; - } - - fh->encrypt = 0x0000; - fh->compress = 0x0000; - fh->totfiles = listingfiles; - fh->filesleft = listingfiles; /* is this right -- total parts and parts left?*/ - fh->totparts = 0x0001; - fh->partsleft = 0x0001; - fh->totsize = listingtotsize; - fh->size = listingsize; /* ls -l listing.txt */ - fh->modtime = (int)time(NULL); /* we'll go with current time for now */ - fh->checksum = listingchecksum; - fh->rfcsum = 0x00000000; - fh->rfsize = 0x00000000; - fh->cretime = 0x00000000; - fh->rfcsum = 0x00000000; - fh->nrecvd = 0x00000000; - fh->recvcsum = 0x00000000; - memset(fh->idstring, 0, sizeof(fh->idstring)); - memcpy(fh->idstring, "OFT_Windows ICBMFT V1.1 32", sizeof(fh->idstring)); - fh->flags = 0x02; - fh->lnameoffset = 0x1a; - fh->lsizeoffset = 0x10; - memset(fh->dummy, 0, sizeof(fh->dummy)); - memset(fh->macfileinfo, 0, sizeof(fh->macfileinfo)); - - /* we need to figure out these encodings for filenames */ - fh->nencode = 0x0000; - fh->nlanguage = 0x0000; - memset(fh->name, 0, sizeof(fh->name)); - memcpy(fh->name, "listing.txt", sizeof(fh->name)); - - if (!(newoft->hdr.oft.hdr2 = (char *)calloc(1,newoft->hdr.oft.hdr2len))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - /* XXX: conn leak */ - perror("calloc (1)"); - return NULL; - } - - memcpy(fh->bcookie, cookie, 8); - - if (!(aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, fh))) - faimdprintf(sess, 1, "eek, bh fail!\n"); - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); - - if (!(cachedcook = (struct aim_msgcookie_t *)calloc(1, sizeof(struct aim_msgcookie_t)))) { - faimdprintf(sess, 1, "faim: accepttransfer: couldn't calloc cachedcook. yeep!\n"); - /* XXX: more cleanup, conn leak */ - perror("calloc (2)"); - return NULL; - } - - memcpy(&(priv->fh), fh, sizeof(struct aim_fileheader_t)); - memcpy(cachedcook->cookie, cookie, 8); - - cachedcook->type = AIM_COOKIETYPE_OFTGET; - cachedcook->data = (void *)priv; - - if (aim_cachecookie(sess, cachedcook) == -1) - faimdprintf(sess, 1, "faim: ERROR caching message cookie\n"); - - g_free(fh); - - /* OSCAR CAP accept packet */ - - if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+8+2+1+strlen(sn)+4+2+8+16))) { - return NULL; - } - } else { - return NULL; - } - - newpacket->lock = 1; - curbyte = aim_putsnac(newpacket->data, 0x0004, 0x0006, 0x0000, sess->snac_nextid); - - for (i = 0; i < 8; i++) - curbyte += aimutil_put8(newpacket->data+curbyte, cookie[i]); - - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002); - curbyte += aimutil_put8(newpacket->data+curbyte, strlen(sn)); - curbyte += aimutil_putstr(newpacket->data+curbyte, sn, strlen(sn)); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0005); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x001a); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002 /* accept*/); - - for (i = 0;i < 8; i++) - curbyte += aimutil_put8(newpacket->data+curbyte, cookie[i]); - - curbyte += aim_putcap(newpacket->data+curbyte, 0x10, rendid); - newpacket->lock = 0; - aim_tx_enqueue(sess, newpacket); - - return newconn; -#endif -} - -/** - * aim_getlisting(FILE *file) -- get an aim_fileheader_t for a given FILE* - * @file is an opened listing file - * - * returns a pointer to the filled-in fileheader_t - * - * Currently omits checksum. we'll fix this when AOL breaks us, i - * guess. - * - */ -struct aim_fileheader_t *aim_getlisting(aim_session_t *sess, FILE *file) -{ - return NULL; -#if 0 - struct aim_fileheader_t *fh; - u_long totsize = 0, size = 0, checksum = 0xffff0000; - short totfiles = 0; - char *linebuf, sizebuf[9]; - - int linelength = 1024; - - /* XXX: if we have a line longer than 1024chars, God help us. */ - if ( (linebuf = (char *)calloc(1, linelength)) == NULL ) { - faimdprintf(sess, 2, "linebuf calloc failed\n"); - return NULL; - } - - if (fseek(file, 0, SEEK_END) == -1) { /* use this for sanity check */ - perror("getlisting END1 fseek:"); - faimdprintf(sess, 2, "getlising fseek END1 error\n"); - } - - if ((size = ftell(file)) == -1) { - perror("getlisting END1 getpos:"); - faimdprintf(sess, 2, "getlising getpos END1 error\n"); - } - - if (fseek(file, 0, SEEK_SET) != 0) { - perror("getlesting fseek(SET):"); - faimdprintf(sess, 2, "faim: getlisting: couldn't seek to beginning of listing file\n"); - } - - memset(linebuf, 0, linelength); - - size = 0; - - while(fgets(linebuf, linelength, file)) { - totfiles++; - memset(sizebuf, 0, 9); - - size += strlen(linebuf); - - if (strlen(linebuf) < 23) { - faimdprintf(sess, 2, "line \"%s\" too short. skipping\n", linebuf); - continue; - } - if (linebuf[strlen(linebuf)-1] != '\n') { - faimdprintf(sess, 2, "faim: OFT: getlisting -- hit EOF or line too long!\n"); - } - - memcpy(sizebuf, linebuf+17, 8); - - totsize += strtol(sizebuf, NULL, 10); - memset(linebuf, 0, linelength); - } - - if (fseek(file, 0, SEEK_SET) == -1) { - perror("getlisting END2 fseek:"); - faimdprintf(sess, 2, "getlising fseek END2 error\n"); - } - - g_free(linebuf); - - /* we're going to ignore checksumming the data for now -- that - * requires walking the whole listing.txt. it should probably be - * done at register time and cached, but, eh. */ - - if (!(fh = (struct aim_fileheader_t*)calloc(1, sizeof(struct aim_fileheader_t)))) - return NULL; - - fh->encrypt = 0x0000; - fh->compress = 0x0000; - fh->totfiles = totfiles; - fh->filesleft = totfiles; /* is this right ?*/ - fh->totparts = 0x0001; - fh->partsleft = 0x0001; - fh->totsize = totsize; - fh->size = size; /* ls -l listing.txt */ - fh->modtime = (int)time(NULL); /* we'll go with current time for now */ - fh->checksum = checksum; /* XXX: checksum ! */ - fh->rfcsum = 0x00000000; - fh->rfsize = 0x00000000; - fh->cretime = 0x00000000; - fh->rfcsum = 0x00000000; - fh->nrecvd = 0x00000000; - fh->recvcsum = 0x00000000; - - /* memset(fh->idstring, 0, sizeof(fh->idstring)); */ - memcpy(fh->idstring, "OFT_Windows ICBMFT V1.1 32", sizeof(fh->idstring)); - memset(fh->idstring+strlen(fh->idstring), 0, sizeof(fh->idstring)-strlen(fh->idstring)); - - fh->flags = 0x02; - fh->lnameoffset = 0x1a; - fh->lsizeoffset = 0x10; - - /* memset(fh->dummy, 0, sizeof(fh->dummy)); */ - memset(fh->macfileinfo, 0, sizeof(fh->macfileinfo)); - - fh->nencode = 0x0000; /* we need to figure out these encodings for filenames */ - fh->nlanguage = 0x0000; - - /* memset(fh->name, 0, sizeof(fh->name)); */ - memcpy(fh->name, "listing.txt", sizeof(fh->name)); - memset(fh->name+strlen(fh->name), 0, 64-strlen(fh->name)); - - faimdprintf(sess, 2, "faim: OFT: listing fh name %s / %s\n", fh->name, (fh->name+(strlen(fh->name)))); - return fh; -#endif -} - -/** - * aim_listenestablish - create a listening socket on a port. - * @portnum: the port number to bind to. - * - * you need to call accept() when it's connected. returns your fd - * - * XXX: give the client author the responsibility of setting up a - * listener, then we no longer have a libfaim problem with broken - * solaris *innocent smile* -jbm - */ -static int listenestablish(guint16 portnum) -{ -#if HAVE_GETADDRINFO - int listenfd; - const int on = 1; - struct addrinfo hints, *res, *ressave; - char serv[5]; - - g_snprintf(serv, sizeof(serv), "%d", portnum); - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_flags = AI_PASSIVE; - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - if (getaddrinfo(NULL /*any IP*/, serv, &hints, &res) != 0) { - perror("getaddrinfo"); - return -1; - } - ressave = res; - do { - listenfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); - if (listenfd < 0) - continue; - setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (bind(listenfd, res->ai_addr, res->ai_addrlen) == 0) - break; - /* success */ - closesocket(listenfd); - } while ( (res = res->ai_next) ); - - if (!res) - return -1; - - if (listen(listenfd, 1024)!=0) { - perror("listen"); - return -1; - } - - freeaddrinfo(ressave); - return listenfd; -#else - int listenfd; - const int on = 1; - struct sockaddr_in sockin; - - if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - perror("socket(listenfd)"); - return -1; - } - - if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0) { - perror("setsockopt(listenfd)"); - closesocket(listenfd); - return -1; - } - - memset(&sockin, 0, sizeof(struct sockaddr_in)); - sockin.sin_family = AF_INET; - sockin.sin_port = htons(portnum); - - if (bind(listenfd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0) { - perror("bind(listenfd)"); - closesocket(listenfd); - return -1; - } - if (listen(listenfd, 4) != 0) { - perror("listen(listenfd)"); - closesocket(listenfd); - return -1; - } - return listenfd; -#endif -} - -static int getcommand_getfile(aim_session_t *sess, aim_conn_t *conn) -{ -#if 0 - struct aim_filetransfer_priv *ft; - aim_rxcallback_t userfunc; - - ft = conn->priv; - if (ft->state == 2) { - /* waiting on listing data */ - int ret = 0; - char *listing; - struct command_tx_struct *newoft; - - if (!(listing = g_malloc(ft->fh.size))) - return -1; - - ft->state = 0; - if (aim_recv(conn->fd, listing, ft->fh.size) != ft->fh.size) - faimdprintf(sess, 2, "OFT get: file %s was short. (0x%lx)\n", ft->fh.name, ft->fh.size); - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x120b, 0))) { - faimdprintf(sess, 2, "faim: aim_get_command_rendezvous: getfile listing: tx_new OFT failed\n"); - faim_mutex_unlock(&conn->active); - g_free(listing); - aim_conn_close(conn); - return -1; - } - - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - /* Protocol BS - set nrecvd to size of listing, recvcsum to listing checksum, flags to 0 */ - - ft->fh.nrecvd = ft->fh.size; - ft->fh.recvcsum = ft->fh.checksum; - ft->fh.flags = 0; - - if (!(newoft->hdr.oft.hdr2 = (char *)calloc(1,newoft->hdr.oft.hdr2len))) { - aim_frame_destroy(newoft); - g_free(listing); - return -1; - } - - if (!(aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)))) - faimdprintf(sess, 2, "eek! bh fail listing\n"); - - /* send the 120b */ - aim_tx_enqueue(sess, newoft); - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILELISTING)) ) - ret = userfunc(sess, NULL, conn, ft, listing); - - g_free(listing); - return ret; - } - - if (ft->state == 3) { - /* waiting on file data */ - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILERECEIVE)) ) - return userfunc(sess, NULL, conn, ft); - return 0; - } - - if (ft->state == 4) { - if( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILESTATE4)) ) - return userfunc(sess, NULL, conn); - aim_conn_close(conn); - return 0; - } - - return 0; -#else - return -1; -#endif -} - -static void connclose_sendfile(aim_session_t *sess, aim_conn_t *conn) -{ - aim_msgcookie_t *cook; - struct aim_filetransfer_priv *priv = (struct aim_filetransfer_priv *)conn->priv; - - cook = aim_uncachecookie(sess, (guint8 *)priv->cookie, AIM_COOKIETYPE_OFTSEND); - aim_cookie_free(sess, cook); - - return; -} - -static void connkill_sendfile(aim_session_t *sess, aim_conn_t *conn) -{ - - g_free(conn->internal); - - return; -} - -static void connclose_getfile(aim_session_t *sess, aim_conn_t *conn) -{ - aim_msgcookie_t *cook; - struct aim_filetransfer_priv *priv = (struct aim_filetransfer_priv *)conn->priv; - - cook = aim_uncachecookie(sess, (guint8 *)priv->cookie, AIM_COOKIETYPE_OFTGET); - aim_cookie_free(sess, cook); - - return; -} - -static void connkill_getfile(aim_session_t *sess, aim_conn_t *conn) -{ - - g_free(conn->internal); - - return; -} - -static void connclose_directim(aim_session_t *sess, aim_conn_t *conn) -{ - struct aim_directim_intdata *intdata = (struct aim_directim_intdata *)conn->internal; - aim_msgcookie_t *cook; - - cook = aim_uncachecookie(sess, intdata->cookie, AIM_COOKIETYPE_OFTIM); - aim_cookie_free(sess, cook); - - return; -} - -static void connkill_directim(aim_session_t *sess, aim_conn_t *conn) -{ - - g_free(conn->internal); - - return; -} - -void aim_conn_close_rend(aim_session_t *sess, aim_conn_t *conn) -{ - - if (conn->type != AIM_CONN_TYPE_RENDEZVOUS) - return; - - if (conn->subtype == AIM_CONN_SUBTYPE_OFT_SENDFILE) - connclose_sendfile(sess, conn); - else if (conn->subtype == AIM_CONN_SUBTYPE_OFT_GETFILE) - connclose_getfile(sess, conn); - else if (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) - connclose_directim(sess, conn); - - return; -} - -void aim_conn_kill_rend(aim_session_t *sess, aim_conn_t *conn) -{ - - if (conn->type != AIM_CONN_TYPE_RENDEZVOUS) - return; - - if (conn->subtype == AIM_CONN_SUBTYPE_OFT_SENDFILE) - connkill_sendfile(sess, conn); - else if (conn->subtype == AIM_CONN_SUBTYPE_OFT_GETFILE) - connkill_getfile(sess, conn); - else if (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) - connkill_directim(sess, conn); - - return; -} - -static int handlehdr_directim(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ - aim_frame_t fr; - aim_rxcallback_t userfunc; - guint32 payloadlength; - guint16 flags; - char *snptr = NULL; - - fr.conn = conn; - - payloadlength = aimutil_get32(hdr+22); - flags = aimutil_get16(hdr+32); - snptr = (char *)hdr+38; - - if (flags == 0x000e) { - int ret = 0; - - if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING))) - ret = userfunc(sess, &fr, snptr, 1); - - return ret; - - } else if (flags == 0x0002) { - int ret = 0; - - if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING))) - ret = userfunc(sess, &fr, snptr, 0); - - return ret; - - } else if ((flags == 0x0000) && payloadlength) { - char *msg, *msg2; - int ret = 0; - int recvd = 0; - int i; - - if (!(msg = g_malloc(payloadlength+1))) - return -1; - memset(msg, 0, payloadlength+1); - msg2 = msg; - - while (payloadlength - recvd) { - if (payloadlength - recvd >= 1024) - i = aim_recv(conn->fd, msg2, 1024); - else - i = aim_recv(conn->fd, msg2, payloadlength - recvd); - if (i <= 0) { - g_free(msg); - return -1; - } - recvd = recvd + i; - msg2 = msg2 + i; - if ((userfunc=aim_callhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_IMAGETRANSFER))) - userfunc(sess, &fr, snptr, (double)recvd / payloadlength); - } - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINCOMING)) ) - ret = userfunc(sess, &fr, snptr, msg, payloadlength); - - g_free(msg); - - return ret; - } - - return 0; -} - -static int handlehdr_getfile_listing(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_filetransfer_priv *ft; - struct aim_fileheader_t *fh; - struct aim_msgcookie_t *cook; - struct command_tx_struct *newoft; - aim_rxcallback_t userfunc; - - faimdprintf(sess, 2,"faim: rend: fileget 0x1108\n"); - fh = aim_oft_getfh(hdr); - - faim_mutex_unlock(&conn->active); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) { - g_free(fh); - return -1; - } - - ft = cook->data; - - /* we're waaaaiiiting.. for listing.txt */ - ft->state = 2; - - memcpy(&(ft->fh), fh, sizeof(struct aim_fileheader_t)); - g_free(fh); - - if(aim_cachecookie(sess, cook) == -1) { - faimdprintf(sess, 1, "error caching cookie\n"); - return -1; - } - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x1209, 0))) { - aim_conn_close(conn); - return -1; - } - - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - if (!(newoft->hdr.oft.hdr2 = (char *)calloc(1,newoft->hdr.oft.hdr2len))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - if (!(aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); -#endif - return -1; -} - -static int handlehdr_getfile_listing2(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_filetransfer_priv *ft; - struct aim_fileheader_t *fh; - struct aim_msgcookie_t *cook; - int ret = 0; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) - faimdprintf(sess, 2, "shit, no cookie in 0x1209. (%i/%s)going to crash..\n", AIM_COOKIETYPE_OFTGET, fh->bcookie); - - ft = cook->data; - - if (ft->fh.size != fh->size) - faimdprintf(sess, 2, "hrm. ft->fh.size (%ld) != fh->size (%ld). um. using ft->fh.size\n", ft->fh.size, fh->size); - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILELISTINGREQ))) - ret = userfunc(sess, NULL, conn, fh); - - faimdprintf(sess, 2, "faim: get_command_rendezvous: hit end of 1209\n"); - - g_free(fh); - - return ret; -#else - return -1; -#endif -} - -static int handlehdr_getfile_listing3(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_filetransfer_priv *ft; - struct aim_msgcookie_t *cook; - struct aim_fileheader_t *fh; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) { - g_free(fh); - return -1; - } - - g_free(fh); - - ft = cook->data; - - if (aim_cachecookie(sess, cook) == -1) - return -1; - - if ((userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILELISTINGRXCONFIRM))) - return userfunc(sess, NULL, conn); -#endif - return -1; -} - -static int handlehdr_getfile_request(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_filetransfer_priv *ft; - struct aim_msgcookie_t *cook; - struct aim_fileheader_t *fh; - struct command_tx_struct *newoft; - int i = 0; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) { - g_free(fh); - return -1; - } - - ft = cook->data; - memcpy(&(ft->fh), fh, sizeof(struct aim_fileheader_t)); - g_free(fh); - - aim_cachecookie(sess, cook); - - faimdprintf(sess, 2, "faim: fileget: %s seems to want %s\n", ft->sn, ft->fh.name); - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEFILEREQ)) ) - i = userfunc(sess, NULL, conn, &(ft->fh), cook->cookie); - - if (i < 0) - return i; - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0101, 0))) { - faimdprintf(sess, 2, "faim: send_final_transfer: tx_new OFT failed\n"); - return -1; - } - - newoft->lock = 1; - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - if (!(newoft->hdr.oft.hdr2 = calloc(1,newoft->hdr.oft.hdr2len))) { - aim_frame_destroy(newoft); - return -1; - } - - /* protocol BS: nrecvd, recvcsum to 0, flags to 0x20. */ - ft->fh.nrecvd = 0; - ft->fh.recvcsum = 0; - ft->fh.flags = 0x20; - - aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)); - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); - - faimdprintf(sess, 2, "faim: OFT: OFT file header enqueued.\n"); - - return i; -#else - return -1; -#endif -} - -static int handlehdr_getfile_sending(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_fileheader_t *fh; - struct aim_filetransfer_priv *ft; - struct aim_msgcookie_t *cook; - struct command_tx_struct *newoft; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) { - g_free(fh); - return -1; - } - - g_free(fh); - - ft = cook->data; - - ft->state = 3; - - if (aim_cachecookie(sess, cook) == -1) - return -1; - - faimdprintf(sess, 2, "faim: fileget: %s seems to want to send %s\n", ft->sn, ft->fh.name); - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0202, 0))) { - faimdprintf(sess, 2, "faim: send_final_transfer: tx_new OFT failed\n"); - return -1; - } - - newoft->lock = 1; - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - - newoft->hdr.oft.hdr2len = 0x100 - 8; - - if (!(newoft->hdr.oft.hdr2 = calloc(1,newoft->hdr.oft.hdr2len))) { - aim_frame_destroy(newoft); - return -1; - } - - aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)); - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); - - faimdprintf(sess, 2, "faim: OFT: OFT 0x0202 enqueued.\n"); - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEFILEREQ)) == NULL) - return 1; -#else - return -1; -#endif -} - -static int handlehdr_getfile_recv(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_fileheader_t *fh; - struct aim_filetransfer_priv *ft; - struct aim_msgcookie_t *cook; - int ret = 1; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - if (!(cook = aim_checkcookie(sess, fh->bcookie, AIM_COOKIETYPE_OFTGET))) { - g_free(fh); - return -1; - } - - ft = cook->data; - - faimdprintf(sess, 2, "faim: get_rend: looks like we're ready to send data.(oft 0x0202)\n"); - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILEFILESEND)) ) - ret = userfunc(sess, NULL, conn, fh); - - g_free(fh); - - return ret; -#else - return -1; -#endif -} - -static int handlehdr_getfile_finish(aim_session_t *sess, aim_conn_t *conn, guint8 *hdr) -{ -#if 0 - struct aim_fileheader_t *fh; - aim_rxcallback_t userfunc; - - fh = aim_oft_getfh(hdr); - - faimdprintf(sess, 2, "faim: get_rend: looks like we're done with a transfer (oft 0x0204)\n"); - - if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILECOMPLETE)) ) - userfunc(sess, NULL, conn, fh); - - g_free(fh); -#endif - - return -1; -} - -/** - * aim_get_command_rendezvous - OFT equivalent of aim_get_command - * @sess: session to work on - * @conn: conn to pull data from - * - * this reads and handles data from conn->fd. currently a little rough - * around the edges - */ -int aim_get_command_rendezvous(aim_session_t *sess, aim_conn_t *conn) -{ - guint8 hdrbuf1[6]; - guint8 *hdr = NULL; - int hdrlen, hdrtype; - int ret = -1; - - if (!sess || !conn) - return -1; - - memset(hdrbuf1, 0, sizeof(hdrbuf1)); - - /* I guess? I didn't understand any of that mess... */ - if (conn->subtype == AIM_CONN_SUBTYPE_OFT_GETFILE) - return getcommand_getfile(sess, conn); - - /* XXX fix all the error cases here */ - if (aim_recv(conn->fd, hdrbuf1, 6) < 6) { - - do_error_dialog(sess->aux_data, "read error", "Gaim"); - - aim_conn_close(conn); - - return -1; - } - - hdrlen = aimutil_get16(hdrbuf1+4); - hdrlen -= 6; - - hdr = g_malloc(hdrlen); - - if (aim_recv(conn->fd, hdr, hdrlen) < hdrlen) { - do_error_dialog(sess->aux_data, "read error", "Gaim"); - g_free(hdr); - aim_conn_close(conn); - return -1; - } - - hdrtype = aimutil_get16(hdr); - - if (hdrtype == 0x0001) - ret = handlehdr_directim(sess, conn, hdr); - else if (hdrtype == 0x1108) /* getfile listing.txt incoming tx->rx */ - ret = handlehdr_getfile_listing(sess, conn, hdr); - else if (hdrtype == 0x1209) /* get file listing ack rx->tx */ - ret = handlehdr_getfile_listing2(sess, conn, hdr); - else if (hdrtype == 0x120b) /* get file listing rx confirm */ - ret = handlehdr_getfile_listing3(sess, conn, hdr); - else if (hdrtype == 0x120c) /* getfile request */ - ret = handlehdr_getfile_request(sess, conn, hdr); - else if (hdrtype == 0x0101) /* getfile sending data */ - ret = handlehdr_getfile_sending(sess, conn, hdr); - else if (hdrtype == 0x0202) /* getfile recv data */ - ret = handlehdr_getfile_recv(sess, conn, hdr); - else if (hdrtype == 0x0204) /* getfile finished */ - ret = handlehdr_getfile_finish(sess, conn, hdr); - else { - ret = -1; - } - - g_free(hdr); - - if (ret == -1) - aim_conn_close(conn); - - return ret; -} - -#if 0 -/** - * aim_oft_getfh - extracts an &aim_fileheader_t from buffer hdr. - * @hdr: buffer to extract header from - * - * returns pointer to new struct on success; %NULL on error. - * - */ -static struct aim_fileheader_t *aim_oft_getfh(unsigned char *hdr) -{ - struct aim_fileheader_t *fh; - int i, j; - if (!(fh = calloc(1, sizeof(struct aim_fileheader_t)))) - return NULL; - - /* [0] and [1] are the type. we can ignore those here. */ - i = 2; - for(j = 0; j < 8; j++, i++) - fh->bcookie[j] = hdr[i]; - fh->encrypt = aimutil_get16(hdr+i); - i += 2; - fh->compress = aimutil_get16(hdr+i); - i += 2; - fh->totfiles = aimutil_get16(hdr+i); - i += 2; - fh->filesleft = aimutil_get16(hdr+i); - i += 2; - fh->totparts = aimutil_get16(hdr+i); - i += 2; - fh->partsleft = aimutil_get16(hdr+i); - i += 2; - fh->totsize = aimutil_get32(hdr+i); - i += 4; - fh->size = aimutil_get32(hdr+i); - i += 4; - fh->modtime = aimutil_get32(hdr+i); - i += 4; - fh->checksum = aimutil_get32(hdr+i); - i += 4; - fh->rfrcsum = aimutil_get32(hdr+i); - i += 4; - fh->rfsize = aimutil_get32(hdr+i); - i += 4; - fh->cretime = aimutil_get32(hdr+i); - i += 4; - fh->rfcsum = aimutil_get32(hdr+i); - i += 4; - fh->nrecvd = aimutil_get32(hdr+i); - i += 4; - fh->recvcsum = aimutil_get32(hdr+i); - i += 4; - memcpy(fh->idstring, hdr+i, 32); - i += 32; - fh->flags = aimutil_get8(hdr+i); - i += 1; - fh->lnameoffset = aimutil_get8(hdr+i); - i += 1; - fh->lsizeoffset = aimutil_get8(hdr+i); - i += 1; - memcpy(fh->dummy, hdr+i, 69); - i += 69; - memcpy(fh->macfileinfo, hdr+i, 16); - i += 16; - fh->nencode = aimutil_get16(hdr+i); - i += 2; - fh->nlanguage = aimutil_get16(hdr+i); - i += 2; - memcpy(fh->name, hdr+i, 64); - i += 64; - return fh; -} -#endif - -/** - * aim_oft_checksum - calculate oft checksum of buffer - * @buffer: buffer of data to checksum - * @bufsize: size of buffer - * @checksum: pointer to integer to place result in (pointer!) - * - * - * Note that checksum is a pointer. Checksum should be filled with - * 0xFFFF0000 for each new file; you can have this checksum chunks of - * files in series if you just call it repeatedly in a for(; ; ) loop - * and don't reset the checksum between each call. And you thought we - * didn't care about you and your pathetic client's meomry footprint - * ;^) - * - * - * Also, it's been said that this is incorrect as currently - * written. You were warned. - */ -guint32 aim_oft_checksum(aim_session_t *sess, const char *buffer, int bufsize, guint32 *checksum) -{ - return 0xdeadbeef; -#if 0 - guint16 check0, check1; - int i; - - check0 = ((*checksum & 0xFF000000) >> 16); - check1 = ((*checksum & 0x00ff0000) >> 16); - for(i = 0; i < bufsize; i++) { - if (i % 2) { /* use check1 -- second byte */ - if ( (short)buffer[i] > check1 ) { /* wrapping */ - check1 += 0x100; /* this is a cheap way to wrap */ - - /* if we're wrapping, decrement the other one */ - /* XXX: check this corner case */ - if (check0 == 0) - check0 = 0x00ff; - else - check0--; - } - check1 -= buffer[i]; - } else { /* use check0 -- first byte */ - if ( (short)buffer[i] > check0 ) { /* wrapping */ - check0 += 0x100; /* this is a cheap way to wrap */ - - /* if we're wrapping, decrement the other one */ - /* XXX: check this corner case */ - if (check1 == 0) - check1 = 0x00ff; - else - check1--; - } - check0 -= buffer[i]; - } - } - - if (check0 > 0xff || check1 > 0xff) { - /* they shouldn't be able to do this. error! */ - faimdprintf(sess, 2, "check0 or check1 is too high: 0x%04x, 0x%04x\n", check0, check1); - return -1; - } - - /* grab just the lowest byte; this should be clean, but just in - case */ - check0 &= 0xff; - check1 &= 0xff; - - *checksum = ((check0 * 0x1000000) + (check1 * 0x10000)); - return *checksum; -#endif -} - -#if 0 -/** - * aim_oft_buildheader - fills a buffer with network-order fh data - * @dest: buffer to fill -- pre-alloced - * @fh: fh to get data from - * - * returns length written; -1 on error. - * DOES NOT DO BOUNDS CHECKING! - * - */ -static int oft_buildheader(unsigned char *dest, struct aim_fileheader_t *fh) -{ - int i, curbyte; - if (!dest || !fh) - return -1; - curbyte = 0; - for(i = 0; i < 8; i++) - curbyte += aimutil_put8(dest+curbyte, fh->bcookie[i]); - curbyte += aimutil_put16(dest+curbyte, fh->encrypt); - curbyte += aimutil_put16(dest+curbyte, fh->compress); - curbyte += aimutil_put16(dest+curbyte, fh->totfiles); - curbyte += aimutil_put16(dest+curbyte, fh->filesleft); - curbyte += aimutil_put16(dest+curbyte, fh->totparts); - curbyte += aimutil_put16(dest+curbyte, fh->partsleft); - curbyte += aimutil_put32(dest+curbyte, fh->totsize); - curbyte += aimutil_put32(dest+curbyte, fh->size); - curbyte += aimutil_put32(dest+curbyte, fh->modtime); - curbyte += aimutil_put32(dest+curbyte, fh->checksum); - curbyte += aimutil_put32(dest+curbyte, fh->rfrcsum); - curbyte += aimutil_put32(dest+curbyte, fh->rfsize); - curbyte += aimutil_put32(dest+curbyte, fh->cretime); - curbyte += aimutil_put32(dest+curbyte, fh->rfcsum); - curbyte += aimutil_put32(dest+curbyte, fh->nrecvd); - curbyte += aimutil_put32(dest+curbyte, fh->recvcsum); - memcpy(dest+curbyte, fh->idstring, 32); - curbyte += 32; - curbyte += aimutil_put8(dest+curbyte, fh->flags); - curbyte += aimutil_put8(dest+curbyte, fh->lnameoffset); - curbyte += aimutil_put8(dest+curbyte, fh->lsizeoffset); - memcpy(dest+curbyte, fh->dummy, 69); - curbyte += 69; - memcpy(dest+curbyte, fh->macfileinfo, 16); - curbyte += 16; - curbyte += aimutil_put16(dest+curbyte, fh->nencode); - curbyte += aimutil_put16(dest+curbyte, fh->nlanguage); - memset(dest+curbyte, 0x00, 64); - memcpy(dest+curbyte, fh->name, 64); - - /* XXX: Filenames longer than 64B */ - curbyte += 64; - return curbyte; -} -#endif - -/** - * aim_getfile_intitiate - Request an OFT getfile session - * @sess: your session, - * @conn: the BOS conn, - * @destsn is the SN to connect to. - * - * returns a new &aim_conn_t on success, %NULL on error - */ -aim_conn_t *aim_getfile_initiate(aim_session_t *sess, aim_conn_t *conn, const char *destsn) -{ - return NULL; -#if 0 - struct command_tx_struct *newpacket; - struct aim_conn_t *newconn; - struct aim_filetransfer_priv *priv; - struct aim_msgcookie_t *cookie; - int curbyte, i, listenfd; - short port = 4443; - struct hostent *hptr; - struct utsname myname; - char cap[16]; - char d[4]; - - /* Open our socket */ - - if ( (listenfd = aim_listenestablish(port)) == -1) - return NULL; - - /* get our local IP */ - - if (uname(&myname) < 0) - return NULL; - if ( (hptr = gethostbyname(myname.nodename)) == NULL) - return NULL; - memcpy(&d, hptr->h_addr_list[0], 4); - - aim_putcap(cap, 16, AIM_CAPS_GETFILE); - - /* create the OSCAR packet */ - - if (!(newpacket = aim_tx_new(sess, conn, AIM_FRAMETYPE_OSCAR, 0x0002, 10+8+2+1+strlen(destsn)+4+4+0x42))) - return NULL; - newpacket->lock = 1; - - /* lock struct */ - curbyte = 0; - curbyte += aim_putsnac(newpacket->data+curbyte, 0x0004, 0x0006, 0x0000, sess->snac_nextid); - - /* XXX: check the cookie before commiting to using it */ - - /* Generate a random message cookie - * This cookie needs to be alphanumeric and NULL-terminated to be TOC-compatible. */ - for (i=0; i<7; i++) - curbyte += aimutil_put8(newpacket->data+curbyte, 0x30 + ((u_char) random() % 10)); - - curbyte += aimutil_put8(newpacket->data+curbyte, 0x00); - - /* grab all the data for cookie caching. */ - - if (!(cookie = (struct aim_msgcookie_t *)calloc(1, sizeof(struct aim_msgcookie_t)))) - return NULL; - memcpy(cookie->cookie, newpacket->data+curbyte-8, 8); - cookie->type = AIM_COOKIETYPE_OFTGET; - - if (!(priv = (struct aim_filetransfer_priv *)calloc(1, sizeof(struct aim_filetransfer_priv)))) - return NULL; - memcpy(priv->cookie, cookie, 8); - memcpy(priv->sn, destsn, sizeof(priv->sn)); - memcpy(priv->fh.name, "listing.txt", strlen("listing.txt")); - priv->state = 1; - - cookie->data = priv; - - aim_cachecookie(sess, cookie); - - /* Channel ID */ - curbyte += aimutil_put16(newpacket->data+curbyte,0x0002); - - /* Destination SN (prepended with byte length) */ - curbyte += aimutil_put8(newpacket->data+curbyte,strlen(destsn)); - curbyte += aimutil_putstr(newpacket->data+curbyte, destsn, strlen(destsn)); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0003); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000); - - /* enTLV start */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0005); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0042); - - /* Flag data / ICBM Parameters? */ - curbyte += aimutil_put8(newpacket->data+curbyte, 0x00); - curbyte += aimutil_put8(newpacket->data+curbyte, 0x00); - - /* Cookie */ - curbyte += aimutil_putstr(newpacket->data+curbyte, (char *)cookie, 8); - - /* Capability String */ - curbyte += aimutil_putstr(newpacket->data+curbyte, (char *)cap, 0x10); - - /* 000a/0002 : 0001 */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x000a); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001); - - /* 0003/0004: IP address */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0003); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0004); - for(i = 0; i < 4; i++) - curbyte += aimutil_put8(newpacket->data+curbyte, d[i]); - - /* already in network byte order */ - - /* 0005/0002: Port */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0005); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0002); - curbyte += aimutil_put16(newpacket->data+curbyte, port); - - /* 000f/0000: ?? */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x000f); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000); - - /* 2711/000c: ?? */ - curbyte += aimutil_put16(newpacket->data+curbyte, 0x2711); - curbyte += aimutil_put16(newpacket->data+curbyte, 0x000c); - curbyte += aimutil_put32(newpacket->data+curbyte, 0x00120001); - - for(i = 0; i < 0x000c - 4; i++) - curbyte += aimutil_put8(newpacket->data+curbyte, 0x00); - - newpacket->commandlen = curbyte; - newpacket->lock = 0; - aim_tx_enqueue(sess, newpacket); - - /* allocate and set up our connection */ - - i = fcntl(listenfd, F_GETFL, 0); - fcntl(listenfd, F_SETFL, i | O_NONBLOCK); - newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS_OUT, NULL); - - if (!newconn){ - perror("aim_newconn"); - return NULL; - } - - newconn->fd = listenfd; - newconn->subtype = AIM_CONN_SUBTYPE_OFT_GETFILE; - newconn->priv = priv; - - return newconn; -#endif -} - -/** - * aim_oft_getfile_request - request a particular file over an established getfile connection - * @sess: your session - * @conn: the established OFT getfile connection - * @name: filename to request - * @size: size of the file - * - * - * returns -1 on error, 0 on successful enqueuing - */ -int aim_oft_getfile_request(aim_session_t *sess, aim_conn_t *conn, const char *name, int size) -{ - return -EINVAL; -#if 0 - struct command_tx_struct *newoft; - struct aim_filetransfer_priv *ft; - if (!sess || !conn || !conn->priv || !name) - return -1; - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x120c, 0))) { - faimdprintf(sess, 2, "faim: aim_accepttransfer: tx_new OFT failed\n"); - return -1; - } - - newoft->lock = 1; - - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - ft = (struct aim_filetransfer_priv *)conn->priv; - ft->fh.filesleft = 1; - ft->fh.totfiles = 1; - ft->fh.totparts = 1; - ft->fh.partsleft = 1; - ft->fh.totsize = size; - ft->fh.size = size; - ft->fh.checksum = 0; - memcpy(ft->fh.name, name, strlen(name)); - memset(ft->fh.name+strlen(name), 0, 1); - - if (!(newoft->hdr.oft.hdr2 = (unsigned char *)calloc(1,newoft->hdr.oft.hdr2len))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - if (!(aim_oft_buildheader(newoft->hdr.oft.hdr2, &(ft->fh)))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - newoft->lock = 0; - - aim_tx_enqueue(sess, newoft); - return 0; -#endif -} - -/** - * aim_oft_getfile_ack - acknowledge a getfile download as complete - * @sess: your session - * @conn: the getfile conn to send the ack over - * - * Call this function after you have read all the data in a particular - * filetransfer. Returns -1 on error, 0 on apparent success - * - */ -int aim_oft_getfile_ack(aim_session_t *sess, aim_conn_t *conn) -{ - return -EINVAL; -#if 0 - struct command_tx_struct *newoft; - struct aim_filetransfer_priv *ft; - - if (!sess || !conn || !conn->priv) - return -1; - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0202, 0))) { - faimdprintf(sess, 2, "faim: aim_accepttransfer: tx_new OFT failed\n"); - return -1; - } - - newoft->lock = 1; - - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100-8; - - if (!(newoft->hdr.oft.hdr2 = (char *)calloc(1,newoft->hdr.oft.hdr2len))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - ft = (struct aim_filetransfer_priv *)conn->priv; - - if (!(aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); - return 0; -#endif -} - -/** - * aim_oft_getfile_end - end a getfile. - * @sess: your session - * @conn: the getfile connection - * - * call this before you close the getfile connection if you're on the - * receiving/requesting end. - */ -int aim_oft_getfile_end(aim_session_t *sess, aim_conn_t *conn) -{ - return -EINVAL; -#if 0 - struct command_tx_struct *newoft; - struct aim_filetransfer_priv *ft; - - if (!sess || !conn || !conn->priv) - return -1; - - if (!(newoft = aim_tx_new(sess, conn, AIM_FRAMETYPE_OFT, 0x0204, 0))) { - faimdprintf(sess, 2, "faim: aim_accepttransfer: tx_new OFT failed\n"); - return -1; - } - - newoft->lock = 1; - - memcpy(newoft->hdr.oft.magic, "OFT2", 4); - newoft->hdr.oft.hdr2len = 0x100 - 8; - - if (!(newoft->hdr.oft.hdr2 = (char *)calloc(1,newoft->hdr.oft.hdr2len))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - ft = (struct aim_filetransfer_priv *)conn->priv; - ft->state = 4; /* no longer wanting data */ - ft->fh.nrecvd = ft->fh.size; - ft->fh.recvcsum = ft->fh.checksum; - ft->fh.flags = 0x21; - - if (!(aim_oft_buildheader((unsigned char *)newoft->hdr.oft.hdr2, &(ft->fh)))) { - newoft->lock = 0; - aim_frame_destroy(newoft); - return -1; - } - - newoft->lock = 0; - aim_tx_enqueue(sess, newoft); - - return 0; -#endif /* 0 */ -} - diff --git a/protocols/oscar/ft.h b/protocols/oscar/ft.h deleted file mode 100644 index 7b1142eb..00000000 --- a/protocols/oscar/ft.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef __OSCAR_FT_H__ -#define __OSCAR_FT_H__ - -#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ - -/* - * OFT Services - * - * See non-SNAC note below. - */ -#define AIM_CB_OFT_DIRECTIMCONNECTREQ 0x0001/* connect request -- actually an OSCAR CAP*/ -#define AIM_CB_OFT_DIRECTIMINCOMING 0x0002 -#define AIM_CB_OFT_DIRECTIMDISCONNECT 0x0003 -#define AIM_CB_OFT_DIRECTIMTYPING 0x0004 -#define AIM_CB_OFT_DIRECTIMINITIATE 0x0005 - -#define AIM_CB_OFT_GETFILECONNECTREQ 0x0006 /* connect request -- actually an OSCAR CAP*/ -#define AIM_CB_OFT_GETFILELISTINGREQ 0x0007 /* OFT listing.txt request */ -#define AIM_CB_OFT_GETFILEFILEREQ 0x0008 /* received file request */ -#define AIM_CB_OFT_GETFILEFILESEND 0x0009 /* received file request confirm -- send data */ -#define AIM_CB_OFT_GETFILECOMPLETE 0x000a /* received file send complete*/ -#define AIM_CB_OFT_GETFILEINITIATE 0x000b /* request for file get acknowledge */ -#define AIM_CB_OFT_GETFILEDISCONNECT 0x000c /* OFT connection disconnected.*/ -#define AIM_CB_OFT_GETFILELISTING 0x000d /* OFT listing.txt received.*/ -#define AIM_CB_OFT_GETFILERECEIVE 0x000e /* OFT file incoming.*/ -#define AIM_CB_OFT_GETFILELISTINGRXCONFIRM 0x000f -#define AIM_CB_OFT_GETFILESTATE4 0x0010 - -#define AIM_CB_OFT_SENDFILEDISCONNECT 0x0020 /* OFT connection disconnected.*/ - -struct aim_fileheader_t { -#if 0 - char magic[4]; /* 0 */ - short hdrlen; /* 4 */ - short hdrtype; /* 6 */ -#endif - char bcookie[8]; /* 8 */ - short encrypt; /* 16 */ - short compress; /* 18 */ - short totfiles; /* 20 */ - short filesleft; /* 22 */ - short totparts; /* 24 */ - short partsleft; /* 26 */ - long totsize; /* 28 */ - long size; /* 32 */ - long modtime; /* 36 */ - long checksum; /* 40 */ - long rfrcsum; /* 44 */ - long rfsize; /* 48 */ - long cretime; /* 52 */ - long rfcsum; /* 56 */ - long nrecvd; /* 60 */ - long recvcsum; /* 64 */ - char idstring[32]; /* 68 */ - char flags; /* 100 */ - char lnameoffset; /* 101 */ - char lsizeoffset; /* 102 */ - char dummy[69]; /* 103 */ - char macfileinfo[16]; /* 172 */ - short nencode; /* 188 */ - short nlanguage; /* 190 */ - char name[64]; /* 192 */ - /* 256 */ -}; - - - -struct aim_filetransfer_priv { - char sn[MAXSNLEN]; - guint8 cookie[8]; - char ip[30]; - int state; - struct aim_fileheader_t fh; -}; - -#define AIM_CB_FAM_OFT 0xfffe /* OFT/Rvous */ - -#endif /* __OSCAR_FT_H__ */ diff --git a/protocols/oscar/im.c b/protocols/oscar/im.c index 4ceb0716..085687e0 100644 --- a/protocols/oscar/im.c +++ b/protocols/oscar/im.c @@ -2038,7 +2038,7 @@ int aim_im_sendmtn(aim_session_t *sess, guint16 type1, const char *sn, guint16 t * Dest sn */ aimbs_put8(&fr->data, strlen(sn)); - aimbs_putraw(&fr->data, sn, strlen(sn)); + aimbs_putraw(&fr->data, (const guint8*)sn, strlen(sn)); /* * Type 2 (should be 0x0000, 0x0001, or 0x0002 for mtn) diff --git a/protocols/oscar/msgcookie.c b/protocols/oscar/msgcookie.c index bb498d72..d3c91a94 100644 --- a/protocols/oscar/msgcookie.c +++ b/protocols/oscar/msgcookie.c @@ -177,20 +177,3 @@ int aim_cookie_free(aim_session_t *sess, aim_msgcookie_t *cookie) 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; - } -} - - diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 2b7f9308..538f47ae 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -274,53 +274,47 @@ static void oscar_callback(gpointer data, gint source, odata = (struct oscar_data *)gc->proto_data; if (condition & GAIM_INPUT_READ) { - if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) { - if (aim_handlerendconnect(odata->sess, conn) < 0) { - aim_conn_kill(odata->sess, &conn); - } + if (aim_get_command(odata->sess, conn) >= 0) { + aim_rxdispatch(odata->sess); + if (odata->killme) + signoff(gc); } else { - 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); + 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); } } } diff --git a/protocols/oscar/rxhandlers.c b/protocols/oscar/rxhandlers.c index eb0898ec..be8aba44 100644 --- a/protocols/oscar/rxhandlers.c +++ b/protocols/oscar/rxhandlers.c @@ -340,37 +340,6 @@ void aim_rxdispatch(aim_session_t *sess) if (cur->handled) 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) { cur->handled = aim_callhandler_noparam(sess, cur->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, cur); /* XXX use consumenonsnac */ diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c index d95bc026..d8adaa73 100644 --- a/protocols/oscar/rxqueue.c +++ b/protocols/oscar/rxqueue.c @@ -331,11 +331,7 @@ void aim_frame_destroy(aim_frame_t *frame) 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; } @@ -362,17 +358,6 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn) 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)); /* diff --git a/protocols/oscar/txqueue.c b/protocols/oscar/txqueue.c index 51415089..6b4854c5 100644 --- a/protocols/oscar/txqueue.c +++ b/protocols/oscar/txqueue.c @@ -33,20 +33,6 @@ aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, guint8 framing, g return NULL; } - /* 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; @@ -58,11 +44,6 @@ aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, guint8 framing, g 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 do_error_dialog(sess->aux_data, "unknown framing", "Gaim"); @@ -236,21 +217,6 @@ static int aim_bstream_send(aim_bstream_t *bs, aim_conn_t *conn, size_t count) count = aim_bstream_empty(bs); /* truncate to remaining space */ 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); } @@ -298,58 +264,10 @@ static int sendframe_flap(aim_session_t *sess, aim_frame_t *fr) return err; } -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; } |