[svn-commits] simon.perreault: branch group/v6-new r273977 - /team/group/v6-new/channels/

[SVN commits to the Digium repositories]

Author: simon.perreault
Date: Mon Jul  5 09:52:09 2010
New Revision: 273977

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273977
Log:
Re-added Port manager variable

Modified:
    team/group/v6-new/channels/chan_sip.c

Modified: team/group/v6-new/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/channels/chan_sip.c?view=diff&rev=273977&r1=273976&r2=273977
==============================================================================
--- team/group/v6-new/channels/chan_sip.c (original)
+++ team/group/v6-new/channels/chan_sip.c Mon Jul  5 09:52:09 2010
@@ -13336,9 +13336,17 @@
 			if (sip_cfg.alwaysauthreject) {
 				transmit_fake_auth_response(p, SIP_REGISTER, &p->initreq, XMIT_UNRELIABLE);
 				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\n", name,
-						res == AUTH_PEER_NOT_DYNAMIC ? "AUTH_PEER_NOT_DYNAMIC" : "URI_NOT_FOUND",
-						ast_sockaddr_stringify(addr));
+					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: %s\r\n",
+						      name,
+						      res == AUTH_PEER_NOT_DYNAMIC ? "AUTH_PEER_NOT_DYNAMIC" : "URI_NOT_FOUND",
+						      ast_sockaddr_stringify_addr(addr),
+						      ast_sockaddr_stringify_port(addr));
 				}
 			} else {
 				/* URI not found */
@@ -13350,8 +13358,11 @@
 							"Peer: SIP/%s\r\n"
 							"PeerStatus: Rejected\r\n"
 							"Cause: AUTH_PEER_NOT_DYNAMIC\r\n"
-							"Address: %s\r\n",
-							name, ast_sockaddr_stringify(addr));
+							"Address: %s\r\n"
+							"Port: %s\r\n",
+							name,
+							ast_sockaddr_stringify_addr(addr),
+							ast_sockaddr_stringify_port(addr));
 					}
 				} else {
 					transmit_response(p, "404 Not found", &p->initreq);
@@ -13361,10 +13372,12 @@
 							"Peer: SIP/%s\r\n"
 							"PeerStatus: Rejected\r\n"
 							"Cause: %s\r\n"
-							"Address: %s\r\n",
+							"Address: %s\r\n"
+							"Port: %s\r\n",
 							name,
 							(res == AUTH_USERNAME_MISMATCH) ? "AUTH_USERNAME_MISMATCH" : "URI_NOT_FOUND",
-							ast_sockaddr_stringify(addr));
+							ast_sockaddr_stringify_addr(addr),
+							ast_sockaddr_stringify_port(addr));
 					}
 				}
 			}