diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-08-29 19:38:52 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-08-29 19:38:52 +0000 |
| commit | 6c07c904aaae4a7d0ab7c74ade39b52365359178 (patch) | |
| tree | 54406df416e9a452c36bbf21dfe5f670ac07b799 | |
| parent | adefb772c430828b98e4c7f28d3c68d9f69f4847 (diff) | |
chan_sip: Change manager event to confirm SIPqualifypeer into an ack
Matt Jordan informed me that it was more appropriate to use an
astman_send_ack here instead of making an event response. I've also
used this opportunity to update UPGRADE.txt to mention this change
in behavior.
(issue AST-969)
Reported by: John Bigelow
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | UPGRADE.txt | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index 0e6a942ee..68790a8be 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -92,6 +92,8 @@ AMI: the DBDel action does. - The IAX2 PeerStatus event now sends a 'Port' header. In Asterisk 10, this was erroneously being sent as a 'Post' header. + - The SIP SIPqualifypeer action now receives an appropriate response when it + is completed successfully. It also no longer sends extra blank lines afterwards. CCSS: - Macro is deprecated. Use cc_callback_sub instead of cc_callback_macro diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f5d5a79c6..c5badfe90 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -18934,14 +18934,6 @@ static char *_sip_qualify_peer(int type, int fd, struct mansession *s, const str struct sip_peer *peer; int load_realtime; - const char *id = astman_get_header(m,"ActionID"); - char idText[256] = ""; - - if (!ast_strlen_zero(id)) { - snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id); - } - - if (argc < 4) return CLI_SHOWUSAGE; @@ -18958,11 +18950,7 @@ static char *_sip_qualify_peer(int type, int fd, struct mansession *s, const str } if (type != 0) { - astman_append(s, - "Event: SIPqualifypeerComplete\r\n" - "%s" - "\r\n", - idText); + astman_send_ack(s, m, "Qualify Peer successful"); } return CLI_SUCCESS; |