Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/slp.c @ 27509:35b6fd563056

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call for runtime switching.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 10 Jul 2009 00:51:31 +0000
parents 3609fb4bc78e
children 6c9c6123b942
comparison
equal deleted inserted replaced
27508:9c413bda20be 27509:35b6fd563056
32 32
33 #include "smiley.h" 33 #include "smiley.h"
34 34
35 /* ms to delay between sending buddy icon requests to the server. */ 35 /* ms to delay between sending buddy icon requests to the server. */
36 #define BUDDY_ICON_DELAY 20 36 #define BUDDY_ICON_DELAY 20
37 /*debug SLP*/
38 #define MSN_DEBUG_UD
39 37
40 static void send_ok(MsnSlpCall *slpcall, const char *branch, 38 static void send_ok(MsnSlpCall *slpcall, const char *branch,
41 const char *type, const char *content); 39 const char *type, const char *content);
42 40
43 static void send_decline(MsnSlpCall *slpcall, const char *branch, 41 static void send_decline(MsnSlpCall *slpcall, const char *branch,
210 /* 200 OK */ 208 /* 200 OK */
211 slpmsg = msn_slpmsg_sip_new(slpcall, 1, 209 slpmsg = msn_slpmsg_sip_new(slpcall, 1,
212 "MSNSLP/1.0 200 OK", 210 "MSNSLP/1.0 200 OK",
213 branch, type, content); 211 branch, type, content);
214 212
215 #ifdef MSN_DEBUG_SLP
216 slpmsg->info = "SLP 200 OK"; 213 slpmsg->info = "SLP 200 OK";
217 slpmsg->text_body = TRUE; 214 slpmsg->text_body = TRUE;
218 #endif
219 215
220 msn_slplink_queue_slpmsg(slplink, slpmsg); 216 msn_slplink_queue_slpmsg(slplink, slpmsg);
221 217
222 msn_slpcall_session_init(slpcall); 218 msn_slpcall_session_init(slpcall);
223 } 219 }
234 /* 603 Decline */ 230 /* 603 Decline */
235 slpmsg = msn_slpmsg_sip_new(slpcall, 1, 231 slpmsg = msn_slpmsg_sip_new(slpcall, 1,
236 "MSNSLP/1.0 603 Decline", 232 "MSNSLP/1.0 603 Decline",
237 branch, type, content); 233 branch, type, content);
238 234
239 #ifdef MSN_DEBUG_SLP
240 slpmsg->info = "SLP 603 Decline"; 235 slpmsg->info = "SLP 603 Decline";
241 slpmsg->text_body = TRUE; 236 slpmsg->text_body = TRUE;
242 #endif
243 237
244 msn_slplink_queue_slpmsg(slplink, slpmsg); 238 msn_slplink_queue_slpmsg(slplink, slpmsg);
245 } 239 }
246 240
247 #define MAX_FILE_NAME_LEN 0x226 241 #define MAX_FILE_NAME_LEN 0x226
307 /* DATA PREP */ 301 /* DATA PREP */
308 slpmsg = msn_slpmsg_new(slplink); 302 slpmsg = msn_slpmsg_new(slplink);
309 slpmsg->slpcall = slpcall; 303 slpmsg->slpcall = slpcall;
310 slpmsg->session_id = slpcall->session_id; 304 slpmsg->session_id = slpcall->session_id;
311 msn_slpmsg_set_body(slpmsg, NULL, 4); 305 msn_slpmsg_set_body(slpmsg, NULL, 4);
312 #ifdef MSN_DEBUG_SLP
313 slpmsg->info = "SLP DATA PREP"; 306 slpmsg->info = "SLP DATA PREP";
314 #endif
315 msn_slplink_queue_slpmsg(slplink, slpmsg); 307 msn_slplink_queue_slpmsg(slplink, slpmsg);
316 308
317 /* DATA */ 309 /* DATA */
318 slpmsg = msn_slpmsg_new(slplink); 310 slpmsg = msn_slpmsg_new(slplink);
319 slpmsg->slpcall = slpcall; 311 slpmsg->slpcall = slpcall;
320 slpmsg->flags = 0x20; 312 slpmsg->flags = 0x20;
321 #ifdef MSN_DEBUG_SLP
322 slpmsg->info = "SLP DATA"; 313 slpmsg->info = "SLP DATA";
323 #endif
324 msn_slpmsg_set_image(slpmsg, img); 314 msn_slpmsg_set_image(slpmsg, img);
325 msn_slplink_queue_slpmsg(slplink, slpmsg); 315 msn_slplink_queue_slpmsg(slplink, slpmsg);
326 purple_imgstore_unref(img); 316 purple_imgstore_unref(img);
327 } 317 }
328 else if (!strcmp(euf_guid, MSN_FT_GUID)) 318 else if (!strcmp(euf_guid, MSN_FT_GUID))
446 "A0D624A6-6C0C-4283-A9E0-BC97B4B46D32", 436 "A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
447 type, 437 type,
448 "\r\n"); 438 "\r\n");
449 g_free(header); 439 g_free(header);
450 440
451 #ifdef MSN_DEBUG_SLP
452 slpmsg->info = "SLP BYE"; 441 slpmsg->info = "SLP BYE";
453 slpmsg->text_body = TRUE; 442 slpmsg->text_body = TRUE;
454 #endif
455 443
456 msn_slplink_queue_slpmsg(slplink, slpmsg); 444 msn_slplink_queue_slpmsg(slplink, slpmsg);
457 } 445 }
458 446
459 static void 447 static void
617 605
618 slpmsg = msn_slp_sipmsg_new(slpcall, 0, header, branch, 606 slpmsg = msn_slp_sipmsg_new(slpcall, 0, header, branch,
619 "application/x-msnmsgr-transreqbody", 607 "application/x-msnmsgr-transreqbody",
620 content); 608 content);
621 609
622 #ifdef MSN_DEBUG_SLP
623 slpmsg->info = "SLP INVITE"; 610 slpmsg->info = "SLP INVITE";
624 slpmsg->text_body = TRUE; 611 slpmsg->text_body = TRUE;
625 #endif
626 msn_slplink_send_slpmsg(slplink, slpmsg); 612 msn_slplink_send_slpmsg(slplink, slpmsg);
627 613
628 g_free(header); 614 g_free(header);
629 g_free(content); 615 g_free(content);
630 616
837 close once at the very end 823 close once at the very end
838 */ 824 */
839 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size); 825 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
840 purple_conv_custom_smiley_close(conv, slpcall->data_info ); 826 purple_conv_custom_smiley_close(conv, slpcall->data_info );
841 } 827 }
842 #ifdef MSN_DEBUG_UD 828 if (purple_debug_is_verbose())
843 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info); 829 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
844 #endif
845 } 830 }
846 831
847 void 832 void
848 msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg) 833 msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
849 { 834 {
961 { 946 {
962 MsnUser *user; 947 MsnUser *user;
963 948
964 g_return_if_fail(userlist != NULL); 949 g_return_if_fail(userlist != NULL);
965 950
966 #ifdef MSN_DEBUG_UD 951 if (purple_debug_is_verbose())
967 purple_debug_info("msn", "Releasing buddy icon request\n"); 952 purple_debug_info("msn", "Releasing buddy icon request\n");
968 #endif
969 953
970 if (userlist->buddy_icon_window > 0) 954 if (userlist->buddy_icon_window > 0)
971 { 955 {
972 GQueue *queue; 956 GQueue *queue;
973 PurpleAccount *account; 957 PurpleAccount *account;
984 username = user->passport; 968 username = user->passport;
985 969
986 userlist->buddy_icon_window--; 970 userlist->buddy_icon_window--;
987 request_user_display(user); 971 request_user_display(user);
988 972
989 #ifdef MSN_DEBUG_UD 973 if (purple_debug_is_verbose())
990 purple_debug_info("msn", "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n", 974 purple_debug_info("msn",
991 userlist->buddy_icon_window); 975 "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
992 #endif 976 userlist->buddy_icon_window);
993 } 977 }
994 } 978 }
995 979
996 /* 980 /*
997 * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next 981 * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next
1037 MsnUserList *userlist; 1021 MsnUserList *userlist;
1038 1022
1039 userlist = user->userlist; 1023 userlist = user->userlist;
1040 queue = userlist->buddy_icon_requests; 1024 queue = userlist->buddy_icon_requests;
1041 1025
1042 #ifdef MSN_DEBUG_UD 1026 if (purple_debug_is_verbose())
1043 purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n", 1027 purple_debug_info("msn", "Queueing buddy icon request for %s (buddy_icon_window = %i)\n",
1044 user->passport, userlist->buddy_icon_window); 1028 user->passport, userlist->buddy_icon_window);
1045 #endif
1046 1029
1047 g_queue_push_tail(queue, user); 1030 g_queue_push_tail(queue, user);
1048 1031
1049 if (userlist->buddy_icon_window > 0) 1032 if (userlist->buddy_icon_window > 0)
1050 msn_release_buddy_icon_request(userlist); 1033 msn_release_buddy_icon_request(userlist);
1060 PurpleAccount *account; 1043 PurpleAccount *account;
1061 1044
1062 g_return_if_fail(slpcall != NULL); 1045 g_return_if_fail(slpcall != NULL);
1063 1046
1064 info = slpcall->data_info; 1047 info = slpcall->data_info;
1065 #ifdef MSN_DEBUG_UD 1048 if (purple_debug_is_verbose())
1066 purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user); 1049 purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user);
1067 #endif
1068 1050
1069 userlist = slpcall->slplink->session->userlist; 1051 userlist = slpcall->slplink->session->userlist;
1070 account = slpcall->slplink->session->account; 1052 account = slpcall->slplink->session->account;
1071 1053
1072 purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user, 1054 purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
1088 { 1070 {
1089 MsnUserList *userlist; 1071 MsnUserList *userlist;
1090 1072
1091 g_return_if_fail(session != NULL); 1073 g_return_if_fail(session != NULL);
1092 1074
1093 #ifdef MSN_DEBUG_UD 1075 if (purple_debug_is_verbose())
1094 purple_debug_info("msn", "End User Display\n"); 1076 purple_debug_info("msn", "End User Display\n");
1095 #endif
1096 1077
1097 userlist = session->userlist; 1078 userlist = session->userlist;
1098 1079
1099 /* If the session is being destroyed we better stop doing anything. */ 1080 /* If the session is being destroyed we better stop doing anything. */
1100 if (session->destroying) 1081 if (session->destroying)
1148 { 1129 {
1149 MsnObject *my_obj = NULL; 1130 MsnObject *my_obj = NULL;
1150 gconstpointer data = NULL; 1131 gconstpointer data = NULL;
1151 size_t len = 0; 1132 size_t len = 0;
1152 1133
1153 #ifdef MSN_DEBUG_UD 1134 if (purple_debug_is_verbose())
1154 purple_debug_info("msn", "Requesting our own user display\n"); 1135 purple_debug_info("msn", "Requesting our own user display\n");
1155 #endif
1156 1136
1157 my_obj = msn_user_get_object(session->user); 1137 my_obj = msn_user_get_object(session->user);
1158 1138
1159 if (my_obj != NULL) 1139 if (my_obj != NULL)
1160 { 1140 {
1166 purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info); 1146 purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
1167 1147
1168 /* Free one window slot */ 1148 /* Free one window slot */
1169 session->userlist->buddy_icon_window++; 1149 session->userlist->buddy_icon_window++;
1170 1150
1171 #ifdef MSN_DEBUG_UD 1151 if (purple_debug_is_verbose())
1172 purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n", 1152 purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n",
1173 session->userlist->buddy_icon_window); 1153 session->userlist->buddy_icon_window);
1174 #endif
1175 1154
1176 msn_release_buddy_icon_request(session->userlist); 1155 msn_release_buddy_icon_request(session->userlist);
1177 } 1156 }
1178 } 1157 }