[svn-commits] mmichelson: branch mmichelson/acl-v6 r276209 - /team/mmichelson/acl-v6/channels/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jul 13 16:57:54 2010
New Revision: 276209

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276209
Log:
Fix chan_sip.c compile errors.


Modified:
    team/mmichelson/acl-v6/channels/chan_sip.c

Modified: team/mmichelson/acl-v6/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/acl-v6/channels/chan_sip.c?view=diff&rev=276209&r1=276208&r2=276209
==============================================================================
--- team/mmichelson/acl-v6/channels/chan_sip.c (original)
+++ team/mmichelson/acl-v6/channels/chan_sip.c Tue Jul 13 16:57:54 2010
@@ -3095,7 +3095,7 @@
 	}
 
 	if (want_remap &&
-	    (!sip_cfg.matchexterniplocally || !ast_apply_ha(localaddr, &us)) ) {
+	    (!sip_cfg.matchexterniplocally || !ast_apply_ha(localaddr, us)) ) {
 		/* if we used externhost or stun, see if it is time to refresh the info */
 		if (externexpire && time(NULL) >= externexpire) {
 			if (stunaddr.sin_addr.s_addr) {
@@ -16366,12 +16366,11 @@
 	{
 		struct ast_ha *d;
 		const char *prefix = "Localnet:";
-		char buf[INET_ADDRSTRLEN]; /* need to print two addresses */
 
 		for (d = localaddr; d ; prefix = "", d = d->next) {
 			ast_cli(a->fd, "  %-24s%s/%s\n",
-			    prefix, ast_inet_ntoa(d->netaddr),
-			    inet_ntop(AF_INET, &d->netmask, buf, sizeof(buf)) );
+			    prefix, ast_sockaddr_stringify_addr(&d->addr),
+			    ast_sockaddr_stringify_addr(&d->netmask));
 		}
 	}
 	ast_cli(a->fd, "  STUN server:            %s:%d\n", ast_inet_ntoa(stunaddr.sin_addr), ntohs(stunaddr.sin_port));
@@ -26823,7 +26822,6 @@
 static int apply_directmedia_ha(struct sip_pvt *p, const char *op)
 {
 	struct ast_sockaddr us = { { 0, }, }, them = { { 0, }, };
-	struct sockaddr_in them_sin;
 	int res = AST_SENSE_ALLOW;
 
 	ast_rtp_instance_get_remote_address(p->rtp, &them);