[svn-commits] oej: branch oej/pine-multiple-externip-trunk r378023 - /team/oej/pine-multipl...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Dec 14 06:16:44 2012
New Revision: 378023

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378023
Log:
Fixes based on review r1471

Modified:
    team/oej/pine-multiple-externip-trunk/channels/chan_sip.c

Modified: team/oej/pine-multiple-externip-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pine-multiple-externip-trunk/channels/chan_sip.c?view=diff&rev=378023&r1=378022&r2=378023
==============================================================================
--- team/oej/pine-multiple-externip-trunk/channels/chan_sip.c (original)
+++ team/oej/pine-multiple-externip-trunk/channels/chan_sip.c Fri Dec 14 06:16:44 2012
@@ -4017,7 +4017,7 @@
 			}
 		}
 		ast_debug(1, "Target address %s is not local, substituting to externaddr %s\n",
-			  ast_sockaddr_stringify(them), ast_sockaddr_stringify(myexternaddr));
+			  ast_strdupa(ast_sockaddr_stringify(them)), ast_sockaddr_stringify(myexternaddr));
 	} else {
 		/* no remapping, but we bind to a specific address, so use it. */
 		switch (p->socket.type) {
@@ -30211,6 +30211,7 @@
 	ast_string_field_set(peer, engine, default_engine);
 	ast_sockaddr_setnull(&peer->addr);
 	ast_sockaddr_setnull(&peer->defaddr);
+	ast_sockaddr_setnull(&peer->externip);
 	ast_format_cap_copy(peer->caps, sip_cfg.caps);
 	peer->maxcallbitrate = default_maxcallbitrate;
 	peer->rtptimeout = global_rtptimeout;
@@ -30482,7 +30483,7 @@
 				if (localaddr == NULL) {
 					ast_log(LOG_ERROR, "Externaddr for peer %s not enabled, since we have no local networks configured in [general]\n", peer->name);
 				} else {
-					if (!ast_strlen_zero(v->value) && ast_parse_arg(v->value, PARSE_ADDR, &peer->externaddr)) {
+					if (ast_parse_arg(v->value, PARSE_ADDR, &peer->externaddr)) {
 						ast_log(LOG_WARNING, "Invalid address for externaddr keyword: %s for peer %s\n", v->value, peer->name);
 					}
 				}