[svn-commits] wdoekes: trunk r370133 - in /trunk: ./ channels/chan_sip.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jul 16 14:58:11 CDT 2012
Author: wdoekes
Date: Mon Jul 16 14:58:00 2012
New Revision: 370133
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370133
Log:
Code cleanup and bugfix in chan_sip outboundproxy parsing.
The bug was clearing the global outboundproxy when a peer-specific
outboundproxy was bad. The cleanup reduces duplicate code.
Review: https://reviewboard.asterisk.org/r/2034/
Reviewed by: Mark Michelson
........
Merged revisions 370131 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 370132 from http://svn.asterisk.org/svn/asterisk/branches/10
Modified:
trunk/ (props changed)
trunk/channels/chan_sip.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=370133&r1=370132&r2=370133
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jul 16 14:58:00 2012
@@ -3227,6 +3227,52 @@
return TRUE;
}
+/*! \brief Parse proxy string and return an ao2_alloc'd proxy. If dest is
+ * non-NULL, no allocation is performed and dest is used instead.
+ * On error NULL is returned. */
+static struct sip_proxy *proxy_from_config(const char *proxy, int sipconf_lineno, struct sip_proxy *dest)
+{
+ char *mutable_proxy, *sep, *name;
+ int allocated = 0;
+
+ if (!dest) {
+ dest = ao2_alloc(sizeof(struct sip_proxy), NULL);
+ if (!dest) {
+ ast_log(LOG_WARNING, "Unable to allocate config storage for proxy\n");
+ return NULL;
+ }
+ allocated = 1;
+ }
+
+ /* Format is: [transport://]name[:port][,force] */
+ mutable_proxy = ast_skip_blanks(ast_strdupa(proxy));
+ sep = strchr(mutable_proxy, ',');
+ if (sep) {
+ *sep++ = '\0';
+ dest->force = !strncasecmp(ast_skip_blanks(sep), "force", 5);
+ } else {
+ dest->force = FALSE;
+ }
+
+ sip_parse_host(mutable_proxy, sipconf_lineno, &name, &dest->port, &dest->transport);
+
+ /* Check that there is a name at all */
+ if (ast_strlen_zero(name)) {
+ if (allocated) {
+ ao2_ref(dest, -1);
+ } else {
+ dest->name[0] = '\0';
+ }
+ return NULL;
+ }
+ ast_copy_string(dest->name, name, sizeof(dest->name));
+
+ /* Resolve host immediately */
+ proxy_update(dest);
+
+ return dest;
+}
+
/*! \brief converts ascii port to int representation. If no
* pt buffer is provided or the pt has errors when being converted
* to an int value, the port provided as the standard is used.
@@ -29449,49 +29495,17 @@
} else if (!strcasecmp(v->name, "fromuser")) {
ast_string_field_set(peer, fromuser, v->value);
} else if (!strcasecmp(v->name, "outboundproxy")) {
- char *host, *proxyname, *sep;
-
+ struct sip_proxy *proxy;
if (ast_strlen_zero(v->value)) {
ast_log(LOG_WARNING, "no value given for outbound proxy on line %d of sip.conf\n", v->lineno);
continue;
}
-
- if (!peer->outboundproxy) {
- peer->outboundproxy = ao2_alloc(sizeof(*peer->outboundproxy), NULL);
- if (!peer->outboundproxy) {
- ast_log(LOG_WARNING, "Unable to allocate config storage for outboundproxy\n");
- continue;
- }
- }
-
- host = ast_strdupa(v->value);
- if (!host) {
- ast_log(LOG_WARNING, "Unable to allocate stack space for parsing outboundproxy\n");
+ proxy = proxy_from_config(v->value, v->lineno, peer->outboundproxy);
+ if (!proxy) {
+ ast_log(LOG_WARNING, "failure parsing the outbound proxy on line %d of sip.conf.\n", v->lineno);
continue;
}
-
- host = ast_skip_blanks(host);
- sep = strchr(host, ',');
- if (sep) {
- *sep++ = '\0';
- peer->outboundproxy->force = !strncasecmp(ast_skip_blanks(sep), "force", 5);
- } else {
- peer->outboundproxy->force = FALSE;
- }
-
- sip_parse_host(host, v->lineno, &proxyname,
- &peer->outboundproxy->port,
- &peer->outboundproxy->transport);
-
- if (ast_strlen_zero(proxyname)) {
- ast_log(LOG_WARNING, "you must specify a name for the outboundproxy on line %d of sip.conf\n", v->lineno);
- sip_cfg.outboundproxy.name[0] = '\0';
- continue;
- }
-
- ast_copy_string(peer->outboundproxy->name, proxyname, sizeof(peer->outboundproxy->name));
-
- proxy_update(peer->outboundproxy);
+ peer->outboundproxy = proxy;
} else if (!strcasecmp(v->name, "host")) {
if (!strcasecmp(v->value, "dynamic")) {
/* They'll register with us */
@@ -30507,41 +30521,16 @@
default_fromdomainport = STANDARD_SIP_PORT;
}
} else if (!strcasecmp(v->name, "outboundproxy")) {
- char *host, *proxyname, *sep;
-
+ struct sip_proxy *proxy;
if (ast_strlen_zero(v->value)) {
ast_log(LOG_WARNING, "no value given for outbound proxy on line %d of sip.conf\n", v->lineno);
continue;
}
-
- host = ast_strdupa(v->value);
- if (!host) {
- ast_log(LOG_WARNING, "Unable to allocate stack space for parsing outboundproxy\n");
+ proxy = proxy_from_config(v->value, v->lineno, &sip_cfg.outboundproxy);
+ if (!proxy) {
+ ast_log(LOG_WARNING, "failure parsing the outbound proxy on line %d of sip.conf.\n", v->lineno);
continue;
}
-
- host = ast_skip_blanks(host);
- sep = strchr(host, ',');
- if (sep) {
- *sep++ = '\0';
- sip_cfg.outboundproxy.force = !strncasecmp(ast_skip_blanks(sep), "force", 5);
- } else {
- sip_cfg.outboundproxy.force = FALSE;
- }
-
- sip_parse_host(host, v->lineno, &proxyname,
- &sip_cfg.outboundproxy.port,
- &sip_cfg.outboundproxy.transport);
-
- if (ast_strlen_zero(proxyname)) {
- ast_log(LOG_WARNING, "you must specify a name for the outboundproxy on line %d of sip.conf\n", v->lineno);
- sip_cfg.outboundproxy.name[0] = '\0';
- continue;
- }
-
- ast_copy_string(sip_cfg.outboundproxy.name, proxyname, sizeof(sip_cfg.outboundproxy.name));
-
- proxy_update(&sip_cfg.outboundproxy);
} else if (!strcasecmp(v->name, "autocreatepeer")) {
if (!strcasecmp(v->value, "persist")) {
sip_cfg.autocreatepeer = AUTOPEERS_PERSIST;
More information about the svn-commits
mailing list