X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/f2d214f9f4f55253c29b10e47519f3372f8170fd..9f20a4e3d25b96996f9d07ee64dffc978ef0b769:/faim/aim.h

diff --git a/faim/aim.h b/faim/aim.h
index 8e3ea20..8e345a4 100644
--- a/faim/aim.h
+++ b/faim/aim.h
@@ -1,6 +1,9 @@
 /* 
  * Main libfaim header.  Must be included in client for prototypes/macros.
  *
+ * "come on, i turned a chick lesbian; i think this is the hackish equivalent"
+ *                                                -- Josh Meyer
+ *
  */
 
 #ifndef __AIM_H__
@@ -208,8 +211,9 @@ struct client_info_s {
  */
 #define AIM_CONN_STATUS_READY       0x0001
 #define AIM_CONN_STATUS_INTERNALERR 0x0002
-#define AIM_CONN_STATUS_RESOLVERR   0x0080
-#define AIM_CONN_STATUS_CONNERR     0x0040
+#define AIM_CONN_STATUS_RESOLVERR   0x0040
+#define AIM_CONN_STATUS_CONNERR     0x0080
+#define AIM_CONN_STATUS_INPROGRESS  0x0100
 
 #define AIM_FRAMETYPE_OSCAR 0x0000
 #define AIM_FRAMETYPE_OFT 0x0001
@@ -276,6 +280,14 @@ struct command_tx_struct {
   struct command_tx_struct *next; /* ptr to next struct in list */
 };
 
+/*
+ * OFT session: random oft cruft, per-session.
+ *
+ */
+struct aim_oft_session_t {
+  FILE *listing;
+  char *listingdir;
+};
 
 /*
  * AIM Session: The main client-data interface.  
@@ -296,6 +308,11 @@ struct aim_session_t {
    */
   void *aux_data;
 
+  /* 
+   * OFT Data 
+   */
+
+  struct aim_oft_session_t oft;
 
   /* ---- Internal Use Only ------------------------ */
   /* 
@@ -321,6 +338,7 @@ struct aim_session_t {
    * request and the resulting redirect.)
    */ 
   char *pendingjoin;
+  unsigned short pendingjoinexchange;
 
   /*
    * Outstanding snac handling 
@@ -331,9 +349,21 @@ struct aim_session_t {
   faim_mutex_t snac_hash_locks[FAIM_SNAC_HASH_SIZE];
   u_long snac_nextid;
 
+  struct {
+    char server[128];
+    char username[128];
+    char password[128];
+  } socksproxy;
+
+  unsigned long flags;
+
   struct aim_msgcookie_t *msgcookies;
 };
 
+/* Values for sess->flags */
+#define AIM_SESS_FLAGS_SNACLOGIN       0x00000001
+#define AIM_SESS_FLAGS_XORLOGIN        0x00000002
+#define AIM_SESS_FLAGS_NONBLOCKCONNECT 0x00000004
 
 /*
  * AIM User Info, Standard Form.
@@ -349,6 +379,8 @@ struct aim_userinfo_s {
   u_short capabilities;
   struct {
     unsigned short status;
+    unsigned int ipaddr;
+    char crap[0x25]; /* until we figure it out... */
   } icqinfo;
 };
 
@@ -397,6 +429,7 @@ faim_internal int aim_writetlvchain(u_char *buf, int buflen, struct aim_tlvlist_
 faim_internal int aim_addtlvtochain16(struct aim_tlvlist_t **list, unsigned short type, unsigned short val);
 faim_internal int aim_addtlvtochain32(struct aim_tlvlist_t **list, unsigned short type, unsigned long val);
 faim_internal int aim_addtlvtochain_str(struct aim_tlvlist_t **list, unsigned short type, char *str, int len);
+faim_internal int aim_addtlvtochain_caps(struct aim_tlvlist_t **list, unsigned short type, unsigned short caps);
 faim_internal int aim_counttlvchain(struct aim_tlvlist_t **list);
 
 /*
@@ -420,6 +453,8 @@ faim_internal unsigned long aim_genericreq_l(struct aim_session_t *, struct aim_
 faim_internal unsigned long aim_genericreq_s(struct aim_session_t *, struct aim_conn_t *conn, u_short family, u_short subtype, u_short *);
 
 faim_internal struct aim_fileheader_t *aim_oft_getfh(unsigned char *hdr);
+faim_export int aim_oft_registerlisting(struct aim_session_t *sess, FILE *file, char* listingdir);
+faim_export int aim_getfile_send(struct aim_conn_t *conn, FILE *tosend, struct aim_fileheader_t *fh);
 
 /* aim_login.c */
 faim_export int aim_sendconnack(struct aim_session_t *sess, struct aim_conn_t *conn);
@@ -442,7 +477,7 @@ faim_internal int aim_get_command_rendezvous(struct aim_session_t *sess, struct
 faim_internal struct command_tx_struct *aim_tx_new(unsigned char framing, int chan, struct aim_conn_t *conn, int datalen);
 faim_internal int aim_tx_enqueue__queuebased(struct aim_session_t *, struct command_tx_struct *);
 faim_internal int aim_tx_enqueue__immediate(struct aim_session_t *, struct command_tx_struct *);
-#define aim_tx_enqueue(x, y) ((*(x->tx_enqueue))(x, y))
+faim_internal int aim_tx_enqueue(struct aim_session_t *, struct command_tx_struct *);
 faim_internal int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur);
 faim_internal unsigned int aim_get_next_txseqnum(struct aim_conn_t *);
 faim_export int aim_tx_flushqueue(struct aim_session_t *);
@@ -491,7 +526,10 @@ faim_export int aim_conngetmaxfd(struct aim_session_t *);
 faim_export struct aim_conn_t *aim_select(struct aim_session_t *, struct timeval *, int *);
 faim_export int aim_conn_isready(struct aim_conn_t *);
 faim_export int aim_conn_setstatus(struct aim_conn_t *, int);
-faim_export void aim_session_init(struct aim_session_t *);
+faim_export int aim_conn_completeconnect(struct aim_session_t *sess, struct aim_conn_t *conn);
+faim_export int aim_conn_isconnecting(struct aim_conn_t *conn);
+faim_export void aim_session_init(struct aim_session_t *, unsigned long flags);
+faim_export void aim_setupproxy(struct aim_session_t *sess, char *server, char *username, char *password);
 
 /* aim_misc.c */
 
@@ -527,9 +565,12 @@ faim_export unsigned long aim_addicbmparam(struct aim_session_t *sess,struct aim
 faim_export unsigned long aim_setversions(struct aim_session_t *sess, struct aim_conn_t *conn);
 faim_export unsigned long aim_setdirectoryinfo(struct aim_session_t *sess, struct aim_conn_t *conn, char *first, char *middle, char *last, char *maiden, char *nickname, char *street, char *city, char *state, char *zip, int country, unsigned short privacy);
 faim_export unsigned long aim_setuserinterests(struct aim_session_t *sess, struct aim_conn_t *conn, char *interest1, char *interest2, char *interest3, char *interest4, char *interest5, unsigned short privacy);
+faim_export unsigned long aim_icq_setstatus(struct aim_session_t *sess, struct aim_conn_t *conn, unsigned long status);
 
-faim_internal struct aim_fileheader_t *aim_getlisting(struct aim_session_t*);
+faim_internal struct aim_fileheader_t *aim_getlisting(FILE *);
+faim_internal int aim_oft_buildheader(char *,struct aim_fileheader_t *);
 faim_internal int aim_listenestablish(u_short);
+faim_internal int aim_tx_destroy(struct command_tx_struct *);
 
 /* aim_rxhandlers.c */
 faim_export int aim_rxdispatch(struct aim_session_t *);
@@ -664,7 +705,8 @@ faim_export int aim_handlerendconnect(struct aim_session_t *sess, struct aim_con
 #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 unsigned long aim_accepttransfer(struct aim_session_t *sess, struct aim_conn_t *conn,struct aim_conn_t *oftconn, char *sender, char *cookie, unsigned short rendid);
+faim_export struct aim_conn_t *aim_accepttransfer(struct aim_session_t *sess, struct aim_conn_t *conn, char *sn,char *cookie,char *ip, FILE *file, unsigned short rendid);
+
 
 faim_export unsigned long aim_getinfo(struct aim_session_t *, struct aim_conn_t *, const char *, unsigned short);
 faim_internal int aim_extractuserinfo(u_char *, struct aim_userinfo_s *);