X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/d2698e035898b59fdff9e49da05904152cdedd03..2d5fd943961c036d5f0686eb15c7f608751eb65b:/include/aim.h

diff --git a/include/aim.h b/include/aim.h
index 5fd09ed..d850c1f 100644
--- a/include/aim.h
+++ b/include/aim.h
@@ -131,6 +131,12 @@
  */
 #define MAXMSGLEN 7987
 
+/*
+ * Maximum size of a Buddy Icon.
+ */
+#define MAXICONLEN 7168
+#define AIM_ICONIDENT "AVT1picture.id"
+
 /*
  * Current Maximum Length for Chat Room Messages
  *
@@ -254,6 +260,7 @@ struct aim_conn_t {
   struct aim_rxcblist_t *handlerlist;
   faim_mutex_t active; /* lock around read/writes */
   faim_mutex_t seqnum_lock; /* lock around ->seqnum changes */
+  void *sessv;
   struct aim_conn_t *next;
 };
 
@@ -469,12 +476,12 @@ faim_export unsigned long aim_debugconn_sendconnect(struct aim_session_t *sess,
 
 faim_export int aim_logoff(struct aim_session_t *);
 
-#ifndef FAIM_INTERNAL
+#if !defined(FAIM_INTERNAL) || defined(FAIM_INTERNAL_INSANE)
 /* the library should never call aim_conn_kill */
 faim_export void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn);
-#endif /* ndef FAIM_INTERNAL */
+#endif
 
-typedef int (*rxcallback_t)(struct aim_session_t *, struct command_rx_struct *, ...);
+typedef int (*aim_rxcallback_t)(struct aim_session_t *, struct command_rx_struct *, ...);
 
 /* aim_login.c */
 faim_export int aim_sendconnack(struct aim_session_t *sess, struct aim_conn_t *conn);
@@ -498,16 +505,17 @@ faim_export void aim_tx_purgequeue(struct aim_session_t *);
 struct aim_rxcblist_t {
   u_short family;
   u_short type;
-  rxcallback_t handler;
+  aim_rxcallback_t handler;
   u_short flags;
   struct aim_rxcblist_t *next;
 };
 
 faim_export int aim_conn_setlatency(struct aim_conn_t *conn, int newval);
 
-faim_export int aim_conn_addhandler(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short type, rxcallback_t newhandler, u_short flags);
+faim_export int aim_conn_addhandler(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short type, aim_rxcallback_t newhandler, u_short flags);
 faim_export int aim_clearhandlers(struct aim_conn_t *conn);
 
+faim_export struct aim_session_t *aim_conn_getsess(struct aim_conn_t *conn);
 faim_export void aim_conn_close(struct aim_conn_t *deadconn);
 faim_export struct aim_conn_t *aim_newconn(struct aim_session_t *, int type, char *dest);
 faim_export int aim_conngetmaxfd(struct aim_session_t *);
@@ -523,6 +531,8 @@ faim_export void aim_session_init(struct aim_session_t *, unsigned long flags, i
 faim_export void aim_session_kill(struct aim_session_t *);
 faim_export void aim_setupproxy(struct aim_session_t *sess, char *server, char *username, char *password);
 faim_export struct aim_conn_t *aim_getconn_type(struct aim_session_t *, int type);
+faim_export struct aim_conn_t *aim_getconn_type_all(struct aim_session_t *, int type);
+faim_export struct aim_conn_t *aim_getconn_fd(struct aim_session_t *, int fd);
 
 /* aim_misc.c */
 
@@ -536,13 +546,13 @@ faim_export struct aim_conn_t *aim_getconn_type(struct aim_session_t *, int type
 
 #define AIM_WARN_ANON                     0x01
 
-faim_export int aim_send_warning(struct aim_session_t *sess, struct aim_conn_t *conn, char *destsn, int anon);
+faim_export int aim_send_warning(struct aim_session_t *sess, struct aim_conn_t *conn, const char *destsn, unsigned long flags);
 faim_export unsigned long aim_bos_nop(struct aim_session_t *, struct aim_conn_t *);
 faim_export unsigned long aim_flap_nop(struct aim_session_t *sess, struct aim_conn_t *conn);
 faim_export unsigned long aim_bos_setidle(struct aim_session_t *, struct aim_conn_t *, u_long);
 faim_export unsigned long aim_bos_changevisibility(struct aim_session_t *, struct aim_conn_t *, int, char *);
 faim_export unsigned long aim_bos_setbuddylist(struct aim_session_t *, struct aim_conn_t *, char *);
-faim_export unsigned long aim_bos_setprofile(struct aim_session_t *, struct aim_conn_t *, char *, char *, unsigned short);
+faim_export unsigned long aim_bos_setprofile(struct aim_session_t *sess, struct aim_conn_t *conn, const char *profile, const char *awaymsg, unsigned short caps);
 faim_export unsigned long aim_bos_setgroupperm(struct aim_session_t *, struct aim_conn_t *, u_long);
 faim_export unsigned long aim_bos_clientready(struct aim_session_t *, struct aim_conn_t *);
 faim_export unsigned long aim_bos_reqrate(struct aim_session_t *, struct aim_conn_t *);
@@ -633,11 +643,71 @@ struct aim_filetransfer_priv {
   struct aim_fileheader_t fh;
 };
 
+struct aim_chat_roominfo {
+  u_short exchange;
+  char *name;
+  u_short instance;
+};
 
 #define AIM_IMFLAGS_AWAY 0x01 /* mark as an autoreply */
 #define AIM_IMFLAGS_ACK  0x02 /* request a receipt notice */
+#define AIM_IMFLAGS_UNICODE    0x04
+#define AIM_IMFLAGS_ISO_8859_1 0x08
+#define AIM_IMFLAGS_BUDDYREQ   0x10 /* buddy icon requested */
+#define AIM_IMFLAGS_HASICON    0x20 /* already has icon (timestamp included) */
+
+struct aim_sendimext_args {
+  const char *destsn;
+  unsigned short flags;
+  const char *msg;
+  int msglen;
+  int iconlen;
+  time_t iconstamp;
+  unsigned short iconsum;
+};
+
+struct aim_incomingim_ch1_args {
+  char *msg;
+  int msglen;
+  unsigned long icbmflags;
+  unsigned short flag1;
+  unsigned short flag2;
+  int finlen;
+  unsigned char fingerprint[10];
+  time_t iconstamp;
+};
+
+struct aim_incomingim_ch2_args {
+  unsigned short reqclass;
+  unsigned short status;
+  union {
+    struct {
+      unsigned int length;
+      time_t timestamp;
+      unsigned char *icon;
+    } icon;
+    struct {
+    } voice;
+    struct aim_directim_priv *directim;
+    struct {
+      char *msg;
+      char *encoding;
+      char *lang;
+      struct aim_chat_roominfo roominfo;
+    } chat;
+    struct {
+      char *ip;
+      unsigned char *cookie;
+    } getfile;
+    struct {
+    } sendfile;
+  } info;
+};
 
-faim_export unsigned long aim_send_im(struct aim_session_t *, struct aim_conn_t *, const char *destsn, unsigned short flags, const char *msg, int msglen);
+faim_export int aim_send_im_ext(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_sendimext_args *args);
+faim_export int aim_send_im(struct aim_session_t *, struct aim_conn_t *, const char *destsn, unsigned short flags, const char *msg);
+faim_export int aim_send_icon(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sn, const unsigned char *icon, int iconlen, time_t stamp, unsigned short iconsum);
+faim_export unsigned short aim_iconsum(const unsigned char *buf, int buflen);
 faim_export int aim_send_im_direct(struct aim_session_t *, struct aim_conn_t *, char *);
 faim_export struct aim_conn_t * aim_directim_initiate(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *, char *destsn);
 faim_export struct aim_conn_t *aim_directim_connect(struct aim_session_t *, struct aim_conn_t *, struct aim_directim_priv *);
@@ -649,14 +719,17 @@ faim_export int aim_oft_getfile_ack(struct aim_session_t *sess, struct aim_conn_
 faim_export int aim_oft_getfile_end(struct aim_session_t *sess, struct aim_conn_t *conn);
 
 /* aim_info.c */
-#define AIM_CAPS_BUDDYICON 0x01
-#define AIM_CAPS_VOICE 0x02
-#define AIM_CAPS_IMIMAGE 0x04
-#define AIM_CAPS_CHAT 0x08
-#define AIM_CAPS_GETFILE 0x10
-#define AIM_CAPS_SENDFILE 0x20
-#define AIM_CAPS_GAMES 0x40
-#define AIM_CAPS_SAVESTOCKS 0x80
+#define AIM_CAPS_BUDDYICON      0x0001
+#define AIM_CAPS_VOICE          0x0002
+#define AIM_CAPS_IMIMAGE        0x0004
+#define AIM_CAPS_CHAT           0x0008
+#define AIM_CAPS_GETFILE        0x0010
+#define AIM_CAPS_SENDFILE       0x0020
+#define AIM_CAPS_GAMES          0x0040
+#define AIM_CAPS_SAVESTOCKS     0x0080
+#define AIM_CAPS_SENDBUDDYLIST  0x0100
+#define AIM_CAPS_GAMES2         0x0200
+#define AIM_CAPS_LAST           0x8000
 
 faim_export int aim_0002_000b(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sn);
 
@@ -725,12 +798,6 @@ faim_export unsigned long aim_remove_buddy(struct aim_session_t *, struct aim_co
 /* aim_search.c */
 faim_export u_long aim_usersearch_address(struct aim_session_t *, struct aim_conn_t *, char *);
 
-struct aim_chat_roominfo {
-  u_short exchange;
-  char *name;
-  u_short instance;
-};
-
 struct aim_chat_exchangeinfo {
   u_short number;
   char *name;