Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/switchboard.c @ 20516:5bc492d82ff4
explicit merge of '46d8a45835e685c9dd812f5c6c0df074388bec8a'
and 'fa439470adac87fe2027a307e96c857766b06d12'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:05:55 +0000 |
parents | 43a8cd1f708c 723b5a2f91ce |
children | 22034ce81dc4 26f55eb6ab59 |
comparison
equal
deleted
inserted
replaced
19719:bfa1557a7773 | 20516:5bc492d82ff4 |
---|---|
23 */ | 23 */ |
24 #include "msn.h" | 24 #include "msn.h" |
25 #include "prefs.h" | 25 #include "prefs.h" |
26 #include "switchboard.h" | 26 #include "switchboard.h" |
27 #include "notification.h" | 27 #include "notification.h" |
28 #include "msn-utils.h" | 28 #include "msnutils.h" |
29 | 29 |
30 #include "error.h" | 30 #include "error.h" |
31 | 31 |
32 static MsnTable *cbs_table; | 32 static MsnTable *cbs_table; |
33 | 33 |
532 cmdproc = swboard->cmdproc; | 532 cmdproc = swboard->cmdproc; |
533 | 533 |
534 payload = msn_message_gen_payload(msg, &payload_len); | 534 payload = msn_message_gen_payload(msg, &payload_len); |
535 | 535 |
536 #ifdef MSN_DEBUG_SB | 536 #ifdef MSN_DEBUG_SB |
537 purple_debug_info("MSNP14","SB length:{%d}",payload_len); | |
537 msn_message_show_readable(msg, "SB SEND", FALSE); | 538 msn_message_show_readable(msg, "SB SEND", FALSE); |
538 #endif | 539 #endif |
539 | 540 |
540 trans = msn_transaction_new(cmdproc, "MSG", "%c %d", | 541 trans = msn_transaction_new(cmdproc, "MSG", "%c %d", |
541 msn_message_get_flag(msg), payload_len); | 542 msn_message_get_flag(msg), payload_len); |
619 gboolean queue) | 620 gboolean queue) |
620 { | 621 { |
621 g_return_if_fail(swboard != NULL); | 622 g_return_if_fail(swboard != NULL); |
622 g_return_if_fail(msg != NULL); | 623 g_return_if_fail(msg != NULL); |
623 | 624 |
625 purple_debug_info("MSNP14","switchboard send msg..\n"); | |
624 if (msn_switchboard_can_send(swboard)) | 626 if (msn_switchboard_can_send(swboard)) |
625 release_msg(swboard, msg); | 627 release_msg(swboard, msg); |
626 else if (queue) | 628 else if (queue) |
627 queue_msg(swboard, msg); | 629 queue_msg(swboard, msg); |
628 } | 630 } |
725 { | 727 { |
726 MsnMessage *msg; | 728 MsnMessage *msg; |
727 | 729 |
728 msg = msn_message_new_from_cmd(cmdproc->session, cmd); | 730 msg = msn_message_new_from_cmd(cmdproc->session, cmd); |
729 | 731 |
730 msn_message_parse_payload(msg, payload, len); | 732 msn_message_parse_payload(msg, payload, len, |
733 MSG_LINE_DEM,MSG_BODY_DEM); | |
731 #ifdef MSN_DEBUG_SB | 734 #ifdef MSN_DEBUG_SB |
732 msn_message_show_readable(msg, "SB RECV", FALSE); | 735 msn_message_show_readable(msg, "SB RECV", FALSE); |
733 #endif | 736 #endif |
734 | 737 |
735 if (msg->remote_user != NULL) | 738 if (msg->remote_user != NULL) |
743 | 746 |
744 static void | 747 static void |
745 msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 748 msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
746 { | 749 { |
747 cmdproc->servconn->payload_len = atoi(cmd->params[2]); | 750 cmdproc->servconn->payload_len = atoi(cmd->params[2]); |
751 cmdproc->last_cmd->payload_cb = msg_cmd_post; | |
752 } | |
753 | |
754 static void | |
755 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | |
756 { | |
757 purple_debug_misc("MSNP14","get UBM...\n"); | |
758 cmdproc->servconn->payload_len = atoi(cmd->params[4]); | |
748 cmdproc->last_cmd->payload_cb = msg_cmd_post; | 759 cmdproc->last_cmd->payload_cb = msg_cmd_post; |
749 } | 760 } |
750 | 761 |
751 static void | 762 static void |
752 nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) | 763 nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) |
1093 | 1104 |
1094 static void | 1105 static void |
1095 cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) | 1106 cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error) |
1096 { | 1107 { |
1097 int reason = MSN_SB_ERROR_UNKNOWN; | 1108 int reason = MSN_SB_ERROR_UNKNOWN; |
1109 MsnMessage *msg; | |
1110 MsnSwitchBoard *swboard = trans->data; | |
1098 | 1111 |
1099 if (error == 215) | 1112 if (error == 215) |
1100 { | 1113 { |
1101 purple_debug_info("msn", "Invited user already in switchboard\n"); | 1114 purple_debug_info("msn", "Invited user already in switchboard\n"); |
1102 return; | 1115 return; |
1105 { | 1118 { |
1106 reason = MSN_SB_ERROR_USER_OFFLINE; | 1119 reason = MSN_SB_ERROR_USER_OFFLINE; |
1107 } | 1120 } |
1108 | 1121 |
1109 purple_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error); | 1122 purple_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error); |
1110 | 1123 purple_debug_warning("msn", "Will Use Offline Message to sendit\n"); |
1124 | |
1125 // cal_error_helper(trans, reason); | |
1126 /*offline Message send Process*/ | |
1127 | |
1128 while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL){ | |
1129 purple_debug_warning("MSNP14","offline msg to send:{%s}\n",msg->body); | |
1130 /* The messages could not be sent due to a switchboard error */ | |
1131 swboard->error = MSN_SB_ERROR_USER_OFFLINE; | |
1132 msg_error_helper(swboard->cmdproc, msg, | |
1133 MSN_MSG_ERROR_SB); | |
1134 msn_message_unref(msg); | |
1135 } | |
1111 cal_error_helper(trans, reason); | 1136 cal_error_helper(trans, reason); |
1112 } | 1137 } |
1113 | 1138 |
1114 void | 1139 void |
1115 msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user) | 1140 msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user) |
1149 | 1174 |
1150 if (g_list_find(cmdproc->session->switches, swboard) == NULL) | 1175 if (g_list_find(cmdproc->session->switches, swboard) == NULL) |
1151 /* The conversation window was closed. */ | 1176 /* The conversation window was closed. */ |
1152 return; | 1177 return; |
1153 | 1178 |
1179 purple_debug_info("MSNP14","Switchboard:auth:{%s} socket:{%s}\n",cmd->params[4],cmd->params[2]); | |
1154 msn_switchboard_set_auth_key(swboard, cmd->params[4]); | 1180 msn_switchboard_set_auth_key(swboard, cmd->params[4]); |
1155 | 1181 |
1156 msn_parse_socket(cmd->params[2], &host, &port); | 1182 msn_parse_socket(cmd->params[2], &host, &port); |
1157 | 1183 |
1158 if (!msn_switchboard_connect(swboard, host, port)) | 1184 if (!msn_switchboard_connect(swboard, host, port)) |
1261 msn_table_add_cmd(cbs_table, "MSG", "NAK", nak_cmd); | 1287 msn_table_add_cmd(cbs_table, "MSG", "NAK", nak_cmd); |
1262 | 1288 |
1263 msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd); | 1289 msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd); |
1264 | 1290 |
1265 msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd); | 1291 msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd); |
1292 msn_table_add_cmd(cbs_table, NULL, "UBM", ubm_cmd); | |
1266 msn_table_add_cmd(cbs_table, NULL, "JOI", joi_cmd); | 1293 msn_table_add_cmd(cbs_table, NULL, "JOI", joi_cmd); |
1267 msn_table_add_cmd(cbs_table, NULL, "BYE", bye_cmd); | 1294 msn_table_add_cmd(cbs_table, NULL, "BYE", bye_cmd); |
1268 msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd); | 1295 msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd); |
1269 | 1296 |
1270 #if 0 | 1297 #if 0 |