Menu
▾
▴
pidgin-commits
|
From: <tb...@us...> - 2006-04-18 07:35:12
|
Revision: 16057 Author: tbutter Date: 2006-04-18 00:35:05 -0700 (Tue, 18 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16057&view=rev Log Message: ----------- Fixing a bug discovered by Candace Holman. The right way to set the human readable status is <note>, not <im:im>. Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-04-18 05:48:07 UTC (rev 16056) +++ trunk/src/protocols/simple/simple.c 2006-04-18 07:35:05 UTC (rev 16057) @@ -1120,8 +1120,8 @@ "<tuple id=\"bs35r9f\">\n" "<status>\n" "<basic>open</basic>\n" - "<im:im>%s</im:im>\n" "</status>\n" + "<note>%s</note>\n" "</tuple>\n" "</presence>", sip->username, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <tb...@us...> - 2006-04-18 07:46:06
|
Revision: 16058 Author: tbutter Date: 2006-04-18 00:45:55 -0700 (Tue, 18 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16058&view=rev Log Message: ----------- fixed CID 106 Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-04-18 07:35:05 UTC (rev 16057) +++ trunk/src/protocols/simple/simple.c 2006-04-18 07:45:55 UTC (rev 16058) @@ -379,11 +379,12 @@ g_strfreev(parts); gaim_debug(GAIM_DEBUG_MISC, "simple", "nonce: %s realm: %s ", auth->nonce ? auth->nonce : "(null)", auth->realm ? auth->realm : "(null)"); + if(auth->realm) { + auth->digest_session_key = gaim_cipher_http_digest_calculate_session_key( + "md5", authuser, auth->realm, sip->password, auth->nonce, NULL); - auth->digest_session_key = gaim_cipher_http_digest_calculate_session_key( - "md5", authuser, auth->realm, sip->password, auth->nonce, NULL); - - auth->nc = 1; + auth->nc = 1; + } } static void simple_canwrite_cb(gpointer data, gint source, GaimInputCondition cond) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <the...@us...> - 2006-04-22 15:14:00
|
Revision: 16080 Author: thekingant Date: 2006-04-22 08:13:51 -0700 (Sat, 22 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16080&view=rev Log Message: ----------- Set the SIP/SIMPLE user-agent string to something more that I think makes more sense, and set wants_to_die in two places when disconnecting. This causes the account to be disable until the user re-enables it. Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-04-22 15:11:07 UTC (rev 16079) +++ trunk/src/protocols/simple/simple.c 2006-04-22 15:13:51 UTC (rev 16080) @@ -624,7 +624,7 @@ "To: <%s>%s%s\r\n" "Max-Forwards: 10\r\n" "CSeq: %d %s\r\n" - "User-Agent: Gaim SIP/SIMPLE Plugin\r\n" + "User-Agent: Gaim/" VERSION "\r\n" "Call-ID: %s\r\n" "%s%s" "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n%s", @@ -992,6 +992,7 @@ if(sip->registerstatus != 2) { gaim_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries); if(sip->registrar.retries > 3) { + sip->gc->wants_to_die = TRUE; gaim_connection_error(sip->gc, _("Wrong Password")); return TRUE; } @@ -1581,6 +1582,7 @@ gc = gaim_account_get_connection(account); if (strpbrk(username, " \t\v\r\n") != NULL) { + gc->wants_to_die = TRUE; gaim_connection_error(gc, _("SIP usernames may not contain whitespaces or @ symbols")); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-08-10 23:58:27
|
Revision: 16691 Author: datallah Date: 2006-08-10 16:58:24 -0700 (Thu, 10 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16691&view=rev Log Message: ----------- Fix CID 220 and plug some more leaks. Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-08-10 23:42:17 UTC (rev 16690) +++ trunk/src/protocols/simple/simple.c 2006-08-10 23:58:24 UTC (rev 16691) @@ -967,6 +967,7 @@ if(!state) { gaim_debug_info("simple", "process_incoming_message: no state found\n"); + xmlnode_free(isc); return; } @@ -1035,7 +1036,7 @@ gchar *fromhdr; gchar *tmp2; xmlnode *pidf; - xmlnode *basicstatus; + xmlnode *basicstatus = NULL, *tuple, *status; gboolean isonline = FALSE; fromhdr = sipmsg_find_header(msg, "From"); @@ -1049,10 +1050,13 @@ return; } - basicstatus = xmlnode_get_child(xmlnode_get_child(xmlnode_get_child(pidf, "tuple"), "status"), "basic"); + if ((tuple = xmlnode_get_child(pidf, "tuple"))) + if ((status = xmlnode_get_child(tuple, "status"))) + basicstatus = xmlnode_get_child(status, "basic"); if(!basicstatus) { gaim_debug_info("simple", "process_incoming_notify: no basic found\n"); + xmlnode_free(pidf); return; } @@ -1060,6 +1064,7 @@ if(!tmp2) { gaim_debug_info("simple", "process_incoming_notify: no basic data found\n"); + xmlnode_free(pidf); return; } @@ -1211,15 +1216,15 @@ } if(acceptheader) { gchar *tmp = acceptheader; - int foundpidf = 0; - int foundxpidf = 0; + gboolean foundpidf = FALSE; + gboolean foundxpidf = FALSE; while(tmp && tmp < acceptheader + strlen(acceptheader)) { gchar *tmp2 = strchr(tmp, ','); if(tmp2) *tmp2 = '\0'; if(!strcmp("application/pidf+xml", tmp)) - foundpidf = 1; + foundpidf = TRUE; if(!strcmp("application/xpidf+xml", tmp)) - foundxpidf = 1; + foundxpidf = TRUE; if(tmp2) { *tmp2 = ','; tmp = tmp2; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-08-16 18:55:26
|
Revision: 16796 Author: datallah Date: 2006-08-16 11:55:17 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16796&view=rev Log Message: ----------- Fix bug #1541223 Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-08-16 17:31:29 UTC (rev 16795) +++ trunk/src/protocols/simple/simple.c 2006-08-16 18:55:17 UTC (rev 16796) @@ -604,7 +604,7 @@ const gchar *body, struct sip_dialog *dialog, TransCallback tc) { struct simple_account_data *sip = gc->proto_data; char *callid = dialog ? g_strdup(dialog->callid) : gencallid(); - char *auth = ""; + char *auth = NULL; const char *addh = ""; gchar *branch = genbranch(); gchar *tag = NULL; @@ -662,7 +662,7 @@ ++sip->cseq, method, callid, - auth, + auth ? auth : "", addh, strlen(body), body); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <the...@us...> - 2006-08-14 08:23:32
|
Revision: 16752 Author: thekingant Date: 2006-08-14 01:23:26 -0700 (Mon, 14 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16752&view=rev Log Message: ----------- I don't feel like fixing simple right now, so I'm adding some GAIM_CONNECTION_IS_VALID's to tide us over Modified Paths: -------------- trunk/src/protocols/simple/simple.c Modified: trunk/src/protocols/simple/simple.c =================================================================== --- trunk/src/protocols/simple/simple.c 2006-08-14 08:22:39 UTC (rev 16751) +++ trunk/src/protocols/simple/simple.c 2006-08-14 08:23:26 UTC (rev 16752) @@ -421,16 +421,24 @@ static void simple_input_cb(gpointer data, gint source, GaimInputCondition cond); -static void send_later_cb(gpointer data, gint source) { +static void send_later_cb(gpointer data, gint source, const gchar *error) { GaimConnection *gc = data; - struct simple_account_data *sip = gc->proto_data; + struct simple_account_data *sip; struct sip_connection *conn; + if (!GAIM_CONNECTION_IS_VALID(gc)) + { + if (source >= 0) + close(source); + return; + } + if(source < 0) { gaim_connection_error(gc, _("Could not connect")); return; } + sip = gc->proto_data; sip->fd = source; sip->connecting = FALSE; @@ -1453,16 +1461,24 @@ conn->inputhandler = gaim_input_add(newfd, GAIM_INPUT_READ, simple_input_cb, gc); } -static void login_cb(gpointer data, gint source) { +static void login_cb(gpointer data, gint source, const gchar *error_message) { GaimConnection *gc = data; - struct simple_account_data *sip = gc->proto_data; + struct simple_account_data *sip; struct sip_connection *conn; + if (!GAIM_CONNECTION_IS_VALID(gc)) + { + if (source >= 0) + close(source); + return; + } + if(source < 0) { gaim_connection_error(gc, _("Could not connect")); return; } + sip = gc->proto_data; sip->fd = source; conn = connection_create(sip, source); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X