kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 139563 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r139563 | mmichelson | 2008-08-22 15:20:58 -0500 (Fri, 22 Aug 2008) | 15 lines

The -1 return value from incomplete or improper
headers for the SipNotify manager command was
causing the current manager session to become
disconnected. Change the return value to 0 for
these cases.

Also change a test for a NULL pointer to be
ast_strlen_zero instead.

(closes issue #13351)
Reported by: Laureano
Patches:
      sipnotify_action_fix.patch uploaded by Laureano (license 265)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-08-22 20:21:49 +00:00
parent bb9dfd155c
commit 769e874125
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -9470,9 +9470,9 @@ static int manager_sipnotify(struct mansession *s, const struct message *m)
struct ast_variable *vars = astman_get_variables(m);
struct sip_pvt *p;
if (!channame) {
if (ast_strlen_zero(channame)) {
astman_send_error(s, m, "SIPNotify requires a channel name");
return -1;
return 0;
}
if (!strncasecmp(channame, "sip/", 4)) {
@@ -9481,7 +9481,7 @@ static int manager_sipnotify(struct mansession *s, const struct message *m)
if (!(p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY))) {
astman_send_error(s, m, "Unable to build sip pvt data for notify (memory/socket error)");
return -1;
return 0;
}
if (create_addr(p, channame, NULL, 0)) {
@@ -9490,7 +9490,7 @@ static int manager_sipnotify(struct mansession *s, const struct message *m)
dialog_unref(p, "unref dialog inside for loop" );
/* sip_destroy(p); */
astman_send_error(s, m, "Could not create address");
return -1;
return 0;
}
/* Notify is outgoing call */