diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 05:03:52 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-15 05:03:52 +0000 |
commit | 16115ffeb0c21150aa1e4a622ef64343e699978f (patch) | |
tree | 7c7322e333bb325394bb0e57d828afa29159157f /channels | |
parent | a8feaeddd54a95ffd4723ed4c3b5d5bc9aa2f909 (diff) |
Merged revisions 252442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r252442 | tilghman | 2010-03-14 23:25:35 -0500 (Sun, 14 Mar 2010) | 7 lines
THIS IS NOT PYTHON. Indentation doesn't matter, only braces do.
(closes issue #17025)
Reported by: smurfix
Patches:
sip.patch uploaded by smurfix (license 547)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@252443 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7bd17a3ad..b97c8cb9a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12327,15 +12327,31 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr /* URI not found */ if (res == AUTH_PEER_NOT_DYNAMIC) { transmit_response(p, "403 Forbidden", &p->initreq); - if (global_authfailureevents) - manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Rejected\r\nCause: AUTH_PEER_NOT_DYNAMIC\r\nAddress: %s\r\nPort: %d\r\n", + if (global_authfailureevents) { + manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", + "ChannelType: SIP\r\n" + "Peer: SIP/%s\r\n" + "PeerStatus: Rejected\r\n" + "Cause: AUTH_PEER_NOT_DYNAMIC\r\n" + "Address: %s\r\n" + "Port: %d\r\n", name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); } - else + } else { transmit_response(p, "404 Not found", &p->initreq); - if (global_authfailureevents) - manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Rejected\r\nCause: %s\r\nAddress: %s\r\nPort: %d\r\n", - (res == AUTH_USERNAME_MISMATCH) ? "AUTH_USERNAME_MISMATCH" : "URI_NOT_FOUND", name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); + if (global_authfailureevents) { + manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", + "ChannelType: SIP\r\n" + "Peer: SIP/%s\r\n" + "PeerStatus: Rejected\r\n" + "Cause: %s\r\n" + "Address: %s\r\n" + "Port: %d\r\n", + name, + (res == AUTH_USERNAME_MISMATCH) ? "AUTH_USERNAME_MISMATCH" : "URI_NOT_FOUND", + ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); + } + } } break; case AUTH_BAD_TRANSPORT: |