[asterisk-commits] jpeeler: branch jpeeler/sip-dnsmgr r112123 - in /team/jpeeler/sip-dnsmgr: cha...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr  1 11:21:57 2008
New Revision: 112123

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112123
Log:
removed a bunch of debugging logging

Modified:
    team/jpeeler/sip-dnsmgr/channels/chan_sip.c
    team/jpeeler/sip-dnsmgr/main/acl.c

Modified: team/jpeeler/sip-dnsmgr/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/sip-dnsmgr/channels/chan_sip.c?view=diff&rev=112123&r1=112122&r2=112123
==============================================================================
--- team/jpeeler/sip-dnsmgr/channels/chan_sip.c (original)
+++ team/jpeeler/sip-dnsmgr/channels/chan_sip.c Tue Apr  1 11:21:57 2008
@@ -3934,7 +3934,6 @@
  */
 static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
 {
-	ast_log(LOG_DEBUG, "peer reference existed\n");
 	dialog->socket = peer->socket;
 
 	if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) &&
@@ -4079,11 +4078,9 @@
 
 	if (peer) {
 		int res = create_addr_from_peer(dialog, peer);
-		ast_log(LOG_DEBUG, "Peer found\n");
 		unref_peer(peer);
 		return res;
 	} else {
-		ast_log(LOG_DEBUG, "Peer NOT found\n");
 		/* Setup default parameters for this dialog's socket. Currently we only support regular UDP SIP as the default */
 		dialog->socket.type = SIP_TRANSPORT_UDP;
 		dialog->socket.port = bindaddr.sin_port;
@@ -4106,7 +4103,6 @@
 		} else {
 			portno = ntohs(sin->sin_port);
 		}
-		ast_log(LOG_DEBUG, "DNS manager address showing portno=%d\n", portno);
 	} else {
 
 		/* Let's see if we can find the host in DNS. First try DNS SRV records,
@@ -4116,11 +4112,9 @@
 		if (global_srvlookup) {
 			char service[MAXHOSTNAMELEN];
 			int tportno;
-			ast_log(LOG_DEBUG, "******************************** global_srvlookup=%d host=%s\n", global_srvlookup, host);
 	
 			snprintf(service, sizeof(service), "_sip._%s.%s", get_transport(dialog->socket.type), peername);
 			srv_ret = ast_get_srv(NULL, host, sizeof(host), &tportno, service);
-			ast_log(LOG_DEBUG, "******************************** srv_ret=%d host=%s service=%s\n", srv_ret, host, service);
 			if (srv_ret > 0) {
 				hostn = host;
 				portno = tportno;
@@ -9227,13 +9221,8 @@
 
 	if (r->dnsmgr == NULL) {
 		char transport[MAXHOSTNAMELEN];
- 
 		snprintf(transport, sizeof(transport), "_sip._%s", get_transport(r->transport)); /* have to use static get_transport function */
-		ast_log(LOG_DEBUG, "hostname: %s portno:%d sin_family:%d\n", r->hostname, r->portno, r->us.sin_family);
 		ast_dnsmgr_lookup(r->hostname, &r->us, &r->dnsmgr, global_srvlookup ? transport : NULL);
-		//ast_log(LOG_DEBUG, "after dnsmgr lookup port=%d\n", htons(r->us.sin_port));
-	} else {
-		ast_log(LOG_DEBUG, "DNS manager detected, r->us.sin_addr=%s r->us.sin_port=%d r->us.sin_family=%d\n", ast_inet_ntoa(r->us.sin_addr), ntohs(r->us.sin_port), r->us.sin_family);
 	}
 
 	if (r->call) {	/* We have a registration */
@@ -9282,18 +9271,12 @@
 			return 0;
 		}
 
-		ast_log(LOG_DEBUG, "sip_registry port set to %d\n", ntohs(r->us.sin_port));
-		ast_log(LOG_DEBUG, "p->sa.sin_port=%d\n", ntohs(p->sa.sin_port));
-
-
 		/* Copy back Call-ID in case create_addr changed it */
 		ast_string_field_set(r, callid, p->callid);
 		if (!r->dnsmgr && r->portno) { /* TODO: this might could just be removed since dnsmgr will be present? */
-			ast_log(LOG_DEBUG, "port from sip_registry (%d) is setting stuff in sip_pvt\n", r->portno);
 			p->sa.sin_port = htons(r->portno);
 			p->recv.sin_port = htons(r->portno);
 		} else {	/* Set registry port to the port set from the peer definition/srv or default */
-			ast_log(LOG_DEBUG, "port from sip_pvt (%d) is setting stuff in sip_registry\n", ntohs(p->sa.sin_port));
 			r->portno = ntohs(p->sa.sin_port);
 		}
 		ast_set_flag(&p->flags[0], SIP_OUTGOING);	/* Registration is outgoing call */
@@ -19808,9 +19791,6 @@
 	char callback[256] = "";
 	const char *srvlookup = NULL;
 	static int deprecation_warning = 1;
-
-	/* jeff: remove */
-	ast_log(LOG_DEBUG, "build_peer called on %s\n", name);
 
 	if (!realtime)
 		/* Note we do NOT use find_peer here, to avoid realtime recursion */

Modified: team/jpeeler/sip-dnsmgr/main/acl.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/sip-dnsmgr/main/acl.c?view=diff&rev=112123&r1=112122&r2=112123
==============================================================================
--- team/jpeeler/sip-dnsmgr/main/acl.c (original)
+++ team/jpeeler/sip-dnsmgr/main/acl.c Tue Apr  1 11:21:57 2008
@@ -364,7 +364,6 @@
 	int tportno = ntohs(sin->sin_port);
 	if (service) {
 		snprintf(srv, sizeof(srv), "%s.%s", service, value);
-		ast_log(LOG_DEBUG, "srv=%s\n", srv);
 		if (ast_get_srv(NULL, host, sizeof(host), &tportno, srv) > 0) {
 			sin->sin_port = htons(tportno);
 			value = host;