[asterisk-commits] jpeeler: branch jpeeler/sip-dnsmgr r112128 - /team/jpeeler/sip-dnsmgr/channels/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr  1 12:07:03 2008
New Revision: 112128

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112128
Log:
make chan_iax2 compile with new dnsmgr changes

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

Modified: team/jpeeler/sip-dnsmgr/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/sip-dnsmgr/channels/chan_iax2.c?view=diff&rev=112128&r1=112127&r2=112128
==============================================================================
--- team/jpeeler/sip-dnsmgr/channels/chan_iax2.c (original)
+++ team/jpeeler/sip-dnsmgr/channels/chan_iax2.c Tue Apr  1 12:07:03 2008
@@ -6427,7 +6427,7 @@
 	if (!(reg = ast_calloc(1, sizeof(*reg))))
 		return -1;
 
-	if (ast_dnsmgr_lookup(hostname, &reg->addr.sin_addr, &reg->dnsmgr, NULL) < 0) {
+	if (ast_dnsmgr_lookup(hostname, &reg->addr, &reg->dnsmgr, NULL) < 0) {
 		ast_free(reg);
 		return -1;
 	}
@@ -10095,7 +10095,7 @@
 					/* Non-dynamic.  Make sure we become that way if we're not */
 					AST_SCHED_DEL(sched, peer->expire);
 					ast_clear_flag(peer, IAX_DYNAMIC);
-					if (ast_dnsmgr_lookup(v->value, &peer->addr.sin_addr, &peer->dnsmgr, NULL))
+					if (ast_dnsmgr_lookup(v->value, &peer->addr, &peer->dnsmgr, NULL))
 						return peer_unref(peer);
 					if (!peer->addr.sin_port)
 						peer->addr.sin_port = htons(IAX_DEFAULT_PORTNO);

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=112128&r1=112127&r2=112128
==============================================================================
--- team/jpeeler/sip-dnsmgr/channels/chan_sip.c (original)
+++ team/jpeeler/sip-dnsmgr/channels/chan_sip.c Tue Apr  1 12:07:03 2008
@@ -9273,7 +9273,7 @@
 
 		/* 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? */
+		if (!r->dnsmgr && 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 */