Changes in protocols/msn/msn.h [951aefd:5ebff60]

File:

• protocols/msn/msn.h (modified) (12 diffs)

protocols/msn/msn.h

@@ -32 +32 @@
 #define NUDGE_MESSAGE "\r\r\rSHAKE THAT THING\r\r\r"
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
+#define SB_KEEPALIVE_MESSAGE "\r\r\rDONT HANG UP ON ME!\r\r\r"
 
 #ifdef DEBUG_MSN
@@ -59 +60 @@
 #define MSNP11_PROD_KEY "C1BX{V4W}Q3*10SM"
 #define MSNP11_PROD_ID  "PROD0120PW!CCV9@"
-#define MSNP_VER        "MSNP21"
+#define MSNP_VER        "MSNP18"
 #define MSNP_BUILD      "14.0.8117.416"
 
@@ -67 +68 @@
 #define MSN_CAP2        0x0000
 
-#define MSN_BASE_HEADERS \
-        "Routing: 1.0\r\n" \
-        "To: 1:%s\r\n" \
-        "From: 1:%s;epid={%s}\r\n" \
-        "\r\n" \
-        "Reliability: 1.0\r\n" \
+#define MSN_MESSAGE_HEADERS "MIME-Version: 1.0\r\n" \
+        "Content-Type: text/plain; charset=UTF-8\r\n" \
+        "User-Agent: BitlBee " BITLBEE_VERSION "\r\n" \
+        "X-MMS-IM-Format: FN=MS%20Shell%20Dlg; EF=; CO=0; CS=0; PF=0\r\n" \
         "\r\n"
-
-#define MSN_MESSAGE_HEADERS MSN_BASE_HEADERS \
-        "Messaging: 2.0\r\n" \
-        "Message-Type: Text\r\n" \
-        "Content-Length: %zd\r\n" \
-        "Content-Type: text/plain; charset=UTF-8\r\n" \
-        "X-MMS-IM-Format: FN=Segoe%%20UI; EF=; CO=0; CS=0; PF=0\r\n" \
-        "\r\n" \
-        "%s"
-
-#define MSN_PUT_HEADERS MSN_BASE_HEADERS \
-        "Publication: 1.0\r\n" \
-        "Uri: %s\r\n" \
-        "Content-Type: %s\r\n" \
-        "Content-Length: %zd\r\n" \
-        "\r\n" \
-        "%s"
-
-#define MSN_PUT_USER_BODY \
-        "<user>" \
-        "<s n=\"PE\"><UserTileLocation></UserTileLocation><FriendlyName>%s</FriendlyName><PSM>%s</PSM><DDP></DDP>" \
-        "<Scene></Scene><ASN></ASN><ColorScheme>-3</ColorScheme><BDG></BDG><RUM>%s</RUM><RUL></RUL><RLT>0</RLT>" \
-        "<RID></RID><SUL></SUL><MachineGuid>%s</MachineGuid></s>" \
-        "<s n=\"IM\"><Status>%s</Status><CurrentMedia></CurrentMedia></s>" \
-        "<sep n=\"PD\"><ClientType>1</ClientType><EpName>%s</EpName><Idle>%s</Idle><State>%s</State></sep>" \
-        "<sep n=\"PE\"><VER>BitlBee:" BITLBEE_VERSION "</VER><TYP>1</TYP><Capabilities>%d:%d</Capabilities></sep>" \
-        "<sep n=\"IM\"><Capabilities>%d:%d</Capabilities></sep>" \
-        "</user>"
 
 #define MSN_TYPING_HEADERS "MIME-Version: 1.0\r\n" \
@@ -113 +84 @@
         "ID: 1\r\n" \
         "\r\n"
+
+#define MSN_SB_KEEPALIVE_HEADERS "MIME-Version: 1.0\r\n" \
+        "Content-Type: text/x-ping\r\n" \
+        "\r\n\r\n"
 
 #define PROFILE_URL "http://members.msn.com/"
@@ -124 +99 @@
 } msn_flags_t;
 
-struct msn_gw {
-        char *last_host;
-        int port;
-        gboolean ssl;
-
-        char *session_id;
-
-        GByteArray *in;
-        GByteArray *out;
-
-        int poll_timeout;
-
-        b_event_handler callback;
-
-        struct im_connection *ic;
-        struct msn_data *md;
-
-        gboolean open;
-        gboolean waiting;
-        gboolean polling;
-};
-
-struct msn_data {
+struct msn_handler_data {
         int fd, inpa;
         int rxlen;
@@ -154 +107 @@
         char *cmd_text;
 
+        /* Either ic or sb */
+        gpointer data;
+
+        int (*exec_command) (struct msn_handler_data *handler, char **cmd, int count);
+        int (*exec_message) (struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int count);
+};
+
+struct msn_data {
         struct im_connection *ic;
 
+        struct msn_handler_data ns[1];
         msn_flags_t flags;
 
@@ -164 +126 @@
 
         GSList *msgq, *grpq, *soapq;
+        GSList *switchboards;
+        int sb_failures;
+        time_t first_sb_failure;
 
         const struct msn_away_state *away_state;
@@ -174 +139 @@
         GTree *domaintree;
         int adl_todo;
-
-        gboolean is_http;
-        struct msn_gw *gw;
+};
+
+struct msn_switchboard {
+        struct im_connection *ic;
+
+        /* The following two are also in the handler. TODO: Clean up. */
+        int fd;
+        gint inp;
+        struct msn_handler_data *handler;
+        gint keepalive;
+
+        int trId;
+        int ready;
+
+        int session;
+        char *key;
+
+        GSList *msgq;
+        char *who;
+        struct groupchat *chat;
 };
 
@@ -223 +205 @@
 #define STATUS_FATAL            1
 #define STATUS_SB_FATAL         2
+#define STATUS_SB_IM_SPARE      4       /* Make one-to-one conversation switchboard available again, invite failed. */
+#define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
 extern int msn_chat_id;
@@ -234 +218 @@
    before doing *anything* else. */
 extern GSList *msn_connections;
+extern GSList *msn_switchboards;
 
 /* ns.c */
 int msn_ns_write(struct im_connection *ic, int fd, const char *fmt, ...) G_GNUC_PRINTF(3, 4);
-gboolean msn_ns_connect(struct im_connection *ic, const char *host, int port);
-void msn_ns_close(struct msn_data *handler);
+gboolean msn_ns_connect(struct im_connection *ic, struct msn_handler_data *handler, const char *host, int port);
+void msn_ns_close(struct msn_handler_data *handler);
 void msn_auth_got_passport_token(struct im_connection *ic, const char *token, const char *error);
 void msn_auth_got_contact_list(struct im_connection *ic);
 int msn_ns_finish_login(struct im_connection *ic);
 int msn_ns_sendmessage(struct im_connection *ic, struct bee_user *bu, const char *text);
-int msn_ns_command(struct msn_data *md, char **cmd, int num_parts);
-int msn_ns_message(struct msn_data *md, char *msg, int msglen, char **cmd, int num_parts);
+void msn_ns_oim_send_queue(struct im_connection *ic, GSList **msgq);
 
 /* msn_util.c */
@@ -251 +235 @@
 int msn_buddy_list_remove(struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group);
 void msn_buddy_ask(bee_user_t *bu);
-void msn_queue_feed(struct msn_data *h, char *bytes, int st);
-int msn_handler(struct msn_data *h);
+char **msn_linesplit(char *line);
+int msn_handler(struct msn_handler_data *h);
+void msn_msgq_purge(struct im_connection *ic, GSList **list);
 char *msn_p11_challenge(char *challenge);
 gint msn_domaintree_cmp(gconstpointer a_, gconstpointer b_);
@@ -266 +251 @@
 const struct msn_status_code *msn_status_by_number(int number);
 
-/* gw.c */
-struct msn_gw *msn_gw_new(struct im_connection *ic);
-void msn_gw_free(struct msn_gw *gw);
-void msn_gw_open(struct msn_gw *gw);
-ssize_t msn_gw_read(struct msn_gw *gw, char **buf);
-void msn_gw_write(struct msn_gw *gw, char *buf, size_t len);
+/* sb.c */
+int msn_sb_write(struct msn_switchboard *sb, const char *fmt, ...) G_GNUC_PRINTF(2, 3);;
+struct msn_switchboard *msn_sb_create(struct im_connection *ic, char *host, int port, char *key, int session);
+struct msn_switchboard *msn_sb_by_handle(struct im_connection *ic, const char *handle);
+struct msn_switchboard *msn_sb_by_chat(struct groupchat *c);
+struct msn_switchboard *msn_sb_spare(struct im_connection *ic);
+int msn_sb_sendmessage(struct msn_switchboard *sb, char *text);
+struct groupchat *msn_sb_to_chat(struct msn_switchboard *sb);
+void msn_sb_destroy(struct msn_switchboard *sb);
+gboolean msn_sb_connected(gpointer data, gint source, b_input_condition cond);
+int msn_sb_write_msg(struct im_connection *ic, struct msn_message *m);
+void msn_sb_start_keepalives(struct msn_switchboard *sb, gboolean initial);
+void msn_sb_stop_keepalives(struct msn_switchboard *sb);
 
 #endif //_MSN_H