aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-30 14:31:47 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2006-08-30 14:31:47 +0000
commite20013c60f1e5aaf0693b6baa295f387fd120b04 (patch)
tree0d45b3b817eb340458503b44e15abdc708e851c8
parentc6fb12870be6994302da1c71891cedd70344a78d (diff)
Issue 7822 - don't use SRV lookups if it's disabled.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@41334 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 629baeb5b..636760f88 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12367,7 +12367,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
peer->expire = -1;
ast_clear_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC);
if (!obproxyfound || !strcasecmp(v->name, "outboundproxy")) {
- if (ast_get_ip_or_srv(&peer->addr, v->value, "_sip._udp")) {
+ if (ast_get_ip_or_srv(&peer->addr, v->value, srvlookup ? "_sip._udp" : NULL)) {
ASTOBJ_UNREF(peer, sip_destroy_peer);
return NULL;
}
@@ -12655,7 +12655,7 @@ static int reload_config(void)
} else if (!strcasecmp(v->name, "fromdomain")) {
ast_copy_string(default_fromdomain, v->value, sizeof(default_fromdomain));
} else if (!strcasecmp(v->name, "outboundproxy")) {
- if (ast_get_ip_or_srv(&outboundproxyip, v->value, "_sip._udp") < 0)
+ if (ast_get_ip_or_srv(&outboundproxyip, v->value, srvlookup ? "_sip._udp" : NULL) < 0)
ast_log(LOG_WARNING, "Unable to locate host '%s'\n", v->value);
} else if (!strcasecmp(v->name, "outboundproxyport")) {
/* Port needs to be after IP */