diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 15:03:12 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 15:03:12 +0000 |
| commit | f80df80d45ca54d38e00162371f87b4011d9876c (patch) | |
| tree | e0688a7abbb88e17d87a97f2cd98334cd6f9e9ce | |
| parent | cb1419a38a702d2b7160ced72928a4aec7c2ccc2 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41356 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4f45d50fc..37fd1746a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12477,7 +12477,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; } @@ -12765,7 +12765,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 */ |