[1109] in BarnOwl Developers
[D-O-H] r1073 - branches/barnowl_perlaim/owl
daemon@ATHENA.MIT.EDU (geofft@MIT.EDU)
Thu Oct 29 18:13:04 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
Date: Sat, 31 May 2008 23:40:30 -0400 (EDT)
To: dirty-owl-hackers@MIT.EDU
From: geofft@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Author: geofft
Date: 2008-05-31 23:40:29 -0400 (Sat, 31 May 2008)
New Revision: 1073
Removed:
branches/barnowl_perlaim/owl/aim.c
branches/barnowl_perlaim/owl/buddy.c
branches/barnowl_perlaim/owl/buddylist.c
branches/barnowl_perlaim/owl/libfaim/
Modified:
branches/barnowl_perlaim/owl/Makefile.in
branches/barnowl_perlaim/owl/commands.c
branches/barnowl_perlaim/owl/configure.ac
branches/barnowl_perlaim/owl/functions.c
branches/barnowl_perlaim/owl/glib_compat.c
branches/barnowl_perlaim/owl/global.c
branches/barnowl_perlaim/owl/help.c
branches/barnowl_perlaim/owl/keys.c
branches/barnowl_perlaim/owl/logging.c
branches/barnowl_perlaim/owl/message.c
branches/barnowl_perlaim/owl/owl.c
branches/barnowl_perlaim/owl/owl.h
branches/barnowl_perlaim/owl/select.c
branches/barnowl_perlaim/owl/util.c
branches/barnowl_perlaim/owl/variable.c
Log:
Remove aim.c. buddylist.c, buddy.c, libfaim, and everything that uses them.
Modified: branches/barnowl_perlaim/owl/Makefile.in
===================================================================
--- branches/barnowl_perlaim/owl/Makefile.in 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/Makefile.in 2008-06-01 03:40:29 UTC (rev 1073)
@@ -9,8 +9,8 @@
mandir = @mandir@
CC=@CC@
-LIBS=@LIBS@ -L./libfaim -lfaim
-CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\" -DOWL_SVN_REVNO=$(shell ./svkversion)
+LIBS=@LIBS@
+CFLAGS=@CFLAGS@ -DDATADIR=\"${datadir}\" -DOWL_SVN_REVNO=$(shell ./svkversion)
LDFLAGS=@LDFLAGS@
XSUBPPDIR=@XSUBPPDIR@
XSUBPPFLAGS=@XSUBPPFLAGS@
@@ -24,7 +24,7 @@
perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
- aim.c buddy.c buddylist.c timer.c style.c errqueue.c \
+ timer.c style.c errqueue.c \
zbuddylist.c muxevents.c popexec.c obarray.c select.c wcwidth.c \
glib_compat.c
OWL_SRC = owl.c
@@ -49,7 +49,7 @@
all: $(EXE) $(MODULE_DIRS)
-$(EXE): $(AUTOGEN) $(OBJS) owl.o libfaim
+$(EXE): $(AUTOGEN) $(OBJS) owl.o
$(ATHSTATIC) $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
tester: $(AUTOGEN) $(OBJS) tester.o
@@ -66,10 +66,10 @@
test: tester
./tester reg
-clean: libfaimclean modules_clean
+clean: modules_clean
$(RM) $(EXE) tester *.o $(AUTOGEN) owl_prototypes.h.new
-distclean: clean libfaimdistclean
+distclean: clean
$(RM) config.cache config.log config.status Makefile config.h TAGS *~ core
.PHONY: $(MODULE_DIRS)
@@ -115,17 +115,6 @@
$(BASE_OBJS) varstubs.h: owl.h config.h owl_prototypes.h
-libfaim: libfaim/libfaim.a
-
-libfaim/libfaim.a:
- (cd libfaim; $(MAKE))
-
-libfaimclean:
- (cd libfaim; $(MAKE) clean)
-
-libfaimdistclean:
- (cd libfaim; $(MAKE) distclean)
-
install: all installdirs
${INSTALL_PROGRAM} $(EXE) ${DESTDIR}${bindir}/$(EXE)
${INSTALL_DATA} doc/owl.1 ${DESTDIR}${mandir}/man1/barnowl.1
Deleted: branches/barnowl_perlaim/owl/aim.c
===================================================================
--- branches/barnowl_perlaim/owl/aim.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/aim.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -1,2759 +0,0 @@
-#include <stdio.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include "owl.h"
-
-/**********************************************************************/
-
-struct owlfaim_priv {
- char *aimbinarypath;
- char *screenname;
- char *password;
- char *server;
- char *proxy;
- char *proxyusername;
- char *proxypass;
- char *ohcaptainmycaptain;
- int connected;
-
- FILE *listingfile;
- char *listingpath;
-
- fu8_t *buddyicon;
- int buddyiconlen;
- time_t buddyiconstamp;
- fu16_t buddyiconsum;
-};
-
-static char *msgerrreasons[] = {
- "Invalid error",
- "Invalid SNAC",
- "Rate to host",
- "Rate to client",
- "Not logged on",
- "Service unavailable",
- "Service not defined",
- "Obsolete SNAC",
- "Not supported by host",
- "Not supported by client",
- "Refused by client",
- "Reply too big",
- "Responses lost",
- "Request denied",
- "Busted SNAC payload",
- "Insufficient rights",
- "In local permit/deny",
- "Too evil (sender)",
- "Too evil (receiver)",
- "User temporarily unavailable",
- "No match",
- "List overflow",
- "Request ambiguous",
- "Queue full",
- "Not while on AOL",
-};
-static int msgerrreasonslen = 25;
-
-static void faimtest_debugcb(aim_session_t *sess, int level, const char *format, va_list va);
-static int faimtest_parse_login(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_authresp(aim_session_t *sess, aim_frame_t *fr, ...);
-int faimtest_flapversion(aim_session_t *sess, aim_frame_t *fr, ...);
-int faimtest_conncomplete(aim_session_t *sess, aim_frame_t *fr, ...);
-void addcb_bos(aim_session_t *sess, aim_conn_t *bosconn);
-static int conninitdone_bos(aim_session_t *sess, aim_frame_t *fr, ...);
-static int conninitdone_admin(aim_session_t *sess, aim_frame_t *fr, ...);
-static int conninitdone_chatnav (aim_session_t *, aim_frame_t *, ...);
-static int conninitdone_chat (aim_session_t *, aim_frame_t *, ...);
-int logout(aim_session_t *sess);
-
-static int faimtest_parse_connerr(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_accountconfirm(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_infochange(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_handleredirect(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_icbmparaminfo(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_buddyrights(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_bosrights(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_locrights(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_reportinterval(aim_session_t *sess, aim_frame_t *fr, ...);
-/* static int reportinterval(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs); */
-static int faimtest_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...);
-static int getaimdata(aim_session_t *sess, unsigned char **bufret, int *buflenret, unsigned long offset, unsigned long len, const char *modname);
-static int faimtest_memrequest(aim_session_t *sess, aim_frame_t *fr, ...);
-/* static void printuserflags(fu16_t flags); */
-static int faimtest_parse_userinfo(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_handlecmd(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, const char *tmpstr);
-static int faimtest_parse_incoming_im_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args);
-static int faimtest_parse_incoming_im_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args);
-static int faimtest_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_oncoming(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_offgoing(aim_session_t *sess, aim_frame_t *fr, ...);
-int faimtest_parse_genericerr(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_msgerr(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_msgack(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_evilnotify(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_searchreply(aim_session_t *sess, aim_frame_t *fr, ...);
-static int faimtest_parse_searcherror(aim_session_t *sess, aim_frame_t *fr, ...);
-static int handlepopup(aim_session_t *sess, aim_frame_t *fr, ...);
-static int serverpause(aim_session_t *sess, aim_frame_t *fr, ...);
-static int migrate(aim_session_t *sess, aim_frame_t *fr, ...);
-static int ssirights(aim_session_t *sess, aim_frame_t *fr, ...);
-static int ssidata(aim_session_t *sess, aim_frame_t *fr, ...);
-static int ssidatanochange(aim_session_t *sess, aim_frame_t *fr, ...);
-static int offlinemsg(aim_session_t *sess, aim_frame_t *fr, ...);
-static int offlinemsgdone(aim_session_t *sess, aim_frame_t *fr, ...);
-/*
-static int faimtest_ssi_parseerr (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_parserights (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_parselist (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_parseack (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_authgiven (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_authrequest (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_authreply (aim_session_t *, aim_frame_t *, ...);
-static int faimtest_ssi_gotadded (aim_session_t *, aim_frame_t *, ...);
-*/
-
-void chatnav_redirect(aim_session_t *sess, struct aim_redirect_data *redir);
-void chat_redirect(aim_session_t *sess, struct aim_redirect_data *redir);
-
-/*****************************************************************/
-
-void owl_aim_init(void)
-{
- /* this has all been moved to owl_aim_login, but we'll leave the
- * function here, in case there's stuff we want to init in the
- * future. It's still called by Owl.
- */
-
-}
-
-
-int owl_aim_login(char *screenname, char *password)
-{
- struct owlfaim_priv *priv;
- aim_conn_t *conn;
- aim_session_t *sess;
-
- sess=owl_global_get_aimsess(&g);
-
- aim_session_init(sess, TRUE, 0);
- aim_setdebuggingcb(sess, faimtest_debugcb);
- aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
-
- /* this will leak, I know and just don't care right now */
- priv=owl_malloc(sizeof(struct owlfaim_priv));
- memset(priv, 0, sizeof(struct owlfaim_priv));
-
- priv->screenname = owl_strdup(screenname);
- priv->password = owl_strdup(password);
- priv->server = owl_strdup(FAIM_LOGIN_SERVER);
- sess->aux_data = priv;
-
- conn=aim_newconn(sess, AIM_CONN_TYPE_AUTH, priv->server ? priv->server : FAIM_LOGIN_SERVER);
- /* conn=aim_newconn(sess, AIM_CONN_TYPE_AUTH, NULL); */
- if (!conn) {
- owl_function_error("owl_aim_login: connection error during AIM login\n");
- owl_global_set_aimnologgedin(&g);
- owl_global_set_no_doaimevents(&g);
- return (-1);
- }
-
- /*
- else if (conn->fd == -1) {
- if (conn->status & AIM_CONN_STATUS_RESOLVERR) {
- owl_function_error("owl_aim_login: could not resolve authorize name");
- } else if (conn->status & AIM_CONN_STATUS_CONNERR) {
- owl_function_error("owl_aim_login: could not connect to authorizer");
- } else {
- owl_function_error("owl_aim_login: unknown connection error");
- }
- owl_global_set_aimnologgedin(&g);
- owl_global_set_no_doaimevents(&g);
- aim_conn_kill(sess, &conn);
- return(-1);
- }
- */
-
-
- aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0);
- aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
-
- aim_conn_addhandler(sess, conn, AIM_CB_FAM_ATH, AIM_CB_ATH_AUTHRESPONSE, faimtest_parse_login, 0);
- aim_conn_addhandler(sess, conn, AIM_CB_FAM_ATH, AIM_CB_ATH_LOGINRESPONSE, faimtest_parse_authresp, 0);
- /* aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, gaim_connerr, 0); */
- /* aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0); */
- /* aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0); */
-
- /* start processing AIM events */
- owl_global_set_doaimevents(&g);
- /* conn->status |= AIM_CONN_STATUS_INPROGRESS; */
- owl_function_debugmsg("owl_aim_login: sending login request for %s", screenname);
- aim_request_login(sess, conn, screenname);
- owl_function_debugmsg("owl_aim_login: connecting");
-
- return(0);
-}
-
-/* stuff to run once login has been successful */
-void owl_aim_successful_login(char *screenname)
-{
- char *buff;
- owl_function_debugmsg("doing owl_aim_successful_login");
- owl_global_set_aimloggedin(&g, screenname);
- owl_global_set_doaimevents(&g); /* this should already be on */
- owl_function_makemsg("%s logged in", screenname);
- buff=owl_sprintf("Logged in to AIM as %s", screenname);
- owl_function_adminmsg("", buff);
- owl_free(buff);
-
- owl_function_debugmsg("Successful AIM login for %s", screenname);
-
- /* start the ingorelogin timer */
- owl_timer_reset_newstart(owl_global_get_aim_login_timer(&g),
- owl_global_get_aim_ignorelogin_timer(&g));
-
-
- /* aim_ssi_setpresence(owl_global_get_aimsess(&g), 0x00000400); */
- /* aim_bos_setidle(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), 5000); */
-}
-
-void owl_aim_logout(void)
-{
- /* need to check if it's connected first, I think */
- logout(owl_global_get_aimsess(&g));
-
- if (owl_global_is_aimloggedin(&g)) owl_function_adminmsg("", "Logged out of AIM");
- owl_global_set_aimnologgedin(&g);
- owl_global_set_no_doaimevents(&g);
-}
-
-void owl_aim_logged_out()
-{
- if (owl_global_is_aimloggedin(&g)) owl_function_adminmsg("", "Logged out of AIM");
- owl_aim_logout();
-}
-
-void owl_aim_login_error(char *message)
-{
- if (message) {
- owl_function_error(message);
- } else {
- owl_function_error("Authentication error on login");
- }
- owl_function_beep();
- owl_global_set_aimnologgedin(&g);
- owl_global_set_no_doaimevents(&g);
-}
-
-int owl_aim_send_im(char *to, char *msg)
-{
- int ret;
-
- ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, NULL, msg);
-
- /* I don't know how to check for an error yet */
- return(ret);
-}
-
-int owl_aim_send_awaymsg(char *to, char *msg)
-{
- int ret;
-
- ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, AIM_IMFLAGS_AWAY, msg);
-
- /* I don't know how to check for an error yet */
- return(ret);
-}
-
-void owl_aim_addbuddy(char *name)
-{
-
- aim_ssi_addbuddy(owl_global_get_aimsess(&g), name, "Buddies", NULL, NULL, NULL, 0);
-
- /*
- aim_ssi_addbuddy(owl_global_get_aimsess(&g),
- name,
- "Buddies",
- NULL, NULL, NULL,
- aim_ssi_waitingforauth(owl_global_get_aimsess(&g)->ssi.local, "Buddies", name));
- */
-}
-
-void owl_aim_delbuddy(char *name)
-{
- aim_ssi_delbuddy(owl_global_get_aimsess(&g), name, "Buddies");
- owl_buddylist_offgoing(owl_global_get_buddylist(&g), name);
-}
-
-void owl_aim_search(char *email)
-{
- int ret;
-
- owl_function_debugmsg("owl_aim_search: doing search for %s", email);
- ret=aim_search_address(owl_global_get_aimsess(&g),
- aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_BOS),
- email);
-
- if (ret) owl_function_error("owl_aim_search: aim_search_address returned %i", ret);
-}
-
-
-int owl_aim_set_awaymsg(char *msg)
-{
- int len;
- char *foo;
- /* there is a max away message lentgh we should check against */
-
- foo=owl_strdup(msg);
- len=strlen(foo);
- if (len>500) {
- foo[500]='\0';
- len=499;
- }
-
- aim_locate_setprofile(owl_global_get_aimsess(&g),
- NULL, NULL, 0,
- "us-ascii", foo, len);
- owl_free(foo);
-
- /*
- aim_bos_setprofile(owl_global_get_aimsess(&g),
- owl_global_get_bosconn(&g),
- NULL, NULL, 0, "us-ascii", msg,
- strlen(msg), 0);
- */
- return(0);
-}
-
-void owl_aim_chat_join(char *name, int exchange)
-{
- int ret;
- aim_conn_t *cur;
- /*
- OscarData *od = (OscarData *)g->proto_data;
- char *name, *exchange;
- */
-
- owl_function_debugmsg("Attempting to join chatroom %s exchange %i", name, exchange);
-
- /*
- name = g_hash_table_lookup(data, "room");
- exchange = g_hash_table_lookup(data, "exchange");
- */
- if ((cur = aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV))) {
- owl_function_debugmsg("owl_aim_chat_join: chatnav exists, creating room");
- aim_chatnav_createroom(owl_global_get_aimsess(&g), cur, name, exchange);
- } else {
- /* struct create_room *cr = g_new0(struct create_room, 1); */
- owl_function_debugmsg("owl_aim_chat_join: chatnav does not exist, opening chatnav");
- /*
- cr->exchange = atoi(exchange);
- cr->name = g_strdup(name);
- od->create_rooms = g_slist_append(od->create_rooms, cr);
- */
- aim_reqservice(owl_global_get_aimsess(&g),
- aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV),
- AIM_CONN_TYPE_CHATNAV);
- aim_reqservice(owl_global_get_aimsess(&g), NULL, AIM_CONN_TYPE_CHATNAV);
- aim_chatnav_createroom(owl_global_get_aimsess(&g), cur, name, exchange);
- ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, name, 0x0000);
-
- }
- return;
- /******/
-
-
- /* ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, chatroom, 0x0000); */
- /*
- ret=aim_chat_join(owl_global_get_aimsess(&g),
- aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV), exchange, chatroom, 0x0000);
- */
-
- aim_reqservice(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), AIM_CONN_TYPE_CHATNAV);
- ret = aim_chatnav_createroom(owl_global_get_aimsess(&g),
- aim_getconn_type(owl_global_get_aimsess(&g), AIM_CONN_TYPE_CHATNAV), name, exchange);
- ret=aim_chat_join(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), exchange, name, 0x0000);
-
-}
-
-void owl_aim_chat_leave(char *chatroom)
-{
-}
-
-int owl_aim_chat_sendmsg(char *chatroom, char *msg)
-{
- return(0);
-}
-
-/* caller must free the return */
-char *owl_aim_normalize_screenname(char *in)
-{
- char *out;
- int i, j, k;
-
- j=strlen(in);
- out=owl_malloc(j+30);
- k=0;
- for (i=0; i<j; i++) {
- if (in[i]!=' ') {
- out[k]=in[i];
- k++;
- }
- }
- out[k]='\0';
- return(out);
-}
-
-int owl_aim_process_events()
-{
- aim_session_t *aimsess;
- aim_conn_t *waitingconn = NULL;
- struct timeval tv;
- int selstat = 0;
- struct owlfaim_priv *priv;
-
- aimsess=owl_global_get_aimsess(&g);
- priv = (struct owlfaim_priv *) &(aimsess->aux_data);
-
- /* do a select without blocking */
- tv.tv_sec = 0;
- tv.tv_usec = 0;
- waitingconn = aim_select(aimsess, &tv, &selstat);
-
- if (owl_global_is_aimnop_time(&g)) {
- aim_flap_nop(aimsess, aim_getconn_type(aimsess, AIM_CONN_TYPE_BOS));
- owl_global_aimnop_sent(&g);
- }
-
- if (selstat == -1) {
- owl_aim_logged_out();
- } else if (selstat == 0) {
- /* no events pending */
- } else if (selstat == 1) { /* outgoing data pending */
- aim_tx_flushqueue(aimsess);
- } else if (selstat == 2) { /* incoming data pending */
- /* printf("selstat == 2\n"); */
-
- if (aim_get_command(aimsess, waitingconn) >= 0) {
- aim_rxdispatch(aimsess);
- } else {
- /* printf("connection error (type 0x%04x:0x%04x)\n", waitingconn->type, waitingconn->subtype); */
- /* we should have callbacks for all these, else the library will do the conn_kill for us. */
- if (waitingconn->type == AIM_CONN_TYPE_RENDEZVOUS) {
- if (waitingconn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM) {
- /* printf("disconnected from %s\n", aim_directim_getsn(waitingconn)); */
- aim_conn_kill(aimsess, &waitingconn);
- owl_aim_logged_out();
- }
- } else {
- aim_conn_kill(aimsess, &waitingconn);
- owl_aim_logged_out();
- }
- if (!aim_getconn_type(aimsess, AIM_CONN_TYPE_BOS)) {
- /* printf("major connection error\n"); */
- owl_aim_logged_out();
- /* break; */
- }
- }
- }
- /* free(priv->buddyicon); */
- /* exit(0); */
- return(0);
-}
-
-static void faimtest_debugcb(aim_session_t *sess, int level, const char *format, va_list va)
-{
- return;
-}
-
-static int faimtest_parse_login(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
-
- char *key;
- va_list ap;
-
- va_start(ap, fr);
- key = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_login: %s %s %s", priv->screenname, priv->password, key);
-
- aim_send_login(sess, fr->conn, priv->screenname, priv->password, &info, key);
-
- return(1);
-}
-
-
-static int faimtest_parse_authresp(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- struct aim_authresp_info *info;
- aim_conn_t *bosconn;
-
- va_start(ap, fr);
- info = va_arg(ap, struct aim_authresp_info *);
- va_end(ap);
-
- /* printf("Screen name: %s\n", info->sn); */
- owl_function_debugmsg("doing faimtest_parse_authresp");
- owl_function_debugmsg("faimtest_parse_authresp: %s", info->sn);
-
- /*
- * Check for error.
- */
- if (info->errorcode || !info->bosip || !info->cookie) {
- /*
- printf("Login Error Code 0x%04x\n", info->errorcode);
- printf("Error URL: %s\n", info->errorurl);
- */
- if (info->errorcode==0x05) {
- owl_aim_login_error("Incorrect nickname or password.");
- } else if (info->errorcode==0x11) {
- owl_aim_login_error("Your account is currently suspended.");
- } else if (info->errorcode==0x14) {
- owl_aim_login_error("The AOL Instant Messenger service is temporarily unavailable.");
- } else if (info->errorcode==0x18) {
- owl_aim_login_error("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.");
- } else if (info->errorcode==0x1c) {
- owl_aim_login_error("The client version you are using is too old.");
- } else {
- owl_aim_login_error(NULL);
- }
- aim_conn_kill(sess, &fr->conn);
- return(1);
- }
-
- /*
- printf("Reg status: %d\n", info->regstatus);
- printf("Email: %s\n", info->email);
- printf("BOS IP: %s\n", info->bosip);
- */
-
- /* printf("Closing auth connection...\n"); */
- aim_conn_kill(sess, &fr->conn);
- if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, info->bosip))) {
- /* printf("could not connect to BOS: internal error\n"); */
- return(1);
- } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
- /* printf("could not connect to BOS\n"); */
- aim_conn_kill(sess, &bosconn);
- return(1);
- }
- owl_global_set_bossconn(&g, bosconn);
- owl_aim_successful_login(info->sn);
- addcb_bos(sess, bosconn);
- aim_sendcookie(sess, bosconn, info->cookielen, info->cookie);
- return(1);
-}
-
-int faimtest_flapversion(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("doing faimtest_flapversion");
-
-#if 0
- /* XXX fix libfaim to support this */
- printf("using FLAP version 0x%08x\n", /* aimutil_get32(fr->data)*/ 0xffffffff);
-
- /*
- * This is an alternate location for starting the login process.
- */
- /* XXX should do more checking to make sure its really the right AUTH conn */
- if (fr->conn->type == AIM_CONN_TYPE_AUTH) {
- /* do NOT send a flapversion, request_login will send it if needed */
- aim_request_login(sess, fr->conn, priv->screenname);
- /* printf("faimtest: login request sent\n"); */
- }
-#endif
-
- return 1;
-}
-
-
-int faimtest_conncomplete(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("doing faimtest_conncomplete");
- /* owl_aim_successful_login(info->sn); */
- return 1;
-}
-
-void addcb_bos(aim_session_t *sess, aim_conn_t *bosconn)
-{
- owl_function_debugmsg("doing addcb_bos");
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_bos, 0);
-
- aim_conn_addhandler(sess, bosconn, 0x0013, 0x0003, ssirights, 0);
- aim_conn_addhandler(sess, bosconn, 0x0013, 0x0006, ssidata, 0);
- aim_conn_addhandler(sess, bosconn, 0x0013, 0x000f, ssidatanochange, 0);
- aim_conn_addhandler(sess, bosconn, 0x0008, 0x0002, handlepopup, 0);
- aim_conn_addhandler(sess, bosconn, 0x0009, 0x0003, faimtest_bosrights, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_REDIRECT, faimtest_handleredirect, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_STS, AIM_CB_STS_SETREPORTINTERVAL, faimtest_reportinterval, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_RIGHTSINFO, faimtest_parse_buddyrights, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_MOTD, faimtest_parse_motd, 0);
- aim_conn_addhandler(sess, bosconn, 0x0004, 0x0005, faimtest_icbmparaminfo, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, faimtest_parse_connerr, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_RIGHTSINFO, faimtest_locrights, 0);
- aim_conn_addhandler(sess, bosconn, 0x0001, 0x001f, faimtest_memrequest, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_ONCOMING, faimtest_parse_oncoming, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_BUD, AIM_CB_BUD_OFFGOING, faimtest_parse_offgoing, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_INCOMING, faimtest_parse_incoming_im, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_ERROR, faimtest_parse_locerr, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MISSEDCALL, faimtest_parse_misses, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_RATECHANGE, faimtest_parse_ratechange, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_GEN, AIM_CB_GEN_EVIL, faimtest_parse_evilnotify, 0);
-
- aim_conn_addhandler(sess, bosconn, 0x000a, 0x0001, faimtest_parse_searcherror, 0);
- aim_conn_addhandler(sess, bosconn, 0x000a, 0x0003, faimtest_parse_searchreply, 0);
-
- /*
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOK, AIM_CB_LOK_ERROR, faimtest_parse_searcherror, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOK, 0x0003, faimtest_parse_searchreply, 0);
- */
-
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ERROR, faimtest_parse_msgerr, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, faimtest_parse_userinfo, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_ACK, faimtest_parse_msgack, 0);
-
- aim_conn_addhandler(sess, bosconn, 0x0001, 0x0001, faimtest_parse_genericerr, 0);
- aim_conn_addhandler(sess, bosconn, 0x0003, 0x0001, faimtest_parse_genericerr, 0);
- aim_conn_addhandler(sess, bosconn, 0x0009, 0x0001, faimtest_parse_genericerr, 0);
- aim_conn_addhandler(sess, bosconn, 0x0001, 0x000b, serverpause, 0);
- aim_conn_addhandler(sess, bosconn, 0x0001, 0x0012, migrate, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSG, offlinemsg, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSGCOMPLETE, offlinemsgdone, 0);
-
- /*
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, gaim_connerr, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chatnav, 0);
- */
-
- /*
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_ERROR, faimtest_ssi_parseerr, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_RIGHTSINFO, faimtest_ssi_parserights, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_LIST, faimtest_ssi_parselist, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_NOLIST, faimtest_ssi_parselist, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_SRVACK, faimtest_ssi_parseack, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_RECVAUTH, faimtest_ssi_authgiven, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_RECVAUTHREQ, faimtest_ssi_authrequest, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_RECVAUTHREP, faimtest_ssi_authreply, 0);
- aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_ADDED, faimtest_ssi_gotadded, 0);
- */
-
- return;
-}
-
-static int conninitdone_bos(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("doing coninitdone_bos");
-
-
- aim_reqpersonalinfo(sess, fr->conn);
- aim_ssi_reqrights(sess);
- aim_ssi_reqdata(sess);
- aim_locate_reqrights(sess);
- aim_buddylist_reqrights(sess, fr->conn);
-
- aim_im_reqparams(sess);
- /* aim_bos_reqrights(sess, fr->conn); */ /* XXX - Don't call this with ssi */
-
- owl_function_debugmsg("conninitdone_bos: requesting rights");
- aim_bos_reqrights(sess, fr->conn); /* XXX - Don't call this with ssi */
- aim_bos_setgroupperm(sess, fr->conn, AIM_FLAG_ALLUSERS);
- aim_bos_setprivacyflags(sess, fr->conn, AIM_PRIVFLAGS_ALLOWIDLE | AIM_PRIVFLAGS_ALLOWMEMBERSINCE);
-
- return(1);
-}
-
-static int conninitdone_admin(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_clientready(sess, fr->conn);
- owl_function_debugmsg("conninitdone_admin: initializtion done for admin connection");
- return(1);
-}
-
-int logout(aim_session_t *sess)
-{
- aim_session_kill(sess);
- owl_aim_init();
-
- owl_function_debugmsg("libfaim logout called");
- /*
- if (faimtest_init() == -1)
- printf("faimtest_init failed\n");
- */
-
- return(0);
-}
-
-/**************************************************************************************************/
-
-static int faimtest_parse_connerr(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- va_list ap;
- fu16_t code;
- char *msg;
-
- va_start(ap, fr);
- code = va_arg(ap, int);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_error("faimtest_parse_connerr: Code 0x%04x: %s\n", code, msg);
- aim_conn_kill(sess, &fr->conn); /* this will break the main loop */
-
- priv->connected = 0;
-
- return 1;
-}
-
-static int faimtest_accountconfirm(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- int status;
- va_list ap;
-
- va_start(ap, fr);
- status = va_arg(ap, int); /* status code of confirmation request */
- va_end(ap);
-
- /* owl_function_debugmsg("faimtest_accountconfirm: Code 0x%04x: %s\n", code, msg); */
- owl_function_debugmsg("faimtest_accountconfirm: account confirmation returned status 0x%04x (%s)\n", status, (status==0x0000)?"email sent":"unknown");
-
- return 1;
-}
-
-static int faimtest_infochange(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- fu16_t change = 0, perms, type;
- int length, str;
- char *val;
- va_list ap;
-
- va_start(ap, fr);
- change = va_arg(ap, int);
- perms = (fu16_t)va_arg(ap, unsigned int);
- type = (fu16_t)va_arg(ap, unsigned int);
- length = va_arg(ap, int);
- val = va_arg(ap, char *);
- str = va_arg(ap, int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_infochange: info%s: perms = %d, type = %x, length = %d, val = %s", change?" change":"", perms, type, length, str?val:"(not string)");
-
- return(1);
-}
-
-
-static int faimtest_handleredirect(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- struct aim_redirect_data *redir;
-
- owl_function_debugmsg("faimtest_handledirect:");
-
- va_start(ap, fr);
- redir = va_arg(ap, struct aim_redirect_data *);
-
- if (redir->group == 0x0005) { /* Adverts */
-
- } else if (redir->group == 0x0007) { /* Authorizer */
- aim_conn_t *tstconn;
-
- owl_function_debugmsg("faimtest_handledirect: autorizer");
-
- tstconn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, redir->ip);
- if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
- owl_function_error("faimtest_handleredirect: unable to reconnect with authorizer");
- } else {
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, faimtest_flapversion, 0);
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_admin, 0);
- aim_conn_addhandler(sess, tstconn, 0x0007, 0x0007, faimtest_accountconfirm, 0);
- aim_conn_addhandler(sess, tstconn, 0x0007, 0x0003, faimtest_infochange, 0);
- aim_conn_addhandler(sess, tstconn, 0x0007, 0x0005, faimtest_infochange, 0);
- /* Send the cookie to the Auth */
- aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
- owl_function_debugmsg("faimtest_handleredirect: sent cookie to authorizer host");
- }
- } else if (redir->group == 0x000d) { /* ChatNav */
- owl_function_debugmsg("faimtest_handledirect: chatnav");
- chatnav_redirect(sess, redir);
- } else if (redir->group == 0x000e) { /* Chat */
- owl_function_debugmsg("faimtest_handledirect: chat");
- chat_redirect(sess, redir);
- } else {
- owl_function_debugmsg("faimtest_handleredirect: uh oh... got redirect for unknown service 0x%04x!!", redir->group);
- }
- va_end(ap);
- return 1;
-}
-
-static int faimtest_icbmparaminfo(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- struct aim_icbmparameters *params;
- va_list ap;
-
- va_start(ap, fr);
- params = va_arg(ap, struct aim_icbmparameters *);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_icbmparaminfo: ICBM Parameters: maxchannel = %d, default flags = 0x%08lx, max msg len = %d, max sender evil = %f, max reciever evil = %f, min msg interval = %ld",
- params->maxchan, params->flags, params->maxmsglen, ((float)params->maxsenderwarn)/10.0, ((float)params->maxrecverwarn)/10.0, params->minmsginterval);
-
- /*
- * Set these to your taste, or client medium. Setting minmsginterval
- * higher is good for keeping yourself from getting flooded (esp
- * if you're on a slow connection or something where that would be
- * useful).
- */
- params->maxmsglen = 8000;
- params->minmsginterval = 0; /* in milliseconds */
- /* aim_seticbmparam(sess, params); */
- aim_im_setparams(sess, params);
-
- return 1;
-}
-
-static int faimtest_parse_buddyrights(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t maxbuddies, maxwatchers;
-
- va_start(ap, fr);
- maxbuddies = va_arg(ap, int);
- maxwatchers = va_arg(ap, int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_buddyrights: Max buddies = %d / Max watchers = %d\n", maxbuddies, maxwatchers);
-
- /* aim_ssi_reqrights(sess, fr->conn); */
- aim_ssi_reqrights(sess);
-
- return 1;
-}
-
-static int faimtest_bosrights(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t maxpermits, maxdenies;
-
- va_start(ap, fr);
- maxpermits = va_arg(ap, int);
- maxdenies = va_arg(ap, int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_bosrights: Max permit = %d / Max deny = %d\n", maxpermits, maxdenies);
- aim_clientready(sess, fr->conn);
- owl_function_debugmsg("officially connected to BOS.");
- aim_icq_reqofflinemsgs(sess);
- return 1;
-}
-
-static int faimtest_locrights(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t maxsiglen;
-
- va_start(ap, fr);
- maxsiglen = va_arg(ap, int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_locrights: rights: max signature length = %d\n", maxsiglen);
-
- return(1);
-}
-
-static int faimtest_reportinterval(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- va_list ap;
- fu16_t interval;
-
- va_start(ap, fr);
- interval = va_arg(ap, int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_reportinterval: %d (seconds?)\n", interval);
-
- if (!priv->connected) {
- priv->connected++;
- }
- /* aim_reqicbmparams(sess); */
- aim_im_reqparams(sess);
- /* kretch */
- return 1;
-}
-
-static int faimtest_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- char *msg;
- fu16_t id;
- va_list ap;
- static int codeslen = 5;
- static char *codes[] = {
- "Unknown",
- "Mandatory upgrade",
- "Advisory upgrade",
- "System bulletin",
- "Top o' the world!"
- };
-
- va_start(ap, fr);
- id = va_arg(ap, int);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_motd: %s (%d / %s)\n", msg?msg:"nomsg", id, (id < codeslen)?codes[id]:"unknown");
-
- return 1;
-}
-
-/*
- * This is a little more complicated than it looks. The module
- * name (proto, boscore, etc) may or may not be given. If it is
- * not given, then use aim.exe. If it is given, put ".ocm" on the
- * end of it.
- *
- * Now, if the offset or length requested would cause a read past
- * the end of the file, then the request is considered invalid. Invalid
- * requests are processed specially. The value hashed is the
- * the request, put into little-endian (eight bytes: offset followed
- * by length).
- *
- * Additionally, if the request is valid, the length is mod 4096. It is
- * important that the length is checked for validity first before doing
- * the mod.
- *
- * Note to Bosco's Brigade: if you'd like to break this, put the
- * module name on an invalid request.
- *
- */
-static int getaimdata(aim_session_t *sess, unsigned char **bufret, int *buflenret, unsigned long offset, unsigned long len, const char *modname)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- FILE *f;
- static const char defaultmod[] = "aim.exe";
- char *filename = NULL;
- struct stat st;
- unsigned char *buf;
- int invalid = 0;
-
- if (!bufret || !buflenret)
- return -1;
-
- if (modname) {
- if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
- /* perror("memrequest: malloc"); */
- return -1;
- }
- sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname);
- } else {
- if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
- /* perror("memrequest: malloc"); */
- return -1;
- }
- sprintf(filename, "%s/%s", priv->aimbinarypath, defaultmod);
- }
-
- if (stat(filename, &st) == -1) {
- if (!modname) {
- /* perror("memrequest: stat"); */
- owl_free(filename);
- return -1;
- }
- invalid = 1;
- }
-
- if (!invalid) {
- if ((offset > st.st_size) || (len > st.st_size))
- invalid = 1;
- else if ((st.st_size - offset) < len)
- len = st.st_size - offset;
- else if ((st.st_size - len) < len)
- len = st.st_size - len;
- }
-
- if (!invalid && len) {
- len %= 4096;
- }
-
- if (invalid) {
- int i;
-
- owl_free(filename); /* not needed */
- owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
- i = 8;
- if (modname) {
- i+=strlen(modname);
- }
-
- if (!(buf = owl_malloc(i))) {
- return -1;
- }
-
- i=0;
-
- if (modname) {
- memcpy(buf, modname, strlen(modname));
- i+=strlen(modname);
- }
-
- /* Damn endianness. This must be little (LSB first) endian. */
- buf[i++] = offset & 0xff;
- buf[i++] = (offset >> 8) & 0xff;
- buf[i++] = (offset >> 16) & 0xff;
- buf[i++] = (offset >> 24) & 0xff;
- buf[i++] = len & 0xff;
- buf[i++] = (len >> 8) & 0xff;
- buf[i++] = (len >> 16) & 0xff;
- buf[i++] = (len >> 24) & 0xff;
-
- *bufret = buf;
- *buflenret = i;
- } else {
- if (!(buf = owl_malloc(len))) {
- owl_free(filename);
- return -1;
- }
- /* printf("memrequest: loading %ld bytes from 0x%08lx in \"%s\"...\n", len, offset, filename); */
- if (!(f = fopen(filename, "r"))) {
- /* perror("memrequest: fopen"); */
- owl_free(filename);
- owl_free(buf);
- return -1;
- }
-
- owl_free(filename);
-
- if (fseek(f, offset, SEEK_SET) == -1) {
- /* perror("memrequest: fseek"); */
- fclose(f);
- owl_free(buf);
- return -1;
- }
-
- if (fread(buf, len, 1, f) != 1) {
- /* perror("memrequest: fread"); */
- fclose(f);
- owl_free(buf);
- return -1;
- }
-
- fclose(f);
- *bufret = buf;
- *buflenret = len;
- }
- return 0; /* success! */
-}
-
-/*
- * This will get an offset and a length. The client should read this
- * data out of whatever AIM.EXE binary the user has provided (hopefully
- * it matches the client information thats sent at login) and pass a
- * buffer back to libfaim so it can hash the data and send it to AOL for
- * inspection by the client police.
- */
-static int faimtest_memrequest(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- va_list ap;
- fu32_t offset, len;
- char *modname;
- unsigned char *buf;
- int buflen;
-
- va_start(ap, fr);
- offset = va_arg(ap, fu32_t);
- len = va_arg(ap, fu32_t);
- modname = va_arg(ap, char *);
- va_end(ap);
-
- if (priv->aimbinarypath && (getaimdata(sess, &buf, &buflen, offset, len, modname) == 0)) {
- aim_sendmemblock(sess, fr->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
- owl_free(buf);
- } else {
- owl_function_debugmsg("faimtest_memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", priv->aimbinarypath, modname);
- aim_sendmemblock(sess, fr->conn, offset, len, NULL, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
- }
- return 1;
-}
-
-/*
-static void printuserflags(fu16_t flags)
-{
- if (flags & AIM_FLAG_UNCONFIRMED) printf("UNCONFIRMED ");
- if (flags & AIM_FLAG_ADMINISTRATOR) printf("ADMINISTRATOR ");
- if (flags & AIM_FLAG_AOL) printf("AOL ");
- if (flags & AIM_FLAG_OSCAR_PAY) printf("OSCAR_PAY ");
- if (flags & AIM_FLAG_FREE) printf("FREE ");
- if (flags & AIM_FLAG_AWAY) printf("AWAY ");
- if (flags & AIM_FLAG_ICQ) printf("ICQ ");
- if (flags & AIM_FLAG_WIRELESS) printf("WIRELESS ");
- if (flags & AIM_FLAG_ACTIVEBUDDY) printf("ACTIVEBUDDY ");
-
- return;
-}
-*/
-
-static int faimtest_parse_userinfo(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_userinfo_t *userinfo;
- char *prof_encoding = NULL;
- char *prof = NULL;
- fu16_t inforeq = 0;
- owl_buddy *b;
- va_list ap;
- va_start(ap, fr);
- userinfo = va_arg(ap, aim_userinfo_t *);
- inforeq = (fu16_t)va_arg(ap, unsigned int);
- prof_encoding = va_arg(ap, char *);
- prof = va_arg(ap, char *);
- va_end(ap);
-
- /* right now the only reason we call this is for idle times */
- owl_function_debugmsg("parse_userinfo sn: %s idle: %i", userinfo->sn, userinfo->idletime);
- b=owl_buddylist_get_aim_buddy(owl_global_get_buddylist(&g),
- userinfo->sn);
- if (!b) return(1);
- owl_buddy_set_idle_since(b, userinfo->idletime);
- return(1);
-
- /*
- printf("userinfo: sn: %s\n", userinfo->sn);
- printf("userinfo: warnlevel: %f\n", aim_userinfo_warnlevel(userinfo));
- printf("userinfo: flags: 0x%04x = ", userinfo->flags);
- printuserflags(userinfo->flags);
- printf("\n");
- */
-
- /*
- printf("userinfo: membersince: %lu\n", userinfo->membersince);
- printf("userinfo: onlinesince: %lu\n", userinfo->onlinesince);
- printf("userinfo: idletime: 0x%04x\n", userinfo->idletime);
- printf("userinfo: capabilities = %s = 0x%08lx\n", (userinfo->present & AIM_USERINFO_PRESENT_CAPABILITIES) ? "present" : "not present", userinfo->capabilities);
- */
-
- /*
- if (inforeq == AIM_GETINFO_GENERALINFO) {
- owl_function_debugmsg("userinfo: profile_encoding: %s\n", prof_encoding ? prof_encoding : "[none]");
- owl_function_debugmsg("userinfo: prof: %s\n", prof ? prof : "[none]");
- } else if (inforeq == AIM_GETINFO_AWAYMESSAGE) {
- owl_function_debugmsg("userinfo: awaymsg_encoding: %s\n", prof_encoding ? prof_encoding : "[none]");
- owl_function_debugmsg("userinfo: awaymsg: %s\n", prof ? prof : "[none]");
- } else if (inforeq == AIM_GETINFO_CAPABILITIES) {
- owl_function_debugmsg("userinfo: capabilities: see above\n");
- } else {
- owl_function_debugmsg("userinfo: unknown info request\n");
- }
- */
- return(1);
-}
-
-#if 0
-static int faimtest_handlecmd(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, const char *tmpstr)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
-
- if (!strncmp(tmpstr, "disconnect", 10)) {
- logout(sess);
- } else if (strstr(tmpstr, "goodday")) {
- /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK, "Good day to you too."); */
- } else if (strstr(tmpstr, "haveicon") && priv->buddyicon) {
- struct aim_sendimext_args args;
- /* static const char iconmsg[] = {"I have an icon"}; */
- static const char iconmsg[] = {""};
-
- args.destsn = userinfo->sn;
- args.flags = AIM_IMFLAGS_HASICON;
- args.msg = iconmsg;
- args.msglen = strlen(iconmsg);
- args.iconlen = priv->buddyiconlen;
- args.iconstamp = priv->buddyiconstamp;
- args.iconsum = priv->buddyiconsum;
-
- /* aim_send_im_ext(sess, &args); */
-
- } else if (strstr(tmpstr, "sendbin")) {
- struct aim_sendimext_args args;
- static const unsigned char data[] = {
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
- 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
- 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
- 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
- };
-
- /*
- * I put this here as a demonstration of how to send
- * arbitrary binary data via OSCAR ICBM's without the need
- * for escape or baseN encoding of any sort.
- *
- * Apparently if you set the charset to something WinAIM
- * doesn't recognize, it will completly ignore the message.
- * That is, it will not display anything in the conversation
- * window for the user that recieved it.
- *
- * HOWEVER, if they do not have a conversation window open
- * for you, a new one will be created, but it will not have
- * any messages in it. Therefore sending these things could
- * be a great way to seemingly subliminally convince people
- * to talk to you...
- *
- */
- args.destsn = userinfo->sn;
- /* args.flags = AIM_IMFLAGS_CUSTOMCHARSET; */
- args.charset = args.charsubset = 0x4242;
- args.msg = data;
- args.msglen = sizeof(data);
- /* aim_send_im_ext(sess, &args); */
- } else if (strstr(tmpstr, "sendmulti")) {
- struct aim_sendimext_args args;
- aim_mpmsg_t mpm;
- static const fu16_t unidata[] = { /* "UNICODE." */
- 0x0055, 0x004e, 0x0049, 0x0043,
- 0x004f, 0x0044, 0x0045, 0x002e,
- };
- static const int unidatalen = 8;
-
- /*
- * This is how multipart messages should be sent.
- *
- * This should render as:
- * "Part 1, ASCII. UNICODE.Part 3, ASCII. "
- */
-
- aim_mpmsg_init(sess, &mpm);
- aim_mpmsg_addascii(sess, &mpm, "Part 1, ASCII. ");
- aim_mpmsg_addunicode(sess, &mpm, unidata, unidatalen);
- aim_mpmsg_addascii(sess, &mpm, "Part 3, ASCII. ");
-
- args.destsn = userinfo->sn;
- args.flags = AIM_IMFLAGS_MULTIPART;
- args.mpmsg = &mpm;
-
- /* aim_send_im_ext(sess, &args); */
-
- aim_mpmsg_free(sess, &mpm);
-
- } else if (strstr(tmpstr, "sendprebin")) {
- static const unsigned char data[] = {
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
- 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
- 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
- 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
- };
- struct aim_sendimext_args args;
- aim_mpmsg_t mpm;
-
- /*
- * This demonstrates sending a human-readable preamble,
- * and then arbitrary binary data.
- *
- * This means that you can very inconspicuously send binary
- * attachments to other users. In WinAIM, this appears as
- * though it only had the ASCII portion.
- *
- */
-
- aim_mpmsg_init(sess, &mpm);
- aim_mpmsg_addascii(sess, &mpm, "This message has binary data.");
- aim_mpmsg_addraw(sess, &mpm, 0x4242, 0x4242, data, sizeof(data));
-
- args.destsn = userinfo->sn;
- args.flags = AIM_IMFLAGS_MULTIPART;
- args.mpmsg = &mpm;
-
- /* aim_send_im_ext(sess, &args); */
- aim_mpmsg_free(sess, &mpm);
-
- } else if (strstr(tmpstr, "havefeat")) {
- struct aim_sendimext_args args;
- static const char featmsg[] = {"I have nifty features."};
- fu8_t features[] = {0x01, 0x01, 0x01, 0x02, 0x42, 0x43, 0x44, 0x45};
-
- args.destsn = userinfo->sn;
- args.flags = AIM_IMFLAGS_CUSTOMFEATURES;
- args.msg = featmsg;
- args.msglen = strlen(featmsg);
- args.features = features;
- args.featureslen = sizeof(features);
-
- /* aim_send_im_ext(sess, &args); */
- } else if (strstr(tmpstr, "sendicon") && priv->buddyicon) {
- /* aim_send_icon(sess, userinfo->sn, priv->buddyicon, priv->buddyiconlen, priv->buddyiconstamp, priv->buddyiconsum); */
- } else if (strstr(tmpstr, "warnme")) {
- /* printf("icbm: sending non-anon warning\n"); */
- /* aim_send_warning(sess, conn, userinfo->sn, 0); */
- } else if (strstr(tmpstr, "anonwarn")) {
- /* printf("icbm: sending anon warning\n"); */
- /* aim_send_warning(sess, conn, userinfo->sn, AIM_WARN_ANON); */
- } else if (strstr(tmpstr, "setdirectoryinfo")) {
- /* printf("icbm: sending backwards profile data\n"); */
- aim_setdirectoryinfo(sess, conn, "tsrif", "elddim", "tsal", "nediam", "emankcin", "teerts", "ytic", "etats", "piz", 0, 1);
- } else if (strstr(tmpstr, "setinterests")) {
- /* printf("icbm: setting fun interests\n"); */
- aim_setuserinterests(sess, conn, "interest1", "interest2", "interest3", "interest4", "interest5", 1);
- } else if (!strncmp(tmpstr, "open chatnav", 12)) {
- aim_reqservice(sess, conn, AIM_CONN_TYPE_CHATNAV);
- } else if (!strncmp(tmpstr, "create", 6)) {
- aim_chatnav_createroom(sess,aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV), (strlen(tmpstr) < 7)?"WorldDomination":tmpstr+7, 0x0004);
- } else if (!strncmp(tmpstr, "close chatnav", 13)) {
- aim_conn_t *chatnavconn;
- if ((chatnavconn = aim_getconn_type(sess, AIM_CONN_TYPE_CHATNAV)))
- aim_conn_kill(sess, &chatnavconn);
- } else if (!strncmp(tmpstr, "join", 4)) {
- aim_chat_join(sess, conn, 0x0004, "worlddomination", 0x0000);
- } else if (!strncmp(tmpstr, "leave", 5)) {
- aim_chat_leaveroom(sess, "worlddomination");
- } else if (!strncmp(tmpstr, "getinfo", 7)) {
- aim_getinfo(sess, conn, "midendian", AIM_GETINFO_GENERALINFO);
- aim_getinfo(sess, conn, "midendian", AIM_GETINFO_AWAYMESSAGE);
- aim_getinfo(sess, conn, "midendian", AIM_GETINFO_CAPABILITIES);
- } else if(strstr(tmpstr, "lookup")) {
- /* aim_usersearch_address(sess, conn, "mid@auk.cx"); */
- } else if (!strncmp(tmpstr, "reqsendmsg", 10)) {
- /* aim_send_im(sess, priv->ohcaptainmycaptain, 0, "sendmsg 7900"); */
- } else if (!strncmp(tmpstr, "reqadmin", 8)) {
- aim_reqservice(sess, conn, AIM_CONN_TYPE_AUTH);
- } else if (!strncmp(tmpstr, "changenick", 10)) {
- aim_admin_setnick(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "diputs8 1");
- } else if (!strncmp(tmpstr, "reqconfirm", 10)) {
- aim_admin_reqconfirm(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH));
- } else if (!strncmp(tmpstr, "reqemail", 8)) {
- aim_admin_getinfo(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), 0x0011);
- } else if (!strncmp(tmpstr, "changepass", 8)) {
- aim_admin_changepasswd(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWPASSWORD", "OLDPASSWORD");
- } else if (!strncmp(tmpstr, "setemail", 8)) {
- aim_admin_setemail(sess, aim_getconn_type(sess, AIM_CONN_TYPE_AUTH), "NEWEMAILADDRESS");
- } else if (!strncmp(tmpstr, "sendmsg", 7)) {
- int i;
-
- i = atoi(tmpstr+8);
- if (i < 10000) {
- char *newbuf;
- int z;
-
- newbuf = owl_malloc(i+1);
- for (z = 0; z < i; z++)
- newbuf[z] = (z % 10)+0x30;
- newbuf[i] = '\0';
- /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK | AIM_IMFLAGS_AWAY, newbuf); */
- owl_free(newbuf);
- }
- } else if (strstr(tmpstr, "seticqstatus")) {
- aim_setextstatus(sess, AIM_ICQ_STATE_DND);
- } else if (strstr(tmpstr, "rtfmsg")) {
- static const char rtfmsg[] = {"{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fswiss\\fcharset0 Arial;}{\\f1\\froman\\fprq2\\fcharset0 Georgia;}{\\f2\\fmodern\\fprq1\\fcharset0 MS Mincho;}{\\f3\\froman\\fprq2\\fcharset2 Symbol;}}\\viewkind4\\uc1\\pard\\f0\\fs20 Test\\f1 test\\f2\fs44 test\\f3\\fs20 test\\f0\\par}"};
- struct aim_sendrtfmsg_args rtfargs;
-
- memset(&rtfargs, 0, sizeof(rtfargs));
- rtfargs.destsn = userinfo->sn;
- rtfargs.fgcolor = 0xffffffff;
- rtfargs.bgcolor = 0x00000000;
- rtfargs.rtfmsg = rtfmsg;
- /* aim_send_rtfmsg(sess, &rtfargs); */
- } else {
- /* printf("unknown command.\n"); */
- aim_add_buddy(sess, conn, userinfo->sn);
- }
-
- return 0;
-}
-#endif
-
-/*
- * Channel 1: Standard Message
- */
-static int faimtest_parse_incoming_im_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args)
-{
- struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
- owl_message *m;
- char *stripmsg, *nz_screenname, *wrapmsg;
- char realmsg[8192+1] = {""};
- /* int clienttype = AIM_CLIENTTYPE_UNKNOWN; */
-
- /* clienttype = aim_fingerprintclient(args->features, args->featureslen); */
-
- /*
- printf("icbm: sn = \"%s\"\n", userinfo->sn);
- printf("icbm: probable client type: %d\n", clienttype);
- printf("icbm: warnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
- printf("icbm: flags = 0x%04x = ", userinfo->flags);
- printuserflags(userinfo->flags);
- printf("\n");
- */
-
- /*
- printf("icbm: membersince = %lu\n", userinfo->membersince);
- printf("icbm: onlinesince = %lu\n", userinfo->onlinesince);
- printf("icbm: idletime = 0x%04x\n", userinfo->idletime);
- printf("icbm: capabilities = %s = 0x%08lx\n", (userinfo->present & AIM_USERINFO_PRESENT_CAPABILITIES) ? "present" : "not present", userinfo->capabilities);
- */
-
- /*
- printf("icbm: icbmflags = ");
- if (args->icbmflags & AIM_IMFLAGS_AWAY) printf("away ");
- if (args->icbmflags & AIM_IMFLAGS_ACK) printf("ackrequest ");
- if (args->icbmflags & AIM_IMFLAGS_OFFLINE) printf("offline ");
- if (args->icbmflags & AIM_IMFLAGS_BUDDYREQ) printf("buddyreq ");
- if (args->icbmflags & AIM_IMFLAGS_HASICON) printf("hasicon ");
- printf("\n");
- */
-
- /*
- if (args->icbmflags & AIM_IMFLAGS_CUSTOMCHARSET) {
- printf("icbm: encoding flags = {%04x, %04x}\n", args->charset, args->charsubset);
- }
- */
-
- /*
- * Quickly convert it to eight bit format, replacing non-ASCII UNICODE
- * characters with their equivelent HTML entity.
- */
- if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
- int i;
-
- for (i=0; i<args->msglen; i+=2) {
- fu16_t uni;
-
- uni = ((args->msg[i] & 0xff) << 8) | (args->msg[i+1] & 0xff);
- if ((uni < 128) || ((uni >= 160) && (uni <= 255))) { /* ISO 8859-1 */
- snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), "%c", uni);
- } else { /* something else, do UNICODE entity */
- snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), "&#%04x;", uni);
- }
- }
- } else {
- /*
- * For non-UNICODE encodings (ASCII and ISO 8859-1), there is
- * no need to do anything special here. Most
- * terminals/whatever will be able to display such characters
- * unmodified.
- *
- * Beware that PC-ASCII 128 through 159 are _not_ actually
- * defined in ASCII or ISO 8859-1, and you should send them as
- * UNICODE. WinAIM will send these characters in a UNICODE
- * message, so you need to do so as well.
- *
- * You may not think it necessary to handle UNICODE messages.
- * You're probably wrong. For one thing, Microsoft "Smart
- * Quotes" will be sent by WinAIM as UNICODE (not HTML UNICODE,
- * but real UNICODE). If you don't parse UNICODE at all, your
- * users will get a blank message instead of the message
- * containing Smart Quotes.
- *
- */
- if (args->msg && args->msglen)
- strncpy(realmsg, args->msg, sizeof(realmsg));
- }
-
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: message from: %s", userinfo->sn?userinfo->sn:"");
- /* create a message, and put it on the message queue */
- stripmsg=owl_text_htmlstrip(realmsg);
- wrapmsg=owl_text_wordwrap(stripmsg, 70);
- nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
- m=owl_malloc(sizeof(owl_message));
- owl_message_create_aim(m,
- nz_screenname,
- owl_global_get_aim_screenname(&g),
- wrapmsg,
- OWL_MESSAGE_DIRECTION_IN,
- 0);
- if (args->icbmflags & AIM_IMFLAGS_AWAY) owl_message_set_attribute(m, "isauto", "");
- owl_global_messagequeue_addmsg(&g, m);
- owl_free(stripmsg);
- owl_free(wrapmsg);
- owl_free(nz_screenname);
-
- return(1);
-
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: message: %s\n", realmsg);
-
- if (args->icbmflags & AIM_IMFLAGS_MULTIPART) {
- aim_mpmsg_section_t *sec;
- int z;
-
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: this message has %d parts\n", args->mpmsg.numparts);
-
- for (sec = args->mpmsg.parts, z = 0; sec; sec = sec->next, z++) {
- if ((sec->charset == 0x0000) || (sec->charset == 0x0003) || (sec->charset == 0xffff)) {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: part %d: charset 0x%04x, subset 0x%04x, msg = %s\n", z, sec->charset, sec->charsubset, sec->data);
- } else {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: part %d: charset 0x%04x, subset 0x%04x, binary or UNICODE data\n", z, sec->charset, sec->charsubset);
- }
- }
- }
-
- if (args->icbmflags & AIM_IMFLAGS_HASICON) {
- /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_BUDDYREQ, "You have an icon"); */
- owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: their icon: iconstamp = %ld, iconlen = 0x%08lx, iconsum = 0x%04x\n", args->iconstamp, args->iconlen, args->iconsum);
- }
-
- /*
- if (realmsg) {
- int i = 0;
- while (realmsg[i] == '<') {
- if (realmsg[i] == '<') {
- while (realmsg[i] != '>')
- i++;
- i++;
- }
- }
- tmpstr = realmsg+i;
- faimtest_handlecmd(sess, conn, userinfo, tmpstr);
- }
- */
-
- if (priv->buddyicon && (args->icbmflags & AIM_IMFLAGS_BUDDYREQ)) {
- /* aim_send_icon(sess, userinfo->sn, priv->buddyicon, priv->buddyiconlen, priv->buddyiconstamp, priv->buddyiconsum); */
- }
-
- return(1);
-}
-
-/*
- * Channel 2: Rendevous Request
- */
-static int faimtest_parse_incoming_im_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args)
-{
- /*
- printf("rendezvous: source sn = %s\n", userinfo->sn);
- printf("rendezvous: \twarnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
- printf("rendezvous: \tclass = 0x%04x = ", userinfo->flags);
- printuserflags(userinfo->flags);
- printf("\n");
-
- printf("rendezvous: \tonlinesince = %lu\n", userinfo->onlinesince);
- printf("rendezvous: \tidletime = 0x%04x\n", userinfo->idletime);
-
- printf("rendezvous: message/description = %s\n", args->msg);
- printf("rendezvous: encoding = %s\n", args->encoding);
- printf("rendezvous: language = %s\n", args->language);
- */
-
- if (args->reqclass == AIM_CAPS_SENDFILE) {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan2: send file!");
- } else if (args->reqclass == AIM_CAPS_CHAT) {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan2: chat invite: %s, %i, %i", args->info.chat.roominfo.name, args->info.chat.roominfo.exchange, args->info.chat.roominfo.instance);
- /*
- printf("chat invitation: room name = %s\n", args->info.chat.roominfo.name);
- printf("chat invitation: exchange = 0x%04x\n", args->info.chat.roominfo.exchange);
- printf("chat invitation: instance = 0x%04x\n", args->info.chat.roominfo.instance);
- */
- /* Automatically join room... */
- /* printf("chat invitiation: autojoining %s...\n", args->info.chat.roominfo.name); */
-
- /* aim_chat_join(sess, conn, args->info.chat.roominfo.exchange, args->info.chat.roominfo.name, args->info.chat.roominfo.instance); */
- } else if (args->reqclass == AIM_CAPS_BUDDYICON) {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan2: Buddy Icon from %s, length = %lu\n",
- userinfo->sn, args->info.icon.length);
- } else if (args->reqclass == AIM_CAPS_ICQRTF) {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan2: RTF message from %s: (fgcolor = 0x%08lx, bgcolor = 0x%08lx) %s\n",
- userinfo->sn, args->info.rtfmsg.fgcolor, args->info.rtfmsg.bgcolor, args->info.rtfmsg.rtfmsg);
- } else {
- owl_function_debugmsg("faimtest_parse_incoming_im_chan2: icbm: unknown reqclass (%d)\n", args->reqclass);
- }
- return 1;
-}
-
-static int faimtest_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- fu16_t channel;
- aim_userinfo_t *userinfo;
- va_list ap;
- int ret = 0;
-
- va_start(ap, fr);
- channel = (fu16_t)va_arg(ap, unsigned int);
- userinfo = va_arg(ap, aim_userinfo_t *);
-
- if (channel == 1) {
- struct aim_incomingim_ch1_args *args;
- args = va_arg(ap, struct aim_incomingim_ch1_args *);
- ret = faimtest_parse_incoming_im_chan1(sess, fr->conn, userinfo, args);
- } else if (channel == 2) {
- struct aim_incomingim_ch2_args *args;
- args = va_arg(ap, struct aim_incomingim_ch2_args *);
- ret = faimtest_parse_incoming_im_chan2(sess, fr->conn, userinfo, args);
- } else {
- owl_function_debugmsg("faimtest_parse_incoming_im: unsupported channel 0x%04x\n", channel);
- }
- va_end(ap);
- owl_function_debugmsg("faimtest_parse_incoming_im: done with ICBM handling (ret = %d)\n", ret);
- return 1;
-}
-
-static int faimtest_parse_oncoming(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_userinfo_t *userinfo;
- char *nz_screenname;
- owl_buddy *b;
- owl_buddylist *bl;
- va_list ap;
- va_start(ap, fr);
- userinfo = va_arg(ap, aim_userinfo_t *);
- va_end(ap);
-
- nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
- bl=owl_global_get_buddylist(&g);
-
- owl_buddylist_oncoming(owl_global_get_buddylist(&g), nz_screenname);
-
- if (userinfo->present & AIM_USERINFO_PRESENT_IDLE) {
- owl_function_debugmsg("faimtest_parseoncoming: in empty part of userinfo present and present idle");
- }
-
- b=owl_buddylist_get_aim_buddy(owl_global_get_buddylist(&g), nz_screenname);
- if (!b) {
- owl_function_debugmsg("Error: parse_oncoming setting idle time with no buddy present.");
- return(1);
- }
- if (userinfo->idletime==0) {
- owl_buddy_set_unidle(b);
- } else {
- owl_buddy_set_idle(b);
- owl_buddy_set_idle_since(b, userinfo->idletime);
- }
-
- if (userinfo->flags & AIM_FLAG_AWAY) {
- owl_function_debugmsg("parse_oncoming sn: %s away flag!", userinfo->sn);
- }
-
- owl_function_debugmsg("parse_oncoming sn: %s idle: %i", userinfo->sn, userinfo->idletime);
-
- owl_free(nz_screenname);
-
- /*
- printf("%ld %s is now online (flags: %04x = %s%s%s%s%s%s%s%s) (caps = %s = 0x%08lx)\n",
- time(NULL),
- userinfo->sn, userinfo->flags,
- (userinfo->flags&AIM_FLAG_UNCONFIRMED)?" UNCONFIRMED":"",
- (userinfo->flags&AIM_FLAG_ADMINISTRATOR)?" ADMINISTRATOR":"",
- (userinfo->flags&AIM_FLAG_AOL)?" AOL":"",
- (userinfo->flags&AIM_FLAG_OSCAR_PAY)?" OSCAR_PAY":"",
- (userinfo->flags&AIM_FLAG_FREE)?" FREE":"",
- (userinfo->flags&AIM_FLAG_AWAY)?" AWAY":"",
- (userinfo->flags&AIM_FLAG_ICQ)?" ICQ":"",
- (userinfo->flags&AIM_FLAG_WIRELESS)?" WIRELESS":"",
- (userinfo->present & AIM_USERINFO_PRESENT_CAPABILITIES) ? "present" : "not present",
- userinfo->capabilities);
- */
- return(1);
-}
-
-static int faimtest_parse_offgoing(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_userinfo_t *userinfo;
- char *nz_screenname;
- va_list ap;
-
- va_start(ap, fr);
- userinfo = va_arg(ap, aim_userinfo_t *);
- va_end(ap);
-
- nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
- owl_buddylist_offgoing(owl_global_get_buddylist(&g), nz_screenname);
- owl_free(nz_screenname);
-
- if (userinfo->present & AIM_USERINFO_PRESENT_IDLE) {
- owl_function_debugmsg("parse_offgoing sn: %s idle time %i", userinfo->sn, userinfo->idletime);
- }
-
- /*
- printf("%ld %s is now offline (flags: %04x = %s%s%s%s%s%s%s%s) (caps = %s = 0x%08lx)\n",
- time(NULL),
- userinfo->sn, userinfo->flags,
- (userinfo->flags&AIM_FLAG_UNCONFIRMED)?" UNCONFIRMED":"",
- (userinfo->flags&AIM_FLAG_ADMINISTRATOR)?" ADMINISTRATOR":"",
- (userinfo->flags&AIM_FLAG_AOL)?" AOL":"",
- (userinfo->flags&AIM_FLAG_OSCAR_PAY)?" OSCAR_PAY":"",
- (userinfo->flags&AIM_FLAG_FREE)?" FREE":"",
- (userinfo->flags&AIM_FLAG_AWAY)?" AWAY":"",
- (userinfo->flags&AIM_FLAG_ICQ)?" ICQ":"",
- (userinfo->flags&AIM_FLAG_WIRELESS)?" WIRELESS":"",
- (userinfo->present & AIM_USERINFO_PRESENT_CAPABILITIES) ? "present" : "not present",
- userinfo->capabilities);
- */
-
- return 1;
-}
-
-/* Used by chat as well. */
-int faimtest_parse_genericerr(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t reason;
-
- va_start(ap, fr);
- reason = (fu16_t)va_arg(ap, unsigned int);
- va_end(ap);
-
- /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
- if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
-
- return 1;
-}
-
-static int faimtest_parse_msgerr(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- char *destsn;
- fu16_t reason;
-
- va_start(ap, fr);
- reason = (fu16_t)va_arg(ap, unsigned int);
- destsn = va_arg(ap, char *);
- va_end(ap);
-
- /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
- if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
-
- if (reason==4) {
- owl_function_adminmsg("", "Could not send AIM message, user not logged on");
- }
-
- return 1;
-}
-
-static int faimtest_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- char *destsn;
- fu16_t reason;
-
- va_start(ap, fr);
- reason = (fu16_t)va_arg(ap, unsigned int);
- destsn = va_arg(ap, char *);
- va_end(ap);
-
- /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
- if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
-
- return 1;
-}
-
-static int faimtest_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- static char *missedreasons[] = {
- "Invalid (0)",
- "Message too large",
- "Rate exceeded",
- "Evil Sender",
- "Evil Receiver"
- };
- static int missedreasonslen = 5;
-
- va_list ap;
- fu16_t chan, nummissed, reason;
- aim_userinfo_t *userinfo;
-
- va_start(ap, fr);
- chan = (fu16_t)va_arg(ap, unsigned int);
- userinfo = va_arg(ap, aim_userinfo_t *);
- nummissed = (fu16_t)va_arg(ap, unsigned int);
- reason = (fu16_t)va_arg(ap, unsigned int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_misses: missed %d messages from %s on channel %d (reason %d: %s)\n", nummissed, userinfo->sn, chan, reason, (reason<missedreasonslen)?missedreasons[reason]:"unknown");
-
- return 1;
-}
-
-/*
- * Received in response to an IM sent with the AIM_IMFLAGS_ACK option.
- */
-static int faimtest_parse_msgack(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t type;
- char *sn = NULL;
-
- va_start(ap, fr);
- type = (fu16_t)va_arg(ap, unsigned int);
- sn = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_msgack: 0x%04x / %s\n", type, sn);
-
- return 1;
-}
-
-static int faimtest_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- static char *codes[5] = {
- "invalid",
- "change",
- "warning",
- "limit",
- "limit cleared"
- };
- va_list ap;
- fu16_t code, rateclass;
- fu32_t windowsize, clear, alert, limit, disconnect;
- fu32_t currentavg, maxavg;
-
- va_start(ap, fr);
-
- /* See code explanations below */
- code = (fu16_t)va_arg(ap, unsigned int);
-
- /*
- * See comments above aim_parse_ratechange_middle() in aim_rxhandlers.c.
- */
- rateclass = (fu16_t)va_arg(ap, unsigned int);
-
- /*
- * Not sure what this is exactly. I think its the temporal
- * relation factor (ie, how to make the rest of the numbers
- * make sense in the real world).
- */
- windowsize = va_arg(ap, fu32_t);
-
- /* Explained below */
- clear = va_arg(ap, fu32_t);
- alert = va_arg(ap, fu32_t);
- limit = va_arg(ap, fu32_t);
- disconnect = va_arg(ap, fu32_t);
- currentavg = va_arg(ap, fu32_t);
- maxavg = va_arg(ap, fu32_t);
-
- va_end(ap);
-
- owl_function_debugmsg("faimtest_parse_ratechange: rate %s (rate class 0x%04x): curavg = %ld, maxavg = %ld, alert at %ld, clear warning at %ld, limit at %ld, disconnect at %ld (window size = %ld)",
- (code < 5)?codes[code]:"invalid",
- rateclass,
- currentavg, maxavg,
- alert, clear,
- limit, disconnect,
- windowsize);
- return 1;
-}
-
-static int faimtest_parse_evilnotify(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu16_t newevil;
- aim_userinfo_t *userinfo;
-
- va_start(ap, fr);
- newevil = (fu16_t)va_arg(ap, unsigned int);
- userinfo = va_arg(ap, aim_userinfo_t *);
- va_end(ap);
-
- /*
- * Evil Notifications that are lacking userinfo->sn are anon-warns
- * if they are an evil increases, but are not warnings at all if its
- * a decrease (its the natural backoff happening).
- *
- * newevil is passed as an int representing the new evil value times
- * ten.
- */
- owl_function_debugmsg("faimtest_parse_evilnotify: new value = %2.1f%% (caused by %s)\n", ((float)newevil)/10, (userinfo && strlen(userinfo->sn))?userinfo->sn:"anonymous");
-
- return 1;
-}
-
-static int faimtest_parse_searchreply(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- char *address, *SNs;
- int num, i;
- owl_list list;
-
- va_start(ap, fr);
- address = va_arg(ap, char *);
- num = va_arg(ap, int);
- SNs = va_arg(ap, char *);
- va_end(ap);
-
- owl_list_create(&list);
-
- owl_function_debugmsg("faimtest_parse_searchreply: E-Mail Search Results for %s: ", address);
- for (i=0; i<num; i++) {
- owl_function_debugmsg(" %s", &SNs[i*(MAXSNLEN+1)]);
- owl_list_append_element(&list, &SNs[i*(MAXSNLEN+1)]);
- }
- owl_function_aimsearch_results(address, &list);
- owl_list_free_simple(&list);
- return(1);
-}
-
-static int faimtest_parse_searcherror(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- char *address;
-
- va_start(ap, fr);
- address = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_error("No results searching for %s", address);
- owl_function_debugmsg("faimtest_parse_searcherror: E-Mail Search Results for %s: No Results or Invalid Email\n", address);
-
- return(1);
-}
-
-static int handlepopup(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- char *msg, *url;
- fu16_t width, height, delay;
-
- va_start(ap, fr);
- msg = va_arg(ap, char *);
- url = va_arg(ap, char *);
- width = va_arg(ap, unsigned int);
- height = va_arg(ap, unsigned int);
- delay = va_arg(ap, unsigned int);
- va_end(ap);
-
- owl_function_debugmsg("handlepopup: (%dx%x:%d) %s (%s)\n", width, height, delay, msg, url);
-
- return 1;
-}
-
-static int serverpause(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_sendpauseack(sess, fr->conn);
- return 1;
-}
-
-static int migrate(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- aim_conn_t *bosconn;
- char *bosip;
- fu8_t *cookie;
-
- va_start(ap, fr);
- bosip = va_arg(ap, char *);
- cookie = va_arg(ap, fu8_t *);
- va_end(ap);
-
- owl_function_debugmsg("migrate: migration in progress -- new BOS is %s -- disconnecting", bosip);
- aim_conn_kill(sess, &fr->conn);
-
- if (!(bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, bosip))) {
- owl_function_debugmsg("migrate: could not connect to BOS: internal error");
- return 1;
- } else if (bosconn->status & AIM_CONN_STATUS_CONNERR) {
- owl_function_debugmsg("migrate: could not connect to BOS");
- aim_conn_kill(sess, &bosconn);
- return 1;
- }
-
- /* Login will happen all over again. */
- addcb_bos(sess, bosconn);
- /* aim_sendcookie(sess, bosconn, cookie); */ /********/
- return 1;
-}
-
-static int ssirights(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("ssirights: got SSI rights, requesting data\n");
- /* aim_ssi_reqdata(sess, fr->conn, 0, 0x0000); */
- aim_ssi_reqdata(sess);
-
- return(1);
-}
-
-static int ssidata(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- fu8_t fmtver;
- fu16_t itemcount;
- fu32_t stamp;
- struct aim_ssi_item *list;
- /*
- struct aim_ssi_item *curitem;
- struct aim_ssi_item *l;
- */
-
- va_start(ap, fr);
- fmtver = va_arg(ap, unsigned int);
- itemcount = va_arg(ap, unsigned int);
- stamp = va_arg(ap, fu32_t);
- list = va_arg(ap, struct aim_ssi_item *);
- va_end(ap);
-
- owl_function_debugmsg("ssiddata: got SSI data (0x%02x, %d items, %ld)", fmtver, itemcount, stamp);
- /*
- for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
- for (l = list; l; l = l->next) {
- owl_function_debugmsg("\t0x%04x (%s) - 0x%04x/0x%04x", l->type, l->name, l->gid, l->bid);
- }
- }
- */
- aim_ssi_enable(sess);
-
- return 1;
-}
-
-static int ssidatanochange(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("ssidatanochange: server says we have the latest SSI data already");
- /* aim_ssi_enable(sess, fr->conn); */
- aim_ssi_enable(sess);
- return 1;
-}
-
-static int offlinemsg(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- struct aim_icq_offlinemsg *msg;
-
- va_start(ap, fr);
- msg = va_arg(ap, struct aim_icq_offlinemsg *);
- va_end(ap);
-
- if (msg->type == 0x0001) {
- owl_function_debugmsg("offlinemsg: from %ld at %d/%d/%d %02d:%02d : %s", msg->sender, msg->year, msg->month, msg->day, msg->hour, msg->minute, msg->msg);
- } else {
- owl_function_debugmsg("unknown offline message type 0x%04x", msg->type);
- }
- return 1;
-}
-
-static int offlinemsgdone(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- /* Tell the server to delete them. */
- owl_function_debugmsg("offlinemsg done: ");
- aim_icq_ackofflinemsgs(sess);
- return 1;
-}
-
-
-/******************** chat.c **************************/
-
-static int faimtest_chat_join(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- aim_userinfo_t *userinfo;
- int count;
- /* int i; */
-
- va_start(ap, fr);
- count = va_arg(ap, int);
- userinfo = va_arg(ap, aim_userinfo_t *);
- va_end(ap);
-
- owl_function_debugmsg("In faimtest_chat_join");
- /*
- printf("chat: %s: New occupants have joined:\n", aim_chat_getname(fr->conn));
- for (i = 0; i < count; i++)
- printf("chat: %s: \t%s\n", aim_chat_getname(fr->conn), userinfo[i].sn);
- */
- return 1;
-}
-
-static int faimtest_chat_leave(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_userinfo_t *userinfo;
- va_list ap;
- int count;
- /* int i; */
-
-
- va_start(ap, fr);
- count = va_arg(ap, int);
- userinfo = va_arg(ap, aim_userinfo_t *);
- va_end(ap);
-
- /*
- printf("chat: %s: Some occupants have left:\n", aim_chat_getname(fr->conn));
-
- for (i = 0; i < count; i++)
- printf("chat: %s: \t%s\n", aim_chat_getname(fr->conn), userinfo[i].sn);
- */
- return 1;
-}
-
-static int faimtest_chat_infoupdate(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- aim_userinfo_t *userinfo;
- struct aim_chat_roominfo *roominfo;
- char *roomname;
- int usercount;
- char *roomdesc;
- fu16_t flags, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
- fu32_t creationtime;
- const char *croomname;
- /* int i; */
-
- croomname = aim_chat_getname(fr->conn);
-
- va_start(ap, fr);
- roominfo = va_arg(ap, struct aim_chat_roominfo *);
- roomname = va_arg(ap, char *);
- usercount = va_arg(ap, int);
- userinfo = va_arg(ap, aim_userinfo_t *);
- roomdesc = va_arg(ap, char *);
- flags = (fu16_t)va_arg(ap, unsigned int);
- creationtime = va_arg(ap, fu32_t);
- maxmsglen = (fu16_t)va_arg(ap, unsigned int);
- unknown_d2 = (fu16_t)va_arg(ap, unsigned int);
- unknown_d5 = (fu16_t)va_arg(ap, unsigned int);
- maxvisiblemsglen = (fu16_t)va_arg(ap, unsigned int);
- va_end(ap);
-
- owl_function_debugmsg("In faimtest_chat_infoupdate");
- /*
- printf("chat: %s: info update:\n", croomname);
- printf("chat: %s: \tRoominfo: {%04x, %s, %04x}\n", croomname, roominfo->exchange, roominfo->name, roominfo->instance);
- printf("chat: %s: \tRoomname: %s\n", croomname, roomname);
- printf("chat: %s: \tRoomdesc: %s\n", croomname, roomdesc);
- printf("chat: %s: \tOccupants: (%d)\n", croomname, usercount);
-
- for (i = 0; i < usercount; i++)
- printf("chat: %s: \t\t%s\n", croomname, userinfo[i].sn);
-
- owl_function_debugmsg("chat: %s: \tRoom flags: 0x%04x (%s%s%s%s)\n",
- croomname, flags,
- (flags & AIM_CHATROOM_FLAG_EVILABLE) ? "Evilable, " : "",
- (flags & AIM_CHATROOM_FLAG_NAV_ONLY) ? "Nav Only, " : "",
- (flags & AIM_CHATROOM_FLAG_INSTANCING_ALLOWED) ? "Instancing allowed, " : "",
- (flags & AIM_CHATROOM_FLAG_OCCUPANT_PEEK_ALLOWED) ? "Occupant peek allowed, " : "");
- printf("chat: %s: \tCreation time: %lu (time_t)\n", croomname, creationtime);
- printf("chat: %s: \tUnknown_d2: 0x%04x\n", croomname, unknown_d2);
- printf("chat: %s: \tUnknown_d5: 0x%02x\n", croomname, unknown_d5);
- printf("chat: %s: \tMax message length: %d bytes\n", croomname, maxmsglen);
- printf("chat: %s: \tMax visible message length: %d bytes\n", croomname, maxvisiblemsglen);
- */
-
- return(1);
-}
-
-static int faimtest_chat_incomingmsg(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- va_list ap;
- aim_userinfo_t *userinfo;
- char *msg;
- char tmpbuf[1152];
-
- va_start(ap, fr);
- userinfo = va_arg(ap, aim_userinfo_t *);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- owl_function_debugmsg("in faimtest_chat_incomingmsg");
-
- /*
- printf("chat: %s: incoming msg from %s: %s\n", aim_chat_getname(fr->conn), userinfo->sn, msg);
- */
-
- /*
- * Do an echo for testing purposes. But not for ourselves ("oops!")
- */
- if (strcmp(userinfo->sn, sess->sn) != 0) {
- /* sprintf(tmpbuf, "(%s said \"%s\")", userinfo->sn, msg); */
- aim_chat_send_im(sess, fr->conn, 0, tmpbuf, strlen(tmpbuf));
- }
-
- return 1;
-}
-
-static int faimtest_chatnav_info(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- fu16_t type;
- va_list ap;
-
- va_start(ap, fr);
- type = (fu16_t)va_arg(ap, unsigned int);
-
- owl_function_debugmsg("in faimtest_chatnav_info");
-
- if (type == 0x0002) {
- int maxrooms;
- struct aim_chat_exchangeinfo *exchanges;
- int exchangecount;
- /* int i; */
-
- maxrooms = va_arg(ap, int);
- exchangecount = va_arg(ap, int);
- exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
- va_end(ap);
-
- /*
- printf("chat info: Chat Rights:\n");
- printf("chat info: \tMax Concurrent Rooms: %d\n", maxrooms);
- printf("chat info: \tExchange List: (%d total)\n", exchangecount);
- for (i = 0; i < exchangecount; i++) {
- printf("chat info: \t\t%x: %s (%s/%s) (0x%04x = %s%s%s%s)\n",
- exchanges[i].number,
- exchanges[i].name,
- exchanges[i].charset1,
- exchanges[i].lang1,
- exchanges[i].flags,
- (exchanges[i].flags & AIM_CHATROOM_FLAG_EVILABLE) ? "Evilable, " : "",
- (exchanges[i].flags & AIM_CHATROOM_FLAG_NAV_ONLY) ? "Nav Only, " : "",
- (exchanges[i].flags & AIM_CHATROOM_FLAG_INSTANCING_ALLOWED) ? "Instancing allowed, " : "",
- (exchanges[i].flags & AIM_CHATROOM_FLAG_OCCUPANT_PEEK_ALLOWED) ? "Occupant peek allowed, " : "");
- }
- */
- } else if (type == 0x0008) {
- char *fqcn, *name, *ck;
- fu16_t instance, flags, maxmsglen, maxoccupancy, unknown, exchange;
- fu8_t createperms;
- fu32_t createtime;
-
- fqcn = va_arg(ap, char *);
- instance = (fu16_t)va_arg(ap, unsigned int);
- exchange = (fu16_t)va_arg(ap, unsigned int);
- flags = (fu16_t)va_arg(ap, unsigned int);
- createtime = va_arg(ap, fu32_t);
- maxmsglen = (fu16_t)va_arg(ap, unsigned int);
- maxoccupancy = (fu16_t)va_arg(ap, unsigned int);
- createperms = (fu8_t)va_arg(ap, unsigned int);
- unknown = (fu16_t)va_arg(ap, unsigned int);
- name = va_arg(ap, char *);
- ck = va_arg(ap, char *);
- va_end(ap);
-
- /* printf("received room create reply for %s/0x%04x\n", fqcn, exchange); */
-
- } else {
- va_end(ap);
- /* printf("chatnav info: unknown type (%04x)\n", type); */
- }
-
- return 1;
-}
-
-static int conninitdone_chat(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("faimtest_conninitdone_chat:");
-
- aim_conn_addhandler(sess, fr->conn, 0x000e, 0x0001, faimtest_parse_genericerr, 0);
- aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN, faimtest_chat_join, 0);
- aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE, faimtest_chat_leave, 0);
- aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, faimtest_chat_infoupdate, 0);
- aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, faimtest_chat_incomingmsg, 0);
-
- aim_clientready(sess, fr->conn);
-
- owl_function_debugmsg("Chat ready");
-
- /*
- chatcon = find_oscar_chat_by_conn(gc, fr->conn);
- chatcon->id = id;
- chatcon->cnv = serv_got_joined_chat(gc, id++, chatcon->show);
- */
- return(1);
-}
-
-static int conninitdone_chatnav(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- owl_function_debugmsg("faimtest_conninitdone_chatnav:");
-
- /* aim_conn_addhandler(sess, fr->conn, 0x000d, 0x0001, gaim_parse_genericerr, 0); */
- /* aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CTN, AIM_CB_CTN_INFO, gaim_chatnav_info, 0); */
-
- aim_clientready(sess, fr->conn);
-
- aim_chatnav_reqrights(sess, fr->conn);
-
- return(1);
-}
-
-void chatnav_redirect(aim_session_t *sess, struct aim_redirect_data *redir)
-{
- aim_conn_t *tstconn;
-
- owl_function_debugmsg("in faimtest_chatnav_redirect");
-
- tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHATNAV, redir->ip);
- if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
- /* printf("unable to connect to chat(nav) server\n"); */
- if (tstconn)
- aim_conn_kill(sess, &tstconn);
- return;
- }
-
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
- aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
- /* printf("chatnav: connected\n"); */
- return;
-}
-
-/* XXX this needs instance too */
-void chat_redirect(aim_session_t *sess, struct aim_redirect_data *redir)
-{
- aim_conn_t *tstconn;
-
- owl_function_debugmsg("in chat_redirect");
-
- tstconn = aim_newconn(sess, AIM_CONN_TYPE_CHAT, redir->ip);
- if (!tstconn || (tstconn->status & AIM_CONN_STATUS_RESOLVERR)) {
- /* printf("unable to connect to chat server\n"); */
- if (tstconn) aim_conn_kill(sess, &tstconn);
- return;
- }
- /* printf("chat: connected to %s instance %d on exchange %d\n", redir->chat.room, redir->chat.instance, redir->chat.exchange); */
-
- /*
- * We must do this to attach the stored name to the connection!
- */
- aim_chat_attachname(tstconn, redir->chat.exchange, redir->chat.room, redir->chat.instance);
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNCOMPLETE, faimtest_conncomplete, 0);
- aim_conn_addhandler(sess, tstconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNINITDONE, conninitdone_chat, 0);
- aim_sendcookie(sess, tstconn, redir->cookielen, redir->cookie);
- return;
-}
-
-
-/**********************************************************************************/
-
-#if 0
-static int faimtest_ssi_rerequestdata(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- aim_ssi_reqdata(sess);
- return(0);
-}
-
-static int faimtest_ssi_parseerr(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- /* GaimConnection *gc = sess->aux_data; */
- /* OscarData *od = gc->proto_data; */
- va_list ap;
- fu16_t reason;
-
- va_start(ap, fr);
- reason = (fu16_t)va_arg(ap, unsigned int);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_ssi_parseerr: ssi: SNAC error %hu", reason);
-
- if (reason == 0x0005) {
- owl_function_error("faimtest_ssi_parseerr: unable to retrieve buddy list");
- }
-
- /* Activate SSI */
- /* Sending the enable causes other people to be able to see you, and you to see them */
- /* Make sure your privacy setting/invisibility is set how you want it before this! */
- owl_function_debugmsg("faimtest_ssi_parseerr: ssi: activating server-stored buddy list");
- aim_ssi_enable(sess);
-
- return(1);
-}
-
-static int faimtest_ssi_parserights(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- /* GaimConnection *gc = sess->aux_data; */
- /* OscarData *od = (OscarData *)gc->proto_data; */
- int numtypes, i;
- fu16_t *maxitems;
- va_list ap;
-
- va_start(ap, fr);
- numtypes = va_arg(ap, int);
- maxitems = va_arg(ap, fu16_t *);
- va_end(ap);
-
- owl_function_debugmsg("faimtest_ssi_parserights: ");
- for (i=0; i<numtypes; i++) {
- owl_function_debugmsg(" max type 0x%04x=%hd,", i, maxitems[i]);
- }
-
- /*
- if (numtypes >= 0) od->rights.maxbuddies = maxitems[0];
- if (numtypes >= 1) od->rights.maxgroups = maxitems[1];
- if (numtypes >= 2) od->rights.maxpermits = maxitems[2];
- if (numtypes >= 3) od->rights.maxdenies = maxitems[3];
- */
-
- return(1);
-}
-
-static int faimtest_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- /* GaimConnection *gc = sess->aux_data; */
- /* GaimAccount *account = gaim_connection_get_account(gc); */
- /* OscarData *od = (OscarData *)gc->proto_data; */
- struct aim_ssi_item *curitem;
- int tmp;
- int export = FALSE;
- /* XXX - use these?
- va_list ap;
-
- va_start(ap, fr);
- fmtver = (fu16_t)va_arg(ap, int);
- numitems = (fu16_t)va_arg(ap, int);
- items = va_arg(ap, struct aim_ssi_item);
- timestamp = va_arg(ap, fu32_t);
- va_end(ap); */
-
- owl_function_debugmsg("faimtest_ssi_parselist: syncing local list and server list");
-
- /* Clean the buddy list */
- aim_ssi_cleanlist(sess);
-
- /* Add from server list to local list */
- for (curitem=sess->ssi.local; curitem; curitem=curitem->next) {
- if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
- switch (curitem->type) {
- case 0x0000: { /* Buddy */
- if (curitem->name) {
- char *gname = aim_ssi_itemlist_findparentname(sess->ssi.local, curitem->name);
- char *gname_utf8 = gname ? gaim_utf8_try_convert(gname) : NULL;
- char *alias = aim_ssi_getalias(sess->ssi.local, gname, curitem->name);
- char *alias_utf8 = alias ? gaim_utf8_try_convert(alias) : NULL;
- GaimBuddy *buddy = gaim_find_buddy(gc->account, curitem->name);
- /* Should gname be freed here? -- elb */
- /* Not with the current code, but that might be cleaner -- med */
- free(alias);
- if (buddy) {
- /* Get server stored alias */
- if (alias_utf8) {
- g_free(buddy->alias);
- buddy->alias = g_strdup(alias_utf8);
- }
- } else {
- GaimGroup *g;
- buddy = gaim_buddy_new(gc->account, curitem->name, alias_utf8);
-
- if (!(g = gaim_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
- g = gaim_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
- gaim_blist_add_group(g, NULL);
- }
-
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
- gaim_blist_add_buddy(buddy, NULL, g, NULL);
- export = TRUE;
- }
- g_free(gname_utf8);
- g_free(alias_utf8);
- }
- } break;
-
- case 0x0001: { /* Group */
- /* Shouldn't add empty groups */
- } break;
-
- case 0x0002: { /* Permit buddy */
- if (curitem->name) {
- /* if (!find_permdeny_by_name(gc->permit, curitem->name)) { AAA */
- GSList *list;
- for (list=account->permit; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
- if (!list) {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding permit buddy %s to local list\n", curitem->name);
- gaim_privacy_permit_add(account, curitem->name, TRUE);
- export = TRUE;
- }
- }
- } break;
-
- case 0x0003: { /* Deny buddy */
- if (curitem->name) {
- GSList *list;
- for (list=account->deny; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
- if (!list) {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding deny buddy %s to local list\n", curitem->name);
- gaim_privacy_deny_add(account, curitem->name, TRUE);
- export = TRUE;
- }
- }
- } break;
-
- case 0x0004: { /* Permit/deny setting */
- if (curitem->data) {
- fu8_t permdeny;
- if ((permdeny = aim_ssi_getpermdeny(sess->ssi.local)) && (permdeny != account->perm_deny)) {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: changing permdeny from %d to %hhu\n", account->perm_deny, permdeny);
- account->perm_deny = permdeny;
- if (od->icq && account->perm_deny == 0x03) {
- serv_set_away(gc, "Invisible", "");
- }
- export = TRUE;
- }
- }
- } break;
-
- case 0x0005: { /* Presence setting */
- /* We don't want to change Gaim's setting because it applies to all accounts */
- } break;
- } /* End of switch on curitem->type */
- } /* End of for loop */
-
- /* If changes were made, then flush buddy list to file */
- if (export)
- gaim_blist_save();
-
- { /* Add from local list to server list */
- GaimBlistNode *gnode, *cnode, *bnode;
- GaimGroup *group;
- GaimBuddy *buddy;
- GaimBuddyList *blist;
- GSList *cur;
-
- /* Buddies */
- if ((blist = gaim_get_blist()))
- for (gnode = blist->root; gnode; gnode = gnode->next) {
- if(!GAIM_BLIST_NODE_IS_GROUP(gnode))
- continue;
- group = (GaimGroup *)gnode;
- for (cnode = gnode->child; cnode; cnode = cnode->next) {
- if(!GAIM_BLIST_NODE_IS_CONTACT(cnode))
- continue;
- for (bnode = cnode->child; bnode; bnode = bnode->next) {
- if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
- continue;
- buddy = (GaimBuddy *)bnode;
- if (buddy->account == gc->account) {
- const char *servernick = gaim_buddy_get_setting(buddy, "servernick");
- if (servernick)
- serv_got_alias(gc, buddy->name, servernick);
-
- if (aim_ssi_itemlist_exists(sess->ssi.local, buddy->name)) {
- /* Store local alias on server */
- char *alias = aim_ssi_getalias(sess->ssi.local, group->name, buddy->name);
- if (!alias && buddy->alias && strlen(buddy->alias))
- aim_ssi_aliasbuddy(sess, group->name, buddy->name, buddy->alias);
- free(alias);
- } else {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding buddy %s from local list to server list\n", buddy->name);
- aim_ssi_addbuddy(sess, buddy->name, group->name, gaim_get_buddy_alias_only(buddy), NULL, NULL, 0);
- }
- }
- }
- }
- }
-
- /* Permit list */
- if (gc->account->permit) {
- for (cur=gc->account->permit; cur; cur=cur->next)
- if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_PERMIT)) {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding permit %s from local list to server list\n", (char *)cur->data);
- aim_ssi_addpermit(sess, cur->data);
- }
- }
-
- /* Deny list */
- if (gc->account->deny) {
- for (cur=gc->account->deny; cur; cur=cur->next)
- if (!aim_ssi_itemlist_finditem(sess->ssi.local, NULL, cur->data, AIM_SSI_TYPE_DENY)) {
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: adding deny %s from local list to server list\n", (char *)cur->data);
- aim_ssi_adddeny(sess, cur->data);
- }
- }
- /* Presence settings (idle time visibility) */
- if ((tmp = aim_ssi_getpresence(sess->ssi.local)) != 0xFFFFFFFF)
- if (!(tmp & 0x400))
- aim_ssi_setpresence(sess, tmp | 0x400);
- } /* end adding buddies from local list to server list */
-
- /* Set our ICQ status */
- if (od->icq && !gc->away) {
- aim_setextstatus(sess, AIM_ICQ_STATE_NORMAL);
- }
-
- /* Activate SSI */
- /* Sending the enable causes other people to be able to see you, and you to see them */
- /* Make sure your privacy setting/invisibility is set how you want it before this! */
- gaim_debug(GAIM_DEBUG_INFO, "oscar", "ssi: activating server-stored buddy list\n");
- aim_ssi_enable(sess);
-
- return 1;
-}
-
-static int gaim_ssi_parseack(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- GaimConnection *gc = sess->aux_data;
- va_list ap;
- struct aim_ssi_tmp *retval;
-
- va_start(ap, fr);
- retval = va_arg(ap, struct aim_ssi_tmp *);
- va_end(ap);
-
- while (retval) {
- gaim_debug(GAIM_DEBUG_MISC, "oscar",
- "ssi: status is 0x%04hx for a 0x%04hx action with name %s\n", retval->ack, retval->action, retval->item ? (retval->item->name ? retval->item->name : "no name") : "no item");
-
- if (retval->ack != 0xffff)
- switch (retval->ack) {
- case 0x0000: { /* added successfully */
- } break;
-
- case 0x000c: { /* you are over the limit, the cheat is to the limit, come on fhqwhgads */
- gchar *buf;
- buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)")));
- gaim_notify_error(gc, NULL, _("Unable To Add"), buf);
- g_free(buf);
- }
-
- case 0x000e: { /* buddy requires authorization */
- if ((retval->action == AIM_CB_SSI_ADD) && (retval->name))
- gaim_auth_sendrequest(gc, retval->name);
- } break;
-
- default: { /* La la la */
- gchar *buf;
- gaim_debug(GAIM_DEBUG_ERROR, "oscar", "ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack);
- buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."), (retval->name ? retval->name : _("(no name)")));
- gaim_notify_error(gc, NULL, _("Unable To Add"), buf);
- g_free(buf);
- /* XXX - Should remove buddy from local list */
- } break;
- }
-
- retval = retval->next;
- }
-
- return 1;
-}
-
-static int gaim_ssi_authgiven(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- GaimConnection *gc = sess->aux_data;
- va_list ap;
- char *sn, *msg;
- gchar *dialog_msg, *nombre;
- struct name_data *data;
- GaimBuddy *buddy;
-
- va_start(ap, fr);
- sn = va_arg(ap, char *);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: %s has given you permission to add him to your buddy list\n", sn);
-
- buddy = gaim_find_buddy(gc->account, sn);
- if (buddy && (gaim_get_buddy_alias_only(buddy)))
- nombre = g_strdup_printf("%s (%s)", sn, gaim_get_buddy_alias_only(buddy));
- else
- nombre = g_strdup(sn);
-
- dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list. Do you want to add them?"), nombre);
- data = g_new(struct name_data, 1);
- data->gc = gc;
- data->name = g_strdup(sn);
- data->nick = NULL;
-
- gaim_request_yes_no(gc, NULL, _("Authorization Given"), dialog_msg,
- 0, data,
- G_CALLBACK(gaim_icq_buddyadd),
- G_CALLBACK(oscar_free_name_data));
-
- g_free(dialog_msg);
- g_free(nombre);
-
- return 1;
-}
-
-static int gaim_ssi_authrequest(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- GaimConnection *gc = sess->aux_data;
- va_list ap;
- char *sn, *msg;
- gchar *dialog_msg, *nombre;
- struct name_data *data;
- GaimBuddy *buddy;
-
- va_start(ap, fr);
- sn = va_arg(ap, char *);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: received authorization request from %s\n", sn);
-
- buddy = gaim_find_buddy(gc->account, sn);
- if (buddy && (gaim_get_buddy_alias_only(buddy)))
- nombre = g_strdup_printf("%s (%s)", sn, gaim_get_buddy_alias_only(buddy));
- else
- nombre = g_strdup(sn);
-
- dialog_msg = g_strdup_printf(_("The user %s wants to add you to their buddy list for the following reason:\n%s"), nombre, msg ? msg : _("No reason given."));
- data = g_new(struct name_data, 1);
- data->gc = gc;
- data->name = g_strdup(sn);
- data->nick = NULL;
-
- gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg,
- 0, data, 2,
- _("Authorize"), G_CALLBACK(gaim_auth_grant),
- _("Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt));
-
- g_free(dialog_msg);
- g_free(nombre);
-
- return 1;
-}
-
-static int gaim_ssi_authreply(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- GaimConnection *gc = sess->aux_data;
- va_list ap;
- char *sn, *msg;
- gchar *dialog_msg, *nombre;
- fu8_t reply;
- GaimBuddy *buddy;
-
- va_start(ap, fr);
- sn = va_arg(ap, char *);
- reply = (fu8_t)va_arg(ap, int);
- msg = va_arg(ap, char *);
- va_end(ap);
-
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: received authorization reply from %s. Reply is 0x%04hhx\n", sn, reply);
-
- buddy = gaim_find_buddy(gc->account, sn);
- if (buddy && (gaim_get_buddy_alias_only(buddy)))
- nombre = g_strdup_printf("%s (%s)", sn, gaim_get_buddy_alias_only(buddy));
- else
- nombre = g_strdup(sn);
-
- if (reply) {
- /* Granted */
- dialog_msg = g_strdup_printf(_("The user %s has granted your request to add them to your buddy list."), nombre);
- gaim_notify_info(gc, NULL, _("Authorization Granted"), dialog_msg);
- } else {
- /* Denied */
- dialog_msg = g_strdup_printf(_("The user %s has denied your request to add them to your buddy list for the following reason:\n%s"), nombre, msg ? msg : _("No reason given."));
- gaim_notify_info(gc, NULL, _("Authorization Denied"), dialog_msg);
- }
- g_free(dialog_msg);
- g_free(nombre);
-
- return 1;
-}
-
-static int gaim_ssi_gotadded(aim_session_t *sess, aim_frame_t *fr, ...)
-{
- GaimConnection *gc = sess->aux_data;
- va_list ap;
- char *sn;
- GaimBuddy *buddy;
-
- va_start(ap, fr);
- sn = va_arg(ap, char *);
- va_end(ap);
-
- buddy = gaim_find_buddy(gc->account, sn);
- gaim_debug(GAIM_DEBUG_INFO, "oscar",
- "ssi: %s added you to their buddy list\n", sn);
- gaim_account_notify_added(gc->account, NULL, sn, (buddy ? gaim_get_buddy_alias_only(buddy) : NULL), NULL);
-
- return 1;
-}
-#endif
Deleted: branches/barnowl_perlaim/owl/buddy.c
===================================================================
--- branches/barnowl_perlaim/owl/buddy.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/buddy.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -1,71 +0,0 @@
-#include "owl.h"
-
-static const char fileIdent[] = "$Id$";
-
-void owl_buddy_create(owl_buddy *b, int proto, char *name)
-{
- b->proto=proto;
- b->name=owl_strdup(name);
- b->idlesince=0;
-}
-
-char *owl_buddy_get_name(owl_buddy *b)
-{
- if (b->name) return(b->name);
- return("");
-}
-
-int owl_buddy_is_idle(owl_buddy *b)
-{
- if (b->isidle) return(1);
- return(0);
-}
-
-void owl_buddy_set_idle(owl_buddy *b)
-{
- b->isidle=1;
-}
-
-void owl_buddy_set_unidle(owl_buddy *b)
-{
- b->isidle=0;
-}
-
-int owl_buddy_get_proto(owl_buddy *b)
-{
- return(b->proto);
-}
-
-int owl_buddy_is_proto_aim(owl_buddy *b)
-{
- if (b->proto==OWL_PROTOCOL_AIM) return(1);
- return(0);
-}
-
-/* Set the buddy to have been idle since 'diff' minutes ago
- */
-void owl_buddy_set_idle_since(owl_buddy *b, int diff)
-{
- time_t now;
-
- now=time(NULL);
- b->idlesince=now-(diff*60);
-}
-
-/* return the number of minutes the buddy has been idle
- */
-int owl_buddy_get_idle_time(owl_buddy *b)
-{
- time_t now;
-
- if (b->isidle) {
- now=time(NULL);
- return((now - b->idlesince)/60);
- }
- return(0);
-}
-
-void owl_buddy_free(owl_buddy *b)
-{
- if (b->name) owl_free(b->name);
-}
Deleted: branches/barnowl_perlaim/owl/buddylist.c
===================================================================
--- branches/barnowl_perlaim/owl/buddylist.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/buddylist.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -1,142 +0,0 @@
-#include "owl.h"
-
-static const char fileIdent[] = "$Id$";
-
-void owl_buddylist_init(owl_buddylist *bl)
-{
- owl_list_create(&(bl->buddies));
-}
-
-/* add a (logged-in) AIM buddy to the buddy list
- */
-void owl_buddylist_add_aim_buddy(owl_buddylist *bl, char *screenname)
-{
- owl_buddy *b;
- b=owl_malloc(sizeof(owl_buddy));
-
- owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
- owl_list_append_element(&(bl->buddies), b);
-}
-
-/* remove an AIM buddy from the buddy list
- */
-int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, char *name)
-{
- int i, j;
- owl_buddy *b;
-
- j=owl_list_get_size(&(bl->buddies));
- for (i=0; i<j; i++) {
- b=owl_list_get_element(&(bl->buddies), i);
- if (!strcasecmp(name, owl_buddy_get_name(b)) && owl_buddy_is_proto_aim(b)) {
- owl_list_remove_element(&(bl->buddies), i);
- owl_buddy_free(b);
- return(0);
- }
- }
- return(1);
-}
-
-/* Deal with an "oncoming" message. This means recognizing the user
- * has logged in, and displaying a message if they were not already
- * logged in.
- */
-void owl_buddylist_oncoming(owl_buddylist *bl, char *screenname)
-{
- owl_message *m;
-
- if (!owl_buddylist_is_aim_buddy_loggedin(bl, screenname)) {
-
- owl_buddylist_add_aim_buddy(bl, screenname);
-
- /* are we ingoring login messages for a while? */
- if (!owl_timer_is_expired(owl_global_get_aim_login_timer(&g))) return;
-
- /* if not, create the login message */
- m=owl_malloc(sizeof(owl_message));
- owl_message_create_aim(m,
- screenname,
- owl_global_get_aim_screenname(&g),
- "",
- OWL_MESSAGE_DIRECTION_IN,
- 1);
- owl_global_messagequeue_addmsg(&g, m);
- }
-}
-
-/* Deal with an "offgoing" message. This means recognizing the user
- * has logged out, and sending a message if they were logged in.
- */
-void owl_buddylist_offgoing(owl_buddylist *bl, char *screenname)
-{
- owl_message *m;
-
- if (owl_buddylist_is_aim_buddy_loggedin(bl, screenname)) {
- m=owl_malloc(sizeof(owl_message));
- owl_message_create_aim(m,
- screenname,
- owl_global_get_aim_screenname(&g),
- "",
- OWL_MESSAGE_DIRECTION_IN,
- -1);
- owl_global_messagequeue_addmsg(&g, m);
- }
-
- owl_buddylist_remove_aim_buddy(bl, screenname);
-}
-
-/* return the number of logged in buddies */
-int owl_buddylist_get_size(owl_buddylist *bl)
-{
- return(owl_list_get_size(&(bl->buddies)));
-}
-
-/* return the buddy with index N. If out of range, return NULL
- */
-owl_buddy *owl_buddylist_get_buddy_n(owl_buddylist *bl, int index)
-{
- if (index<0) return(NULL);
- if (index>(owl_buddylist_get_size(bl)-1)) return(NULL);
-
- return(owl_list_get_element(&(bl->buddies), index));
-}
-
-/* return the AIM buddy with screenname 'name'. If
- * no such buddy is logged in, return NULL.
- */
-owl_buddy *owl_buddylist_get_aim_buddy(owl_buddylist *bl, char *name)
-{
- int i, j;
- owl_buddy *b;
-
- j=owl_list_get_size(&(bl->buddies));
- for (i=0; i<j; i++) {
- b=owl_list_get_element(&(bl->buddies), i);
- if (!strcasecmp(name, owl_buddy_get_name(b))) return(b);
- }
- return(NULL);
-}
-
-/* return 1 if the buddy 'screenname' is logged in,
- * otherwise return 0
- */
-int owl_buddylist_is_aim_buddy_loggedin(owl_buddylist *bl, char *screenname)
-{
- owl_buddy *b;
-
- b=owl_buddylist_get_aim_buddy(bl, screenname);
- if (b==NULL) return(0);
- return(1);
-}
-
-/* remove all buddies from the list */
-void owl_buddylist_clear(owl_buddylist *bl)
-{
- owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
- owl_list_create(&(bl->buddies));
-}
-
-void owl_buddylist_free(owl_buddylist *bl)
-{
- owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
-}
Modified: branches/barnowl_perlaim/owl/commands.c
===================================================================
--- branches/barnowl_perlaim/owl/commands.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/commands.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -121,13 +121,6 @@
"-O opcode\n"
" Send to the specified opcode\n"),
- OWLCMD_ARGS("aimwrite", owl_command_aimwrite, OWL_CTX_INTERACTIVE,
- "send an AIM message",
- "aimwrite <user> [-m <message...>]",
- "Send an aim message to a user.\n\n"
- "The following options are available:\n\n"
- "-m Specifies a message to send without prompting.\n"),
-
OWLCMD_ARGS("loopwrite", owl_command_loopwrite, OWL_CTX_INTERACTIVE,
"send a loopback message",
"loopwrite",
@@ -231,26 +224,16 @@
"source <filename>",
"Execute the owl commands in <filename>.\n"),
- OWLCMD_ARGS("aim", owl_command_aim, OWL_CTX_INTERACTIVE,
- "AIM specific commands",
- "aim search <email>",
- ""),
-
OWLCMD_ARGS("addbuddy", owl_command_addbuddy, OWL_CTX_INTERACTIVE,
"add a buddy to a buddylist",
"addbuddy <protocol> <screenname>",
- "Add the named buddy to your buddylist. <protocol> can be aim or zephyr\n"),
+ "Add the named buddy to your buddylist. <protocol> can be zephyr\n"),
OWLCMD_ARGS("delbuddy", owl_command_delbuddy, OWL_CTX_INTERACTIVE,
"delete a buddy from a buddylist",
"delbuddy <protocol> <screenname>",
"Delete the named buddy from your buddylist. <protocol> can be aim or zephyr\n"),
- OWLCMD_ARGS("join", owl_command_join, OWL_CTX_INTERACTIVE,
- "join a chat group",
- "join aim <groupname> [exchange]",
- "Join the AIM chatroom with 'groupname'.\n"),
-
OWLCMD_ARGS("smartzpunt", owl_command_smartzpunt, OWL_CTX_INTERACTIVE,
"creates a zpunt based on the current message",
"smartzpunt [-i | --instance]",
@@ -306,11 +289,6 @@
"znol [-f file]",
"Print a znol-style listing of users logged in"),
- OWLCMD_ARGS("alist", owl_command_alist, OWL_CTX_INTERACTIVE,
- "List AIM users logged in",
- "alist",
- "Print a listing of AIM users logged in"),
-
OWLCMD_ARGS("blist", owl_command_blist, OWL_CTX_INTERACTIVE,
"List all buddies logged in",
"blist",
@@ -466,14 +444,6 @@
"specified turn on zaway with that message, otherwise\n"
"use the default.\n"),
- OWLCMD_ARGS("aaway", owl_command_aaway, OWL_CTX_INTERACTIVE,
- "Set, enable or disable AIM away message",
- "aaway [ on | off | toggle ]\n"
- "aaway <message>",
- "Turn on or off the AIM away message. If 'message' is\n"
- "specified turn on aaway with that message, otherwise\n"
- "use the default.\n"),
-
OWLCMD_ARGS("away", owl_command_away, OWL_CTX_INTERACTIVE,
"Set, enable or disable both AIM and zephyr away messages",
"away [ on | off | toggle ]\n"
@@ -529,7 +499,7 @@
" realm - zephyr realm\n"
" body - message body\n"
" hostname - hostname of sending host\n"
- " type - message type (zephyr, aim, admin)\n"
+ " type - message type (zephyr, admin...)\n"
" direction - either 'in' 'out' or 'none'\n"
" login - either 'login' 'logout' or 'none'\n"
"Also you may match on the validity of another filter:\n"
@@ -733,16 +703,6 @@
"search commands, but does not move the cursor. With\n"
"no argument, it makes search inactive."),
- OWLCMD_ARGS("aimlogin", owl_command_aimlogin, OWL_CTX_ANY,
- "login to an AIM account",
- "aimlogin <screenname> [<password>]\n",
- ""),
-
- OWLCMD_ARGS("aimlogout", owl_command_aimlogout, OWL_CTX_ANY,
- "logout from AIM",
- "aimlogout\n",
- ""),
-
OWLCMD_ARGS("error", owl_command_error, OWL_CTX_ANY,
"Display an error message",
"error <message>",
@@ -1014,12 +974,6 @@
return(NULL);
}
-char *owl_command_alist()
-{
- owl_function_buddylist(1, 0, NULL);
- return(NULL);
-}
-
char *owl_command_blist()
{
owl_function_buddylist(1, 1, NULL);
@@ -1045,26 +999,6 @@
owl_function_makemsg(buff);
}
-char *owl_command_aim(int argc, char **argv, char *buff)
-{
- if (argc<2) {
- owl_function_makemsg("not enough arguments to aim command");
- return(NULL);
- }
-
- if (!strcmp(argv[1], "search")) {
- if (argc!=3) {
- owl_function_makemsg("not enough arguments to aim search command");
- return(NULL);
- }
- owl_aim_search(argv[2]);
- } else {
- owl_function_makemsg("unknown subcommand '%s' for aim command", argv[1]);
- return(NULL);
- }
- return(NULL);
-}
-
char *owl_command_addbuddy(int argc, char **argv, char *buff)
{
if (argc!=3) {
@@ -1072,22 +1006,12 @@
return(NULL);
}
- if (!strcasecmp(argv[1], "aim")) {
- if (!owl_global_is_aimloggedin(&g)) {
- owl_function_makemsg("addbuddy: You must be logged into aim to use this command.");
- return(NULL);
- }
- /*
- owl_function_makemsg("This function is not yet operational. Stay tuned.");
- return(NULL);
- */
- owl_aim_addbuddy(argv[2]);
- owl_function_makemsg("%s added as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g));
- } else if (!strcasecmp(argv[1], "zephyr")) {
+ /* TODO add a hook for perl modules */
+ if (!strcasecmp(argv[1], "zephyr")) {
owl_zephyr_addbuddy(argv[2]);
owl_function_makemsg("%s added as zephyr buddy", argv[2]);
} else {
- owl_function_makemsg("addbuddy: currently the only supported protocols are 'zephyr' and 'aim'");
+ owl_function_makemsg("addbuddy: currently the only supported protocol is 'zephyr'");
}
return(NULL);
@@ -1100,47 +1024,17 @@
return(NULL);
}
- if (!strcasecmp(argv[1], "aim")) {
- if (!owl_global_is_aimloggedin(&g)) {
- owl_function_makemsg("delbuddy: You must be logged into aim to use this command.");
- return(NULL);
- }
- owl_aim_delbuddy(argv[2]);
- owl_function_makemsg("%s deleted as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g));
- } else if (!strcasecmp(argv[1], "zephyr")) {
+ /* TODO add a hook for perl modules */
+ if (!strcasecmp(argv[1], "zephyr")) {
owl_zephyr_delbuddy(argv[2]);
owl_function_makemsg("%s deleted as zephyr buddy", argv[2]);
} else {
- owl_function_makemsg("delbuddy: currently the only supported protocols are 'zephyr' and 'aim'");
+ owl_function_makemsg("delbuddy: currently the only supported protocol is 'zephyr'");
}
return(NULL);
}
-char *owl_command_join(int argc, char **argv, char *buff)
-{
- if (argc!=3 && argc!=4) {
- owl_function_makemsg("usage: join <protocol> <buddyname> [exchange]");
- return(NULL);
- }
-
- if (!strcasecmp(argv[1], "aim")) {
- if (!owl_global_is_aimloggedin(&g)) {
- owl_function_makemsg("join aim: You must be logged into aim to use this command.");
- return(NULL);
- }
- if (argc==3) {
- owl_aim_chat_join(argv[2], 4);
- } else {
- owl_aim_chat_join(argv[2], atoi(argv[3]));
- }
- /* owl_function_makemsg("%s deleted as AIM buddy for %s", argv[2], owl_global_get_aim_screenname(&g)); */
- } else {
- owl_function_makemsg("join: currently the only supported protocol is 'aim'");
- }
- return(NULL);
-}
-
char *owl_command_startup(int argc, char **argv, char *buff)
{
char *ptr;
@@ -1420,46 +1314,17 @@
}
-char *owl_command_aaway(int argc, char **argv, char *buff)
-{
- if ((argc==1) ||
- ((argc==2) && !strcmp(argv[1], "on"))) {
- owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
- owl_function_aaway_on();
- return NULL;
- }
-
- if (argc==2 && !strcmp(argv[1], "off")) {
- owl_function_aaway_off();
- return NULL;
- }
-
- if (argc==2 && !strcmp(argv[1], "toggle")) {
- owl_function_aaway_toggle();
- return NULL;
- }
-
- buff = skiptokens(buff, 1);
- owl_global_set_aaway_msg(&g, buff);
- owl_function_aaway_on();
- return NULL;
-}
-
-
char *owl_command_away(int argc, char **argv, char *buff)
{
+ /* TODO add a hook for perl modules */
if ((argc==1) ||
((argc==2) && !strcmp(argv[1], "on"))) {
- owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
owl_global_set_zaway_msg(&g, owl_global_get_zaway_msg_default(&g));
- owl_function_aaway_on();
owl_function_zaway_on();
- owl_function_makemsg("Away messages set.", owl_global_get_aaway_msg_default(&g));
return NULL;
}
if (argc==2 && !strcmp(argv[1], "off")) {
- owl_function_aaway_off();
owl_function_zaway_off();
return NULL;
}
@@ -1468,22 +1333,18 @@
/* if either one is on, turn it off, otherwise toggle both (turn
* them both on)
*/
- if (!owl_global_is_zaway(&g) && !owl_global_is_aaway(&g)) {
- owl_function_aaway_toggle();
+ if (!owl_global_is_zaway(&g) /* && !owl_global_is_aaway(&g) */) {
owl_function_zaway_toggle();
owl_function_makemsg("Away messages set.");
} else {
if (owl_global_is_zaway(&g)) owl_function_zaway_toggle();
- if (owl_global_is_aaway(&g)) owl_function_aaway_toggle();
owl_function_makemsg("Away messages off.");
}
return NULL;
}
buff = skiptokens(buff, 1);
- owl_global_set_aaway_msg(&g, buff);
owl_global_set_zaway_msg(&g, buff);
- owl_function_aaway_on();
owl_function_zaway_on();
owl_function_makemsg("Away messages set.");
return NULL;
@@ -1859,85 +1720,6 @@
return(NULL);
}
-char *owl_command_aimwrite(int argc, char **argv, char *buff)
-{
- char *newbuff, *recip, **myargv;
- int i, j, myargc;
- owl_message *m;
-
- if (!owl_global_is_aimloggedin(&g)) {
- owl_function_makemsg("You are not logged in to AIM.");
- return(NULL);
- }
-
- if (argc < 2) {
- owl_function_makemsg("Not enough arguments to the aimwrite command.");
- return(NULL);
- }
-
- myargv=argv;
- if (argc<0) {
- owl_function_error("Unbalanced quotes in aimwrite");
- return(NULL);
- }
- myargc=argc;
- if (myargc && *(myargv[0])!='-') {
- myargc--;
- myargv++;
- }
- while (myargc) {
- if (!strcmp(myargv[0], "-m")) {
- if (myargc<2) {
- break;
- }
-
- /* Once we have -m, gobble up everything else on the line */
- myargv++;
- myargc--;
- newbuff=owl_malloc(1);
- newbuff=owl_strdup("");
- while (myargc) {
- newbuff=realloc(newbuff, strlen(newbuff)+strlen(myargv[0])+5);
- strcat(newbuff, myargv[0]);
- strcat(newbuff, " ");
- myargc--;
- myargv++;
- }
- newbuff[strlen(newbuff)-1]='\0'; /* remove last space */
-
- recip=owl_malloc(strlen(argv[0])+5);
- sprintf(recip, "%s ", argv[1]);
- owl_aim_send_im(recip, newbuff);
- m=owl_function_make_outgoing_aim(newbuff, recip);
- if (m) {
- owl_global_messagequeue_addmsg(&g, m);
- } else {
- owl_function_error("Could not create outgoing AIM message");
- }
-
- owl_free(recip);
- owl_free(newbuff);
- return(NULL);
- } else {
- /* we don't care */
- myargv++;
- myargc--;
- }
- }
-
- /* squish arguments together to make one screenname w/o spaces for now */
- newbuff=owl_malloc(strlen(buff)+5);
- sprintf(newbuff, "%s ", argv[0]);
- j=argc-1;
- for (i=0; i<j; i++) {
- strcat(newbuff, argv[i+1]);
- }
-
- owl_function_aimwrite_setup(newbuff);
- owl_free(newbuff);
- return(NULL);
-}
-
char *owl_command_loopwrite(int argc, char **argv, char *buff)
{
owl_function_loopwrite_setup();
@@ -2498,36 +2280,6 @@
return(NULL);
}
-char *owl_command_aimlogin(int argc, char **argv, char *buff)
-{
- if ((argc<2) || (argc>3)) {
- owl_function_makemsg("Wrong number of arguments to aimlogin command");
- return(NULL);
- }
-
- /* if we get two arguments, ask for the password */
- if (argc==2) {
- owl_global_set_buffercommand(&g, argv[1]);
- owl_global_set_buffercallback(&g, &owl_callback_aimlogin);
- owl_function_start_password("AIM Password: ");
- return(NULL);
- } else {
- owl_function_aimlogin(argv[1], argv[2]);
- }
-
- /* this is a test */
- return(NULL);
-}
-
-char *owl_command_aimlogout(int argc, char **argv, char *buff)
-{
- /* clear the buddylist */
- owl_buddylist_clear(owl_global_get_buddylist(&g));
-
- owl_aim_logout();
- return(NULL);
-}
-
char *owl_command_getstyle(int argc, char **argv, char *buff)
{
char *stylename;
Modified: branches/barnowl_perlaim/owl/configure.ac
===================================================================
--- branches/barnowl_perlaim/owl/configure.ac 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/configure.ac 2008-06-01 03:40:29 UTC (rev 1073)
@@ -125,6 +125,4 @@
AC_PROG_INSTALL
-AC_CONFIG_SUBDIRS(libfaim)
-
AC_OUTPUT(Makefile)
Modified: branches/barnowl_perlaim/owl/functions.c
===================================================================
--- branches/barnowl_perlaim/owl/functions.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/functions.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -210,28 +210,6 @@
return(m);
}
-/* Create an outgoing AIM message, returns a pointer to the created
- * message or NULL if we're not logged into AIM (and thus unable to
- * create the message). Does not put it on the global queue. Use
- * owl_function_add_message() for that .
- */
-owl_message *owl_function_make_outgoing_aim(char *body, char *to)
-{
- owl_message *m;
-
- /* error if we're not logged into aim */
- if (!owl_global_is_aimloggedin(&g)) return(NULL);
-
- m=owl_malloc(sizeof(owl_message));
- owl_message_create_aim(m,
- owl_global_get_aim_screenname(&g),
- to,
- body,
- OWL_MESSAGE_DIRECTION_OUT,
- 0);
- return(m);
-}
-
/* Create an outgoing loopback message and return a pointer to it.
* Does not append it to the global queue, use
* owl_function_add_message() for that.
@@ -293,37 +271,6 @@
owl_global_set_buffercallback(&g, &owl_callback_zwrite);
}
-void owl_function_aimwrite_setup(char *line)
-{
- owl_editwin *e;
- char buff[1024];
-
- /* check the arguments */
-
- /* create and setup the editwin */
- e=owl_global_get_typwin(&g);
- owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g));
-
- if (!owl_global_get_lockout_ctrld(&g)) {
- owl_function_makemsg("Type your message below. End with ^D or a dot on a line by itself. ^C will quit.");
- } else {
- owl_function_makemsg("Type your message below. End with a dot on a line by itself. ^C will quit.");
- }
-
- owl_editwin_clear(e);
- owl_editwin_set_dotsend(e);
- strcpy(buff, "----> ");
- strcat(buff, line);
- strcat(buff, "\n");
- owl_editwin_set_locktext(e, buff);
-
- /* make it active */
- owl_global_set_typwin_active(&g);
-
- owl_global_set_buffercommand(&g, line);
- owl_global_set_buffercallback(&g, &owl_callback_aimwrite);
-}
-
void owl_function_loopwrite_setup()
{
owl_editwin *e;
@@ -450,71 +397,6 @@
owl_zwrite_free(&z);
}
-void owl_callback_aimwrite(owl_editwin *e) {
- owl_function_aimwrite(owl_editwin_get_command(e),
- owl_editwin_get_text(e));
-}
-
-void owl_function_aimwrite(char *line, char *msg)
-{
- int ret;
- char *to, *format_msg;
- owl_message *m;
-
- to = line + 9;
-
- /* make a formatted copy of the message */
- format_msg=owl_strdup(msg);
- owl_text_wordunwrap(format_msg);
-
- /* send the message */
- ret=owl_aim_send_im(to, format_msg);
- if (!ret) {
- owl_function_makemsg("AIM message sent.");
- } else {
- owl_function_error("Could not send AIM message.");
- }
-
- /* create the outgoing message */
- m=owl_function_make_outgoing_aim(msg, to);
-
- if (m) {
- owl_global_messagequeue_addmsg(&g, m);
- } else {
- owl_function_error("Could not create outgoing AIM message");
- }
-
- owl_free(format_msg);
-}
-
-void owl_function_send_aimawymsg(char *to, char *msg)
-{
- int ret;
- char *format_msg;
- owl_message *m;
-
- /* make a formatted copy of the message */
- format_msg=owl_strdup(msg);
- owl_text_wordunwrap(format_msg);
-
- /* send the message */
- ret=owl_aim_send_awaymsg(to, format_msg);
- if (!ret) {
- /* owl_function_makemsg("AIM message sent."); */
- } else {
- owl_function_error("Could not send AIM message.");
- }
-
- /* create the message */
- m=owl_function_make_outgoing_aim(msg, to);
- if (m) {
- owl_global_messagequeue_addmsg(&g, m);
- } else {
- owl_function_error("Could not create AIM message");
- }
- owl_free(format_msg);
-}
-
void owl_callback_loopwrite(owl_editwin *e) {
owl_function_loopwrite(owl_editwin_get_text(e));
}
@@ -894,22 +776,6 @@
}
}
-void owl_callback_aimlogin(owl_editwin *e) {
- owl_function_aimlogin(owl_editwin_get_command(e),
- owl_editwin_get_text(e));
-}
-
-void owl_function_aimlogin(char *user, char *passwd) {
- int ret;
-
- /* clear the buddylist */
- owl_buddylist_clear(owl_global_get_buddylist(&g));
-
- /* try to login */
- ret=owl_aim_login(user, passwd);
- if (ret) owl_function_makemsg("Warning: login for %s failed.\n", user);
-}
-
void owl_function_suspend()
{
endwin();
@@ -942,30 +808,6 @@
owl_function_makemsg("zaway off");
}
-void owl_function_aaway_toggle()
-{
- if (!owl_global_is_aaway(&g)) {
- owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
- owl_function_aaway_on();
- } else {
- owl_function_aaway_off();
- }
-}
-
-void owl_function_aaway_on()
-{
- owl_global_set_aaway_on(&g);
- /* owl_aim_set_awaymsg(owl_global_get_zaway_msg(&g)); */
- owl_function_makemsg("AIM away set (%s)", owl_global_get_aaway_msg(&g));
-}
-
-void owl_function_aaway_off()
-{
- owl_global_set_aaway_off(&g);
- /* owl_aim_set_awaymsg(""); */
- owl_function_makemsg("AIM away off");
-}
-
void owl_function_quit()
{
char *ret;
@@ -987,11 +829,6 @@
/* Quit zephyr */
owl_zephyr_shutdown();
- /* Quit AIM */
- if (owl_global_is_aimloggedin(&g)) {
- owl_aim_logout();
- }
-
/* done with curses */
endwin();
@@ -1947,7 +1784,7 @@
} else {
owl_fmtext_append_normal(&fm, "no\n");
}
- owl_fmtext_append_normal(&fm, " AIM included : yes\n");
+ owl_fmtext_append_normal(&fm, " AIM included : no\n");
owl_fmtext_append_normal(&fm, " Loopback included : yes\n");
@@ -1960,22 +1797,6 @@
#endif
- owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
- owl_fmtext_append_normal(&fm, " Logged in: ");
- if (owl_global_is_aimloggedin(&g)) {
- owl_fmtext_append_normal(&fm, owl_global_get_aim_screenname(&g));
- owl_fmtext_append_normal(&fm, "\n");
- } else {
- owl_fmtext_append_normal(&fm, "(not logged in)\n");
- }
-
- owl_fmtext_append_normal(&fm, " Processing events: ");
- if (owl_global_is_doaimevents(&g)) {
- owl_fmtext_append_normal(&fm, "yes\n");
- } else {
- owl_fmtext_append_normal(&fm, "no\n");
- }
-
owl_function_popless_fmtext(&fm);
owl_fmtext_free(&fm);
}
@@ -2119,13 +1940,6 @@
}
if (cc) owl_free(cc);
}
- } else if (owl_message_is_type_aim(m)) {
- /* aim */
- if (owl_message_is_direction_out(m)) {
- buff=owl_sprintf("aimwrite %s", owl_message_get_recipient(m));
- } else {
- buff=owl_sprintf("aimwrite %s", owl_message_get_sender(m));
- }
} else {
char *cmd;
if((type==0 && (cmd=owl_message_get_attribute_value(m, "replycmd")))
@@ -2679,50 +2493,6 @@
return(filtname);
}
-/* Create a filter for AIM IM messages to or from the specified
- * screenname. The name of the filter will be 'aimuser-<user>'. If a
- * filter already exists with this name, no new filter will be
- * created. This allows the configuration to override this function.
- * Returns the name of the filter, which the caller must free.
- */
-char *owl_function_aimuserfilt(char *user)
-{
- owl_filter *f;
- char *argbuff, *filtname;
- char *escuser;
-
- /* name for the filter */
- filtname=owl_malloc(strlen(user)+40);
- sprintf(filtname, "aimuser-%s", user);
-
- /* if it already exists then go with it. This lets users override */
- if (owl_global_get_filter(&g, filtname)) {
- return(owl_strdup(filtname));
- }
-
- /* create the new-internal filter */
- f=owl_malloc(sizeof(owl_filter));
-
- escuser = owl_text_quote(user, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
-
- argbuff=owl_malloc(1000);
- sprintf(argbuff,
- "( type ^aim$ and ( ( sender ^%s$ and recipient ^%s$ ) or ( sender ^%s$ and recipient ^%s$ ) ) )",
- escuser, owl_global_get_aim_screenname_for_filters(&g),
- owl_global_get_aim_screenname_for_filters(&g), escuser);
-
- owl_filter_init_fromstring(f, filtname, argbuff);
-
- /* add it to the global list */
- owl_global_add_filter(&g, f);
-
- /* free stuff */
- owl_free(argbuff);
- owl_free(escuser);
-
- return(filtname);
-}
-
char *owl_function_typefilt(char *type)
{
owl_filter *f;
@@ -2813,16 +2583,6 @@
return(owl_function_typefilt("loopback"));
}
- /* aim messages */
- if (owl_message_is_type_aim(m)) {
- if (owl_message_is_direction_in(m)) {
- filtname=owl_function_aimuserfilt(owl_message_get_sender(m));
- } else if (owl_message_is_direction_out(m)) {
- filtname=owl_function_aimuserfilt(owl_message_get_recipient(m));
- }
- return(filtname);
- }
-
/* narrow personal and login messages to the sender or recip as appropriate */
if (owl_message_is_type_zephyr(m)) {
if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
@@ -3256,12 +3016,9 @@
/* Popup a buddylisting. If filename is NULL use the default .anyone */
void owl_function_buddylist(int aim, int zephyr, char *filename)
{
- int i, j, x, idle;
+ int i, j, x;
owl_fmtext fm;
- owl_buddylist *bl;
- owl_buddy *b;
owl_list anyone;
- char *foo, *timestr;
#ifdef HAVE_LIBZEPHYR
char *tmp, *user, *line;
ZLocations_t location[200];
@@ -3270,28 +3027,9 @@
owl_fmtext_init_null(&fm);
- /* AIM first */
- if (aim && owl_global_is_aimloggedin(&g)) {
- bl=owl_global_get_buddylist(&g);
+ if (aim && !zephyr)
+ owl_fmtext_append_normal(&fm, "Warning: AIM support in C has been disabled.\n");
- owl_fmtext_append_bold(&fm, "AIM users logged in:\n");
- /* we're assuming AIM for now */
- j=owl_buddylist_get_size(bl);
- for (i=0; i<j; i++) {
- b=owl_buddylist_get_buddy_n(bl, i);
- idle=owl_buddy_get_idle_time(b);
- if (idle!=0) {
- timestr=owl_util_minutes_to_timestr(idle);
- } else {
- timestr=owl_strdup("");
- }
- foo=owl_sprintf(" %-20.20s %-12.12s\n", owl_buddy_get_name(b), timestr);
- owl_fmtext_append_normal(&fm, foo);
- owl_free(timestr);
- owl_free(foo);
- }
- }
-
#ifdef HAVE_LIBZEPHYR
if (zephyr) {
if(!owl_global_is_havezephyr(&g)) {
Modified: branches/barnowl_perlaim/owl/glib_compat.c
===================================================================
--- branches/barnowl_perlaim/owl/glib_compat.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/glib_compat.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -1,4 +1,4 @@
-#include <owl.h>
+#include "owl.h"
#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 14)
/* Our own implementation of g_unichar_is_mark for glib versions that
Modified: branches/barnowl_perlaim/owl/global.c
===================================================================
--- branches/barnowl_perlaim/owl/global.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/global.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -96,17 +96,7 @@
owl_mainwin_init(&(g->mw));
owl_popwin_init(&(g->pw));
- g->aim_screenname=NULL;
- g->aim_screenname_for_filters=NULL;
- g->aim_loggedin=0;
- owl_timer_create_countdown(&(g->aim_noop_timer), 30);
- owl_timer_create_countdown(&(g->aim_ignorelogin_timer), 0);
- owl_timer_create_countdown(&(g->aim_buddyinfo_timer), 60);
- owl_buddylist_init(&(g->buddylist));
-
g->havezephyr=0;
- g->haveaim=0;
- owl_global_set_no_doaimevents(g);
owl_errqueue_init(&(g->errqueue));
g->got_err_signal=0;
@@ -732,95 +722,6 @@
return(g->malloced-g->freed);
}
-/* AIM stuff */
-
-int owl_global_is_aimloggedin(owl_global *g)
-{
- if (g->aim_loggedin) return(1);
- return(0);
-}
-
-char *owl_global_get_aim_screenname(owl_global *g)
-{
- if (owl_global_is_aimloggedin(g)) {
- return (g->aim_screenname);
- }
- return("");
-}
-
-char *owl_global_get_aim_screenname_for_filters(owl_global *g)
-{
- if (owl_global_is_aimloggedin(g)) {
- return (g->aim_screenname_for_filters);
- }
- return("");
-}
-
-void owl_global_set_aimloggedin(owl_global *g, char *screenname)
-{
- char *sn_escaped, *quote;
- g->aim_loggedin=1;
- if (g->aim_screenname) owl_free(g->aim_screenname);
- if (g->aim_screenname_for_filters) owl_free(g->aim_screenname_for_filters);
- g->aim_screenname=owl_strdup(screenname);
- sn_escaped = owl_text_quote(screenname, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
- quote = owl_getquoting(sn_escaped);
- g->aim_screenname_for_filters=owl_sprintf("%s%s%s", quote, sn_escaped, quote);
- owl_free(sn_escaped);
-}
-
-void owl_global_set_aimnologgedin(owl_global *g)
-{
- g->aim_loggedin=0;
-}
-
-int owl_global_is_doaimevents(owl_global *g)
-{
- if (g->aim_doprocessing) return(1);
- return(0);
-}
-
-void owl_global_set_doaimevents(owl_global *g)
-{
- g->aim_doprocessing=1;
-}
-
-void owl_global_set_no_doaimevents(owl_global *g)
-{
- g->aim_doprocessing=0;
-}
-
-aim_session_t *owl_global_get_aimsess(owl_global *g)
-{
- return(&(g->aimsess));
-}
-
-aim_conn_t *owl_global_get_bosconn(owl_global *g)
-{
- return(&(g->bosconn));
-}
-
-void owl_global_set_bossconn(owl_global *g, aim_conn_t *conn)
-{
- g->bosconn=*conn;
-}
-
-int owl_global_is_aimnop_time(owl_global *g)
-{
- if (owl_timer_is_expired(&(g->aim_noop_timer))) return(1);
- return(0);
-}
-
-void owl_global_aimnop_sent(owl_global *g)
-{
- owl_timer_reset(&(g->aim_noop_timer));
-}
-
-owl_timer *owl_global_get_aim_login_timer(owl_global *g)
-{
- return(&(g->aim_ignorelogin_timer));
-}
-
/* message queue */
void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m)
@@ -882,17 +783,6 @@
s, (void(*)(void*))owl_style_free);
}
-void owl_global_set_haveaim(owl_global *g)
-{
- g->haveaim=1;
-}
-
-int owl_global_is_haveaim(owl_global *g)
-{
- if (g->haveaim) return(1);
- return(0);
-}
-
void owl_global_set_havezephyr(owl_global *g)
{
g->havezephyr=1;
@@ -904,11 +794,6 @@
return(0);
}
-owl_timer *owl_global_get_aim_buddyinfo_timer(owl_global *g)
-{
- return(&(g->aim_buddyinfo_timer));
-}
-
owl_errqueue *owl_global_get_errqueue(owl_global *g)
{
return(&(g->errqueue));
Modified: branches/barnowl_perlaim/owl/help.c
===================================================================
--- branches/barnowl_perlaim/owl/help.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/help.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -49,7 +49,6 @@
" M-u Unmark all messages in the current view for deletion\n"
"\n"
" z Start a zwrite command\n"
- " a Start an aimwrite command\n"
" r Reply to the current message\n"
" R Reply to sender\n"
" C-r Reply but allow editing of reply line\n"
@@ -84,15 +83,12 @@
" show Show information about owl (see detailed help)\n"
"\n"
" zwrite Send a zephyr\n"
- " aimlogin Login to AIM\n"
- " aimwrite Send an AIM message\n"
- "\n"
- " addbuddy Add a zephyr or AIM buddy\n"
+ " addbuddy Add a zephyr buddy\n"
" zaway Turn zaway on or off, or set the message\n"
" zlocate Locate a user\n"
" subscribe Subscribe to a zephyr class or instance\n"
" unsubscribe Unsubscribe to a zephyr class or instance\n"
- " blist Print a list of zephyr and AIM buddies logged in\n"
+ " blist Print a list of zephyr buddies logged in\n"
" search Search for a text string\n"
"\n"
" set Set a variable (see list below)\n"
@@ -106,7 +102,6 @@
" zpunt Supress messages from a zephyr triplet\n"
" zlog Send a login or logout notification\n"
" zlist Print a list of zephyr buddies logged in\n"
- " alist Print a list of AIM buddies logged in\n"
" info Print detailed information about the current message\n"
" filter Create a message filter\n"
" view View messages matching a filter\n"
Modified: branches/barnowl_perlaim/owl/keys.c
===================================================================
--- branches/barnowl_perlaim/owl/keys.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/keys.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -275,7 +275,6 @@
BIND_CMD("A", "away toggle", "toggles away message on and off");
BIND_CMD("z", "start-command zwrite ", "start a zwrite command");
- BIND_CMD("a", "start-command aimwrite ", "start an aimwrite command");
BIND_CMD("r", "reply", "reply to the current message");
BIND_CMD("R", "reply sender", "reply to sender of the current message");
BIND_CMD("C-r", "reply -e", "reply to the current message, but allow editing of recipient");
Modified: branches/barnowl_perlaim/owl/logging.c
===================================================================
--- branches/barnowl_perlaim/owl/logging.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/logging.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -86,17 +86,6 @@
owl_free(tmp);
}
-void owl_log_aim(owl_message *m, FILE *file) {
- fprintf(file, "From: <%s> To: <%s>\n", owl_message_get_sender(m), owl_message_get_recipient(m));
- fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
- if (owl_message_is_login(m))
- fprintf(file, "LOGIN\n\n");
- else if (owl_message_is_logout(m))
- fprintf(file, "LOGOUT\n\n");
- else
- fprintf(file, "%s\n\n", owl_message_get_body(m));
-}
-
void owl_log_jabber(owl_message *m, FILE *file) {
fprintf(file, "From: <%s> To: <%s>\n",owl_message_get_sender(m), owl_message_get_recipient(m));
fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -120,8 +109,6 @@
owl_log_zephyr(m, file);
} else if (owl_message_is_type_jabber(m)) {
owl_log_jabber(m, file);
- } else if (owl_message_is_type_aim(m)) {
- owl_log_aim(m, file);
} else {
owl_log_generic(m, file);
}
@@ -153,13 +140,6 @@
to = short_zuser(owl_message_get_recipient(m));
} else if (owl_message_is_type_jabber(m)) {
to = owl_sprintf("jabber:%s", owl_message_get_recipient(m));
- } else if (owl_message_is_type_aim(m)) {
- char *temp2;
- temp = owl_aim_normalize_screenname(owl_message_get_recipient(m));
- temp2 = g_utf8_strdown(temp,-1);
- to = owl_sprintf("aim:%s", temp2);
- owl_free(temp2);
- owl_free(temp);
} else {
to = owl_sprintf("loopback");
}
@@ -266,14 +246,6 @@
} else {
from=frombuff=owl_strdup(owl_message_get_class(m));
}
- } else if (owl_message_is_type_aim(m)) {
- /* we do not yet handle chat rooms */
- char *normalto, *temp;
- temp = owl_aim_normalize_screenname(owl_message_get_sender(m));
- normalto = g_utf8_strdown(temp, -1);
- from=frombuff=owl_sprintf("aim:%s", normalto);
- owl_free(normalto);
- owl_free(temp);
} else if (owl_message_is_type_loopback(m)) {
from=frombuff=owl_strdup("loopback");
} else if (owl_message_is_type_jabber(m)) {
Modified: branches/barnowl_perlaim/owl/message.c
===================================================================
--- branches/barnowl_perlaim/owl/message.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/message.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -574,26 +574,6 @@
owl_message_set_attribute(m, "question", "answered");
}
-int owl_message_is_from_me(owl_message *m)
-{
- if (owl_message_is_type_zephyr(m)) {
- if (!strcasecmp(owl_message_get_sender(m), owl_zephyr_get_sender())) {
- return(1);
- } else {
- return(0);
- }
- } else if (owl_message_is_type_aim(m)) {
- if (!strcasecmp(owl_message_get_sender(m), owl_global_get_aim_screenname(&g))) {
- return(1);
- } else {
- return(0);
- }
- } else if (owl_message_is_type_admin(m)) {
- return(0);
- }
- return(0);
-}
-
int owl_message_is_mail(owl_message *m)
{
if (owl_message_is_type_zephyr(m)) {
@@ -618,30 +598,6 @@
return(0);
}
-int owl_message_is_burningears(owl_message *m)
-{
- /* we should add a global to cache the short zsender */
- char sender[LINE], *ptr;
-
- /* if the message is from us or to us, it doesn't count */
- if (owl_message_is_from_me(m) || owl_message_is_private(m)) return(0);
-
- if (owl_message_is_type_zephyr(m)) {
- strcpy(sender, owl_zephyr_get_sender());
- ptr=strchr(sender, '@');
- if (ptr) *ptr='\0';
- } else if (owl_message_is_type_aim(m)) {
- strcpy(sender, owl_global_get_aim_screenname(&g));
- } else {
- return(0);
- }
-
- if (stristr(owl_message_get_body(m), sender)) {
- return(1);
- }
- return(0);
-}
-
/* caller must free return value. */
char *owl_message_get_cc(owl_message *m)
{
Modified: branches/barnowl_perlaim/owl/owl.c
===================================================================
--- branches/barnowl_perlaim/owl/owl.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/owl.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -182,7 +182,6 @@
if (confdir) owl_global_set_confdir(&g, confdir);
owl_function_debugmsg("startup: first available debugging message");
owl_global_set_startupargs(&g, argcsave, argvsave);
- owl_global_set_haveaim(&g);
/* prepare stdin dispatch */
{
@@ -300,10 +299,6 @@
owl_function_debugmsg("startup: setting the current view");
owl_view_create(owl_global_get_current_view(&g), "main", f, owl_global_get_style_by_name(&g, "default"));
- /* AIM init */
- owl_function_debugmsg("startup: doing AIM initialization");
- owl_aim_init();
-
/* execute the startup function in the configfile */
owl_function_debugmsg("startup: executing perl startup, if applicable");
perlout = owl_perlconfig_execute("BarnOwl::Hooks::_startup();");
@@ -563,11 +558,8 @@
if (owl_global_is_zaway(&g) && !owl_message_get_attribute_value(m, "isauto")) {
if (owl_message_is_type_zephyr(m)) {
owl_zephyr_zaway(m);
- } else if (owl_message_is_type_aim(m)) {
- if (owl_message_is_private(m)) {
- owl_function_send_aimawymsg(owl_message_get_sender(m), owl_global_get_zaway_msg(&g));
- }
}
+ /* TODO add perl hooks for away messages */
}
/* ring the bell if it's a personal */
@@ -610,20 +602,6 @@
return 1;
}
-void owl_process_aim()
-{
- if (owl_global_is_doaimevents(&g)) {
- owl_aim_process_events();
-
- if (owl_global_is_aimloggedin(&g)) {
- if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
- /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
- owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
- }
- }
- }
-}
-
void owl_process_input()
{
int ret;
Modified: branches/barnowl_perlaim/owl/owl.h
===================================================================
--- branches/barnowl_perlaim/owl/owl.h 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/owl.h 2008-06-01 03:40:29 UTC (rev 1073)
@@ -19,8 +19,10 @@
#include <time.h>
#include <signal.h>
#include <termios.h>
-#include <libfaim/aim.h>
#include <wchar.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
#include "config.h"
#include "glib.h"
#ifdef HAVE_LIBZEPHYR
@@ -35,8 +37,6 @@
typedef void WINDOW;
/* logout is defined in FreeBSD. */
#define logout logout_
-/* aim.h defines bool */
-#define HAS_BOOL
#include <perl.h>
#include "owl_perl.h"
#undef logout
@@ -55,7 +55,7 @@
#endif
#ifndef OWL_VERSION_STRING
-#define OWL_VERSION_STRING "1.0.1"
+#define OWL_VERSION_STRING "1.0.1-perlaim-r" BARNOWL_STRINGIFY(OWL_SVN_REVNO)
#endif
/* Feature that is being tested to redirect stderr through a pipe.
@@ -582,21 +582,11 @@
int newmsgproc_pid;
int malloced, freed;
char *searchstring;
- aim_session_t aimsess;
- aim_conn_t bosconn;
- owl_timer aim_noop_timer;
- owl_timer aim_ignorelogin_timer;
- owl_timer aim_buddyinfo_timer;
- int aim_loggedin; /* true if currently logged into AIM */
- int aim_doprocessing; /* true if we should process AIM events (like pending login) */
- char *aim_screenname; /* currently logged in AIM screen name */
- char *aim_screenname_for_filters; /* currently logged in AIM screen name */
owl_buddylist buddylist; /* list of logged in AIM buddies */
owl_list messagequeue; /* for queueing up aim and other messages */
owl_dict styledict; /* global dictionary of available styles */
char *response; /* response to the last question asked */
int havezephyr;
- int haveaim;
int got_err_signal; /* 1 if we got an unexpected signal */
siginfo_t err_signal_info;
owl_zbuddylist zbuddies;
Modified: branches/barnowl_perlaim/owl/select.c
===================================================================
--- branches/barnowl_perlaim/owl/select.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/select.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -147,38 +147,11 @@
}
}
-int owl_select_aim_hack(fd_set *rfds, fd_set *wfds)
-{
- aim_conn_t *cur;
- aim_session_t *sess;
- int max_fd;
-
- FD_ZERO(rfds);
- FD_ZERO(wfds);
- max_fd = 0;
- sess = owl_global_get_aimsess(&g);
- for (cur = sess->connlist, max_fd = 0; cur; cur = cur->next) {
- if (cur->fd != -1) {
- FD_SET(cur->fd, rfds);
- if (cur->status & AIM_CONN_STATUS_INPROGRESS) {
- /* Yes, we're checking writable sockets here. Without it, AIM
- login is really slow. */
- FD_SET(cur->fd, wfds);
- }
-
- if (cur->fd > max_fd)
- max_fd = cur->fd;
- }
- }
- return max_fd;
-}
-
void owl_select()
{
- int i, max_fd, aim_max_fd, aim_done;
+ int max_fd;
fd_set r;
fd_set e;
- fd_set aim_rfds, aim_wfds;
struct timeval timeout;
timeout.tv_sec = 1;
@@ -186,49 +159,7 @@
max_fd = owl_select_dispatch_prepare_fd_sets(&r, &e);
- /* AIM HACK:
- *
- * The problem - I'm not sure where to hook into the owl/faim
- * interface to keep track of when the AIM socket(s) open and
- * close. In particular, the bosconn thing throws me off. So,
- * rather than register particular dispatchers for AIM, I look up
- * the relevant FDs and add them to select's watch lists, then
- * check for them individually before moving on to the other
- * dispatchers. --asedeno
- */
- aim_done = 1;
- FD_ZERO(&aim_rfds);
- FD_ZERO(&aim_wfds);
- if (owl_global_is_doaimevents(&g)) {
- aim_done = 0;
- aim_max_fd = owl_select_aim_hack(&aim_rfds, &aim_wfds);
- if (max_fd < aim_max_fd) max_fd = aim_max_fd;
- for(i = 0; i <= aim_max_fd; i++) {
- if (FD_ISSET(i, &aim_rfds)) {
- FD_SET(i, &r);
- FD_SET(i, &e);
- }
- }
- }
- /* END AIM HACK */
-
- if ( select(max_fd+1, &r, &aim_wfds, &e, &timeout) ) {
- /* Merge fd_sets and clear AIM FDs. */
- for(i = 0; i <= max_fd; i++) {
- /* Merge all interesting FDs into one set, since we have a
- single dispatch per FD. */
- if (FD_ISSET(i, &r) || FD_ISSET(i, &aim_wfds) || FD_ISSET(i, &e)) {
- /* AIM HACK: no separate dispatch, just process here if
- needed, and only once per run through. */
- if (!aim_done && (FD_ISSET(i, &aim_rfds) || FD_ISSET(i, &aim_wfds))) {
- owl_process_aim();
- aim_done = 1;
- }
- else {
- FD_SET(i, &r);
- }
- }
- }
+ if ( select(max_fd+1, &r, NULL, &e, &timeout) ) {
/* NOTE: the same dispatch function is called for both exceptional
and read ready FDs. */
owl_select_dispatch(&r, max_fd);
Modified: branches/barnowl_perlaim/owl/util.c
===================================================================
--- branches/barnowl_perlaim/owl/util.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/util.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -77,18 +77,15 @@
waddstr(sepwin, buff);
}
- if (owl_global_is_zaway(&g) || owl_global_is_aaway(&g)) {
+ /* TODO add perl hooks for sepbar away, etc. status */
+ if (owl_global_is_zaway(&g)) {
getyx(sepwin, y, x);
wmove(sepwin, y, x+2);
wattron(sepwin, A_BOLD);
wattroff(sepwin, A_REVERSE);
- if (owl_global_is_zaway(&g) && owl_global_is_aaway(&g)) {
+ if (owl_global_is_zaway(&g)) {
waddstr(sepwin, " AWAY ");
- } else if (owl_global_is_zaway(&g)) {
- waddstr(sepwin, " Z-AWAY ");
- } else if (owl_global_is_aaway(&g)) {
- waddstr(sepwin, " A-AWAY ");
- }
+ } /* else if... */
wattron(sepwin, A_REVERSE);
wattroff(sepwin, A_BOLD);
}
Modified: branches/barnowl_perlaim/owl/variable.c
===================================================================
--- branches/barnowl_perlaim/owl/variable.c 2008-06-01 02:53:22 UTC (rev 1072)
+++ branches/barnowl_perlaim/owl/variable.c 2008-06-01 03:40:29 UTC (rev 1073)
@@ -238,19 +238,6 @@
OWL_DEFAULT_ZAWAYMSG,
"default zaway message", "" ),
- OWLVAR_BOOL_FULL( "aaway" /* %OwlVarStub */, 0,
- "Set AIM away status",
- "",
- NULL, owl_variable_aaway_set, NULL),
-
- OWLVAR_STRING( "aaway_msg" /* %OwlVarStub */,
- OWL_DEFAULT_AAWAYMSG,
- "AIM away msg for responding when away", "" ),
-
- OWLVAR_STRING( "aaway_msg_default" /* %OwlVarStub */,
- OWL_DEFAULT_AAWAYMSG,
- "default AIM away message", "" ),
-
OWLVAR_STRING( "view_home" /* %OwlVarStub */, "all",
"home view to switch to after 'X' and 'V'",
"SEE ALSO: view, filter\n" ),
@@ -298,14 +285,6 @@
"It is recommended that outgoing messages be no wider\n"
"than 60 columns, as a courtesy to recipients.\n"),
- OWLVAR_INT( "aim_ignorelogin_timer" /* %OwlVarStub */, 15,
- "number of seconds after AIM login to ignore login messages",
- "This specifies the number of seconds to wait after an\n"
- "AIM login before allowing the recipt of AIM login notifications.\n"
- "By default this is set to 15. If you would like to view login\n"
- "notifications of buddies as soon as you login, set it to 0 instead."),
-
-
OWLVAR_INT_FULL( "typewinsize" /* %OwlVarStub:typwin_lines */,
OWL_TYPWIN_SIZE,
"number of lines in the typing window",
@@ -406,19 +385,6 @@
return owl_variable_bool_set_default(v, newval);
}
-/* When 'aaway' is changed, need to notify the AIM server */
-int owl_variable_aaway_set(owl_variable *v, void *newval)
-{
- if (newval) {
- if (*(int*)newval == 1) {
- owl_aim_set_awaymsg(owl_global_get_aaway_msg(&g));
- } else if (*(int*)newval == 0) {
- owl_aim_set_awaymsg("");
- }
- }
- return owl_variable_bool_set_default(v, newval);
-}
-
int owl_variable_pseudologins_set(owl_variable *v, void *newval)
{
if (newval) {
