Mercurial > pidgin
diff libpurple/protocols/msn/oim.c @ 20471:530a92d50c5e
Misc cleanups, better error handling, and print the Address Book received from the server in a human readable way.
author | Carlos Silva <typ0@pidgin.im> |
---|---|
date | Tue, 17 Jul 2007 00:35:50 +0000 |
parents | a0d104281002 |
children | eb93710aec4d |
line wrap: on
line diff
--- a/libpurple/protocols/msn/oim.c Mon Jul 16 23:06:21 2007 +0000 +++ b/libpurple/protocols/msn/oim.c Tue Jul 17 00:35:50 2007 +0000 @@ -120,9 +120,9 @@ { char *oim_body,*oim_base64; - purple_debug_info("MaYuan","encode OIM Message...\n"); + purple_debug_info("MSNP14","encode OIM Message...\n"); oim_base64 = purple_base64_encode((const guchar *)body, strlen(body)); - purple_debug_info("MaYuan","encoded base64 body:{%s}\n",oim_base64); + purple_debug_info("MSNP14","encoded base64 body:{%s}\n",oim_base64); oim_body = g_strdup_printf(MSN_OIM_MSG_TEMPLATE, oim->run_id,oim->send_seq,oim_base64); @@ -178,7 +178,7 @@ /*Send OK! return*/ MsnOimSendReq *request; - purple_debug_info("MaYuan","send OIM OK!"); + purple_debug_info("MSNP14","send OIM OK!"); xmlnode_free(responseNode); request = g_queue_pop_head(oim->send_queue); msn_oim_free_send_req(request); @@ -189,11 +189,11 @@ /*get the challenge,and repost it*/ faultCodeNode = xmlnode_get_child(faultNode,"faultcode"); if(faultCodeNode == NULL){ - purple_debug_info("MaYuan","faultcode Node is NULL\n"); + purple_debug_info("MSNP14","faultcode Node is NULL\n"); goto oim_send_process_fail; } faultCodeStr = xmlnode_get_data(faultCodeNode); - purple_debug_info("MaYuan","fault code:{%s}\n",faultCodeStr); + purple_debug_info("MSNP14","fault code:{%s}\n",faultCodeStr); if(!strcmp(faultCodeStr,"q0:AuthenticationFailed")){ /*other Fault Reason?*/ @@ -202,7 +202,7 @@ faultstringNode = xmlnode_get_child(faultNode,"faultstring"); faultstring = xmlnode_get_data(faultstringNode); - purple_debug_info("MaYuan","fault string :{%s}\n",faultstring); + purple_debug_info("MSNP14","fault string :{%s}\n",faultstring); /* lock key fault reason, * compute the challenge and resend it @@ -218,10 +218,10 @@ g_free(oim->challenge); oim->challenge = xmlnode_get_data(challengeNode); - purple_debug_info("MaYuan","lockkey:{%s}\n",oim->challenge); + purple_debug_info("MSNP14","lockkey:{%s}\n",oim->challenge); /*repost the send*/ - purple_debug_info("MaYuan","prepare to repost the send...\n"); + purple_debug_info("MSNP14","prepare to repost the send...\n"); msn_oim_send_msg(oim); oim_send_process_fail: @@ -240,7 +240,7 @@ oim = soapconn->session->oim; g_return_if_fail(oim != NULL); - purple_debug_info("MaYuan","read buffer:{%s}\n",soapconn->body); + purple_debug_info("MSNP14","read buffer:{%s}\n",soapconn->body); msn_oim_send_process(oim,soapconn->body,soapconn->body_len); } @@ -280,7 +280,7 @@ oim_request = g_queue_pop_head(oim->send_queue); g_return_if_fail(oim_request != NULL); - purple_debug_info("MaYuan","send single OIM Message\n"); + purple_debug_info("MSNP14","send single OIM Message\n"); mspauth = g_strdup_printf("t=%s&p=%s", oim->session->passport_info.t, oim->session->passport_info.p @@ -293,10 +293,10 @@ if(oim->challenge != NULL){ msn_handle_chl(oim->challenge, buf); }else{ - purple_debug_info("MaYuan","no lock key challenge,wait for SOAP Fault and Resend\n"); + purple_debug_info("MSNP14","no lock key challenge,wait for SOAP Fault and Resend\n"); buf[0]='\0'; } - purple_debug_info("MaYuan","get the lock key challenge {%s}\n",buf); + purple_debug_info("MSNP14","get the lock key challenge {%s}\n",buf); msg_body = msn_oim_msg_to_str(oim, oim_request->oim_msg); soap_body = g_strdup_printf(MSN_OIM_SEND_TEMPLATE, @@ -333,7 +333,7 @@ { MsnSoapConn * soapconn = data; - purple_debug_info("MaYuan","OIM delete read buffer:{%s}\n",soapconn->body); + purple_debug_info("MSNP14","OIM delete read buffer:{%s}\n",soapconn->body); msn_soap_free_read_buf(soapconn); /*get next single Offline Message*/ @@ -358,7 +358,7 @@ g_return_if_fail(oim != NULL); g_return_if_fail(msgid != NULL); - purple_debug_info("MaYuan","Delete single OIM Message {%s}\n",msgid); + purple_debug_info("MSNP14","Delete single OIM Message {%s}\n",msgid); t = oim->session->passport_info.t; p = oim->session->passport_info.p; @@ -407,7 +407,7 @@ session = oim->session; g_return_if_fail(session != NULL); - purple_debug_info("MaYuan","oim get SOAP Server connected!\n"); + purple_debug_info("MSNP14","oim get SOAP Server connected!\n"); } /*Post the Offline Instant Message to User Conversation*/ @@ -428,7 +428,7 @@ msn_message_parse_payload(message, msg_str, strlen(msg_str), MSG_OIM_LINE_DEM, MSG_OIM_BODY_DEM); - purple_debug_info("MaYuan","oim body:{%s}\n",message->body); + purple_debug_info("MSNP14","oim body:{%s}\n",message->body); decode_msg = (char *)purple_base64_decode(message->body,&body_len); date = (char *)g_hash_table_lookup(message->attr_table, "Date"); from = (char *)g_hash_table_lookup(message->attr_table, "From"); @@ -438,12 +438,12 @@ if(has_nick){ tokens = g_strsplit(from , " " , 2); passport_str = g_strdup(tokens[1]); - purple_debug_info("MaYuan","oim Date:{%s},nickname:{%s},tokens[1]:{%s} passport{%s}\n", + purple_debug_info("MSNP14","oim Date:{%s},nickname:{%s},tokens[1]:{%s} passport{%s}\n", date,tokens[0],tokens[1],passport_str); g_strfreev(tokens); }else{ passport_str = g_strdup(from); - purple_debug_info("MaYuan","oim Date:{%s},passport{%s}\n", + purple_debug_info("MSNP14","oim Date:{%s},passport{%s}\n", date,passport_str); } start = strstr(passport_str,"<"); @@ -451,7 +451,7 @@ end = strstr(passport_str,">"); passport = g_strndup(start,end - start); g_free(passport_str); - purple_debug_info("MaYuan","oim Date:{%s},passport{%s}\n",date,passport); + purple_debug_info("MSNP14","oim Date:{%s},passport{%s}\n",date,passport); stamp = purple_str_to_time(date, TRUE, NULL, NULL, NULL); @@ -498,7 +498,7 @@ MsnSoapConn * soapconn = data; MsnOim * oim = soapconn->session->oim; - purple_debug_info("MaYuan","OIM get read buffer:{%s}\n",soapconn->body); + purple_debug_info("MSNP14","OIM get read buffer:{%s}\n",soapconn->body); /*we need to process the read message!*/ msn_oim_get_process(oim,soapconn->body); @@ -572,7 +572,7 @@ rTime = xmlnode_get_data(rtNode); rtNode = NULL; } -/* purple_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); */ +/* purple_debug_info("MSNP14","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); */ oim->oim_list = g_list_append(oim->oim_list,msgid); msn_oim_post_single_get_msg(oim,msgid); @@ -592,7 +592,7 @@ MsnSoapReq *soap_request; const char *soap_body,*t,*p; - purple_debug_info("MaYuan","Get single OIM Message\n"); + purple_debug_info("MSNP14","Get single OIM Message\n"); t = oim->session->passport_info.t; p = oim->session->passport_info.p; @@ -613,7 +613,7 @@ static void msn_oim_retrieve_connect_init(MsnSoapConn *soapconn) { - purple_debug_info("MaYuan","msn_oim_connect...\n"); + purple_debug_info("MSNP14","msn_oim_connect...\n"); msn_soap_init(soapconn,MSN_OIM_RETRIEVE_HOST,1, msn_oim_get_connect_cb, msn_oim_get_error_cb); @@ -623,7 +623,7 @@ static void msn_oim_send_connect_init(MsnSoapConn *sendconn) { - purple_debug_info("MaYuan","msn oim send connect init...\n"); + purple_debug_info("MSNP14","msn oim send connect init...\n"); msn_soap_init(sendconn,MSN_OIM_SEND_HOST,1, msn_oim_send_connect_cb, msn_oim_send_error_cb);