X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/5f47d4a9a37b2df05dcff270072d386838e87ebb..6ae3c48d9566fef42977c80c5846774e8b5b41ca:/include/aim.h

diff --git a/include/aim.h b/include/aim.h
index e7a2440..6e5b013 100644
--- a/include/aim.h
+++ b/include/aim.h
@@ -546,7 +546,7 @@ faim_export struct aim_conn_t *aim_getconn_fd(struct aim_session_t *, int fd);
 
 #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);
@@ -636,17 +636,17 @@ struct aim_fileheader_t {
 };
 
 struct aim_filetransfer_priv {
-  char sn[MAXSNLEN];
-  char cookie[8];
-  char ip[30];
-  int state;
-  struct aim_fileheader_t fh;
+	char sn[MAXSNLEN];
+	char cookie[8];
+	char ip[30];
+	int state;
+	struct aim_fileheader_t fh;
 };
 
 struct aim_chat_roominfo {
-  u_short exchange;
-  char *name;
-  u_short instance;
+	unsigned short exchange;
+	char *name;
+	unsigned short instance;
 };
 
 #define AIM_IMFLAGS_AWAY 0x01 /* mark as an autoreply */
@@ -655,57 +655,60 @@ struct aim_chat_roominfo {
 #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) */
+#define AIM_IMFLAGS_SUBENC_MACINTOSH	0x40 /* damn that Steve Jobs! */
 
 struct aim_sendimext_args {
-  const char *destsn;
-  unsigned short flags;
-  const char *msg;
-  int msglen;
-  int iconlen;
-  time_t iconstamp;
-  unsigned short iconsum;
+	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;
+	char *msg;
+	int msglen;
+	unsigned long icbmflags;
+	unsigned short flag1;
+	unsigned short flag2;
+	int finlen;
+	unsigned char fingerprint[10];
+	time_t iconstamp;
+	int extdatalen;
+	unsigned char *extdata;
 };
 
 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;
+	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_ext(struct aim_session_t *sess, struct aim_conn_t *conn, struct aim_sendimext_args *args);
-faim_export unsigned long 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_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 *);
@@ -778,7 +781,7 @@ faim_export int aim_handlerendconnect(struct aim_session_t *sess, struct aim_con
 #define AIM_TRANSFER_DENY_NOTSUPPORTED 0x0000
 #define AIM_TRANSFER_DENY_DECLINE 0x0001
 #define AIM_TRANSFER_DENY_NOTACCEPTING 0x0002
-faim_export unsigned long aim_denytransfer(struct aim_session_t *sess, struct aim_conn_t *conn, char *sender, char *cookie, unsigned short code);
+faim_export int aim_denytransfer(struct aim_session_t *sess, struct aim_conn_t *conn, const char *sender, const char *cookie, unsigned short code);
 faim_export struct aim_conn_t *aim_accepttransfer(struct aim_session_t *sess, struct aim_conn_t *conn, char *sn, char *cookie, char *ip, unsigned short listingfiles, unsigned short listingtotsize, unsigned short listingsize, unsigned int listingchecksum, unsigned short rendid);
 
 faim_export int aim_getinfo(struct aim_session_t *, struct aim_conn_t *, const char *, unsigned short);