Changes in protocols/msn/msn.h [8b01217:4452e69]

File:

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

protocols/msn/msn.h

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -39 +39 @@
 #endif
 
-#define QRY_NAME "msmsgs@msnmsgr.com"
-#define QRY_CODE "Q1P7W2E4J9R8U3S5"
+/* This should be MSN Messenger 7.0.0813
+#define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T"
+#define MSNP11_PROD_ID  "PROD0101{0RM?UBW"
+*/
+
+/* Some other version.
+#define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
+#define MSNP11_PROD_ID  "PROD01065C%ZFN6F"
+*/
+
+#define MSNP11_PROD_KEY "ILTXC!4IXB5FB*PX"
+//PK}_A_0N_K%O?A9S"
+#define MSNP11_PROD_ID  "PROD0119GSJUC$18"
+//PROD0114ES4Z%Q5W"
+#define MSNP_VER        "MSNP15"
+#define MSNP_BUILD      "8.5.1288"
+//"8.1.0178"
 
 #define MSN_SB_NEW         -24062002
@@ -69 +84 @@
         
         int trId;
+        char *tokens[3];
+        char *lock_key;
         
         GSList *msgq, *grpq;
@@ -80 +97 @@
         int groupcount;
         char **grouplist;
+        GTree *domaintree;
 };
 
@@ -140 +158 @@
         int (*exec_command) ( gpointer data, char **cmd, int count );
         int (*exec_message) ( gpointer data, char *msg, int msglen, char **cmd, int count );
+};
+
+typedef enum
+{
+        MSN_BUDDY_FL = 1,   /* Warning: FL,AL,BL *must* be 1,2,4. */
+        MSN_BUDDY_AL = 2,
+        MSN_BUDDY_BL = 4,
+        MSN_BUDDY_RL = 8,
+        MSN_BUDDY_PL = 16,
+} msn_buddy_flags_t;
+
+struct msn_buddy_data
+{
+        char *cid;
+        msn_buddy_flags_t flags;
 };
 
@@ -162 +195 @@
 /* ns.c */
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
+void msn_auth_got_passport_token( struct im_connection *ic, char *token );
+void msn_auth_got_contact_list( struct im_connection *ic );
 
 /* msn_util.c */
@@ -172 +207 @@
 char **msn_linesplit( char *line );
 int msn_handler( struct msn_handler_data *h );
-char *msn_http_encode( const char *input );
 void msn_msgq_purge( struct im_connection *ic, GSList **list );
 gboolean msn_set_display_name( struct im_connection *ic, const char *rawname );
+char *msn_p11_challenge( char *challenge );
+gint msn_domaintree_cmp( gconstpointer a_, gconstpointer b_ );
 
 /* tables.c */
@@ -196 +232 @@
 void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
-/* invitation.c */
-void msn_ftp_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
-
 #endif //_MSN_H