diff options
author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 20:01:28 +0000 |
---|---|---|
committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 20:01:28 +0000 |
commit | 8aafae96325b6d881a9286288349644b461be134 (patch) | |
tree | bdd1acee78aaa587d3c7d15f33c2e0d65dc4fe49 | |
parent | 5fd6593f054c8abd83a4f4c367e7339011580801 (diff) |
Merged revisions 61072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r61072 | oej | 2007-04-09 21:58:17 +0200 (Mon, 09 Apr 2007) | 11 lines
Merged revisions 61038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r61038 | oej | 2007-04-09 21:38:59 +0200 (Mon, 09 Apr 2007) | 3 lines
- Don't send ActionID before Response: header.
- Don't use a blank in an AMI header
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@61073 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c5e502235..5c3cac5f5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10604,7 +10604,6 @@ static char mandescr_show_peer[] = /*! \brief Show SIP peers in the manager API */ static int manager_sip_show_peer(struct mansession *s, const struct message *m) { - const char *id = astman_get_header(m,"ActionID"); const char *a[4]; const char *peer; int ret; @@ -10619,8 +10618,6 @@ static int manager_sip_show_peer(struct mansession *s, const struct message *m) a[2] = "peer"; a[3] = peer; - if (!ast_strlen_zero(id)) - astman_append(s, "ActionID: %s\r\n",id); ret = _sip_show_peer(1, -1, s, m, 4, a); astman_append(s, "\r\n\r\n" ); return ret; @@ -10655,9 +10652,13 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, const struct m load_realtime = (argc == 5 && !strcmp(argv[4], "load")) ? TRUE : FALSE; peer = find_peer(argv[3], NULL, load_realtime); if (s) { /* Manager */ - if (peer) + if (peer) { + const char *id = astman_get_header(m,"ActionID"); + astman_append(s, "Response: Success\r\n"); - else { + if (!ast_strlen_zero(id)) + astman_append(s, "ActionID: %s\r\n",id); + } else { snprintf (cbuf, sizeof(cbuf), "Peer %s not found.\n", argv[3]); astman_send_error(s, m, cbuf); return 0; |