Changeset bae0617 for protocols/msn/msn.h

Timestamp:

2010-09-03T21:24:58Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4aa8a04

Parents:

64768d4

Message:

Rearrange things a bit to support multiple NS connections. This is apparently
needed for refreshing auth. tokens.

File:

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

protocols/msn/msn.h

@@ -44 +44 @@
 */
 
+#define MSN_NS_HOST "messenger.hotmail.com"
+#define MSN_NS_PORT 1863
+
 /* Some other version.
 #define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
@@ -80 +83 @@
 } msn_flags_t;
 
+struct msn_handler_data
+{
+        int fd, inpa;
+        int rxlen;
+        char *rxq;
+        
+        int msglen;
+        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;
         
-        int fd;
-        struct msn_handler_data *handler;
+        struct msn_handler_data ns[1], auth[1];
         msn_flags_t flags;
         
@@ -111 +129 @@
         struct im_connection *ic;
         
+        /* The following two are also in the handler. TODO: Clean up. */
         int fd;
         gint inp;
@@ -150 +169 @@
         char *who;
         char *group;
-};
-
-struct msn_handler_data
-{
-        int fd;
-        int rxlen;
-        char *rxq;
-        
-        int msglen;
-        char *cmd_text;
-        
-        gpointer data;
-        
-        int (*exec_command) ( gpointer data, char **cmd, int count );
-        int (*exec_message) ( gpointer data, char *msg, int msglen, char **cmd, int count );
 };
 
@@ -209 +213 @@
 /* ns.c */
 int msn_ns_write( struct im_connection *ic, int fd, const char *fmt, ... );
-gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
+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 );