Ref the thread from september,
<http://lists.sip-router.org/pipermail/sr-users/2013-September/079760.html>
I've fixed SRV lookups to work when use_dns_failover is on and the
domain has no _sip._udp record. An example is cisco.com:
% host -t SRV _sip._udp.cisco.com
Host _sip._udp.cisco.com not found: 3(NXDOMAIN)
% host -t SRV _sip._tcp.cisco.com
_sip._tcp.cisco.com has SRV record 1 0 5060 vcsgw.cisco.com.
% host -t SRV _sips._tcp.cisco.com
_sips._tcp.cisco.com has SRV record 1 0 5061 vcsgw.cisco.com.
Currently attempting to call an uri at cisco.com will fail, unless
manually forcing the protocol.
While fixing the the issue I refactored a lot of code and fixed a plenty of
comments as the lookup code has clearly been copy pasted more than once.
Patch is attached and should probably be reviewed thoroughly as it touches
pretty core usage.
See some of you at Astricon tomorrow?
--
Øyvind Kolbu
diff --git a/dns_cache.c b/dns_cache.c
index 5690cb6..8d86c02 100644
--- a/dns_cache.c
+++ b/dns_cache.c
@@ -2714,33 +2714,11 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port,
}
switch(srv_proto){
- case PROTO_NONE: /* no proto specified, use udp */
- if (proto)
- *proto=PROTO_UDP;
- /* no break */
case PROTO_UDP:
- memcpy(tmp, SRV_UDP_PREFIX, SRV_UDP_PREFIX_LEN);
- memcpy(tmp+SRV_UDP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_UDP_PREFIX_LEN + name->len] = '\0';
- len=SRV_UDP_PREFIX_LEN + name->len;
- break;
case PROTO_TCP:
- memcpy(tmp, SRV_TCP_PREFIX, SRV_TCP_PREFIX_LEN);
- memcpy(tmp+SRV_TCP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TCP_PREFIX_LEN + name->len] = '\0';
- len=SRV_TCP_PREFIX_LEN + name->len;
- break;
case PROTO_TLS:
- memcpy(tmp, SRV_TLS_PREFIX, SRV_TLS_PREFIX_LEN);
- memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
- len=SRV_TLS_PREFIX_LEN + name->len;
- break;
case PROTO_SCTP:
- memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
- memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
- len=SRV_SCTP_PREFIX_LEN + name->len;
+ create_srv_name(srv_proto, name, tmp);
break;
default:
LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",
@@ -3282,23 +3260,24 @@ error:
* h must be initialized prior to calling this function and can be used to
* get the subsequent ips
* returns: <0 on error
- * 0 on success and it fills *ip, *port, dns_sip_resolve_h
- * WARNING: when finished, dns_sip_resolve_put(h) must be called!
+ * 0 on success and it fills *ip, *port, *h
*/
inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name,
struct ip_addr* ip, unsigned short* port, char* proto,
int flags)
{
+ struct dns_srv_proto_t srv_proto_list[PROTO_LAST];
static char tmp[MAX_DNS_NAME]; /* tmp. buff. for SRV lookups */
- int len;
str srv_name;
struct ip_addr* tmp_ip;
int ret;
struct hostent* he;
- char srv_proto;
+ size_t i,list_len;
+ char origproto;
+ origproto = *proto;
if (dns_hash==0){ /* not init => use normal, non-cached version */
- LOG(L_WARN, "WARNING: dns_sip_resolve: called before dns cache"
+ LOG(L_WARN, "WARNING: dns_srv_sip_resolve: called before dns cache"
" initialization\n");
h->srv=h->a=0;
he=_sip_resolvehost(name, port, proto);
@@ -3308,25 +3287,19 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name,
}
return -E_DNS_NO_SRV;
}
- len=0;
if ((h->srv==0) && (h->a==0)){ /* first call */
- if (proto){ /* makes sure we have a protocol set*/
- if (*proto==0)
- *proto=srv_proto=PROTO_UDP; /* default */
- else
- srv_proto=*proto;
- }else{
- srv_proto=PROTO_UDP;
+ if (proto && *proto==0){ /* makes sure we have a protocol set*/
+ *proto=PROTO_UDP; /* default */
}
- h->port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we
+ h->port=(*proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we
don't find another */
- h->proto=srv_proto; /* store initial protocol */
+ h->proto=*proto; /* store initial protocol */
if (port){
if (*port==0){
/* try SRV if initial call & no port specified
* (draft-ietf-sip-srv-06) */
if ((name->len+SRV_MAX_PREFIX_LEN+1)>MAX_DNS_NAME){
- LOG(L_WARN, "WARNING: dns_sip_resolvehost: domain name too"
+ LOG(L_WARN, "WARNING: dns_srv_sip_resolve: domain name too"
" long (%d), unable to perform SRV lookup\n",
name->len);
}else{
@@ -3349,51 +3322,33 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name,
return 0;
}
- switch(srv_proto){
- case PROTO_NONE: /* no proto specified, use udp */
- if (proto)
- *proto=PROTO_UDP;
- /* no break */
- case PROTO_UDP:
- memcpy(tmp, SRV_UDP_PREFIX, SRV_UDP_PREFIX_LEN);
- memcpy(tmp+SRV_UDP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_UDP_PREFIX_LEN + name->len] = '\0';
- len=SRV_UDP_PREFIX_LEN + name->len;
- break;
- case PROTO_TCP:
- memcpy(tmp, SRV_TCP_PREFIX, SRV_TCP_PREFIX_LEN);
- memcpy(tmp+SRV_TCP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TCP_PREFIX_LEN + name->len] = '\0';
- len=SRV_TCP_PREFIX_LEN + name->len;
- break;
- case PROTO_TLS:
- memcpy(tmp, SRV_TLS_PREFIX, SRV_TLS_PREFIX_LEN);
- memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
- len=SRV_TLS_PREFIX_LEN + name->len;
- break;
- case PROTO_SCTP:
- memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
- memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
- len=SRV_SCTP_PREFIX_LEN + name->len;
- break;
- default:
- LOG(L_CRIT, "BUG: sip_resolvehost: "
- "unknown proto %d\n", (int)srv_proto);
- return -E_DNS_CRITICAL;
- }
- srv_name.s=tmp;
- srv_name.len=len;
- if ((ret=dns_srv_resolve_ip(h, &srv_name, ip,
- port, flags))>=0)
- {
+ /* looping on the ordered list until we found a protocol what has srv record */
+ list_len = create_srv_pref_list(&origproto, srv_proto_list);
+ for (i=0; i<list_len;i++) {
+ switch (srv_proto_list[i].proto) {
+ case PROTO_UDP:
+ case PROTO_TCP:
+ case PROTO_TLS:
+ case PROTO_SCTP:
+ create_srv_name(srv_proto_list[i].proto, name, tmp);
+ break;
+ default:
+ LOG(L_CRIT, "BUG: dns_srv_sip_resolve: "
+ "unknown proto %d\n", (int)srv_proto_list[i].proto);
+ return -E_DNS_CRITICAL;
+ }
+ srv_name.s=tmp;
+ srv_name.len=strlen(tmp);
+ if ((ret=dns_srv_resolve_ip(h, &srv_name, ip, port, flags))>=0)
+ {
+ *proto = srv_proto_list[i].proto;
#ifdef DNS_CACHE_DEBUG
- DBG("dns_sip_resolve(%.*s, %d, %d), srv0, ret=%d\n",
- name->len, name->s, h->srv_no, h->ip_no, ret);
+ DBG("dns_srv_sip_resolve(%.*s, %d, %d), srv0, ret=%d\n",
+ name->len, name->s, h->srv_no, h->ip_no, ret);
#endif
- /* proto already set */
- return ret;
+ /* proto already set */
+ return ret;
+ }
}
}
}else{ /* if (*port==0) */
@@ -3408,13 +3363,12 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name,
ret=dns_srv_resolve_ip(h, &srv_name, ip, port, flags);
if (proto)
*proto=h->proto;
- DBG("dns_sip_resolve(%.*s, %d, %d), srv, ret=%d\n",
+ DBG("dns_srv_sip_resolve(%.*s, %d, %d), srv, ret=%d\n",
name->len, name->s, h->srv_no, h->ip_no, ret);
return ret;
}
-/*skip_srv:*/
if (name->len >= MAX_DNS_NAME) {
- LOG(L_ERR, "dns_sip_resolve: domain name too long\n");
+ LOG(L_ERR, "dns_srv_sip_resolve: domain name too long\n");
return -E_DNS_NAME_TOO_LONG;
}
ret=dns_ip_resolve(&h->a, &h->ip_no, name, ip, flags);
@@ -3423,7 +3377,7 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name,
if (proto)
*proto=h->proto;
#ifdef DNS_CACHE_DEBUG
- DBG("dns_sip_resolve(%.*s, %d, %d), ip, ret=%d\n",
+ DBG("dns_srv_sip_resolve(%.*s, %d, %d), ip, ret=%d\n",
name->len, name->s, h->srv_no, h->ip_no, ret);
#endif
return ret;
@@ -3453,11 +3407,12 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name,
struct ip_addr* tmp_ip;
naptr_bmp_t tried_bmp;
struct dns_hash_entry* e;
- char n_proto;
+ char n_proto, origproto;
str srv_name;
int ret;
ret=-E_DNS_NO_NAPTR;
+ origproto=*proto;
if (dns_hash==0){ /* not init => use normal, non-cached version */
LOG(L_WARN, "WARNING: dns_sip_resolve: called before dns cache"
" initialization\n");
@@ -3517,6 +3472,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name,
from previous dns_srv_sip_resolve calls */
}
naptr_not_found:
+ *proto=origproto;
return dns_srv_sip_resolve(h, name, ip, port, proto, flags);
}
#endif /* USE_NAPTR */
@@ -3534,7 +3490,6 @@ naptr_not_found:
* get the subsequent ips
* returns: <0 on error
* 0 on success and it fills *ip, *port, dns_sip_resolve_h
- * WARNING: when finished, dns_sip_resolve_put(h) must be called!
*/
int dns_sip_resolve(struct dns_srv_handle* h, str* name,
struct ip_addr* ip, unsigned short* port, char* proto,
diff --git a/resolve.c b/resolve.c
index e29e189..bced952 100644
--- a/resolve.c
+++ b/resolve.c
@@ -1210,7 +1210,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port,
srv_head=0;
srv_target=0;
if (name->len >= MAX_DNS_NAME) {
- LOG(L_ERR, "sip_resolvehost: domain name too long\n");
+ LOG(L_ERR, "srv_sip_resolvehost: domain name too long\n");
he=0;
goto end;
}
@@ -1255,37 +1255,19 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port,
goto end;
}
if ((name->len+SRV_MAX_PREFIX_LEN+1)>MAX_DNS_NAME){
- LOG(L_WARN, "WARNING: sip_resolvehost: domain name too long (%d),"
+ LOG(L_WARN, "WARNING: srv_sip_resolvehost: domain name too long (%d),"
" unable to perform SRV lookup\n", name->len);
}else{
switch(srv_proto){
- case PROTO_NONE: /* no proto specified, use udp */
- if (proto)
- *proto=PROTO_UDP;
- /* no break */
case PROTO_UDP:
- memcpy(tmp, SRV_UDP_PREFIX, SRV_UDP_PREFIX_LEN);
- memcpy(tmp+SRV_UDP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_UDP_PREFIX_LEN + name->len] = '\0';
- break;
case PROTO_TCP:
- memcpy(tmp, SRV_TCP_PREFIX, SRV_TCP_PREFIX_LEN);
- memcpy(tmp+SRV_TCP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TCP_PREFIX_LEN + name->len] = '\0';
- break;
case PROTO_TLS:
- memcpy(tmp, SRV_TLS_PREFIX, SRV_TLS_PREFIX_LEN);
- memcpy(tmp+SRV_TLS_PREFIX_LEN, name->s, name->len);
- tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0';
- break;
case PROTO_SCTP:
- memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
- memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len);
- tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
+ create_srv_name(srv_proto, name, tmp);
break;
default:
- LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",
+ LOG(L_CRIT, "BUG: srv_sip_resolvehost: unknown proto %d\n",
srv_proto);
he=0;
goto end;
@@ -1297,7 +1279,7 @@ do_srv:
if (l->type!=T_SRV) continue;
srv=(struct srv_rdata*) l->rdata;
if (srv==0){
- LOG(L_CRIT, "sip_resolvehost: BUG: null rdata\n");
+ LOG(L_CRIT, "srv_sip_resolvehost: BUG: null rdata\n");
/* cleanup on exit only */
break;
}
@@ -1305,7 +1287,7 @@ do_srv:
if (he!=0){
/* we found it*/
#ifdef RESOLVE_DBG
- DBG("sip_resolvehost: found SRV(%s) = %s:%d in AR\n",
+ DBG("srv_sip_resolvehost: found SRV(%s) = %s:%d in AR\n",
srv_target, srv->name, srv->port);
#endif
*port=srv->port;
@@ -1318,7 +1300,7 @@ do_srv:
if (l->type!=T_SRV) continue; /*should never happen*/
srv=(struct srv_rdata*) l->rdata;
if (srv==0){
- LOG(L_CRIT, "sip_resolvehost: BUG: null rdata\n");
+ LOG(L_CRIT, "srv_sip_resolvehost: BUG: null rdata\n");
/* cleanup on exit only */
break;
}
@@ -1326,7 +1308,7 @@ do_srv:
if (he!=0){
/* we found it*/
#ifdef RESOLVE_DBG
- DBG("sip_resolvehost: SRV(%s) = %s:%d\n",
+ DBG("srv_sip_resolvehost: SRV(%s) = %s:%d\n",
srv_target, srv->name, srv->port);
#endif
*port=srv->port;
@@ -1342,12 +1324,11 @@ do_srv:
}
/* cleanup on exit */
#ifdef RESOLVE_DBG
- DBG("sip_resolvehost: no SRV record found for %.*s,"
+ DBG("srv_sip_resolvehost: no SRV record found for %.*s,"
" trying 'normal' lookup...\n", name->len, name->s);
#endif
}
}
-/*skip_srv:*/
if (likely(!zt)){
memcpy(tmp, name->s, name->len);
tmp[name->len] = '\0';
@@ -1448,6 +1429,89 @@ end:
return 0;
}
+/* Prepend srv prefix according to the proto. */
+void create_srv_name(char proto, str *name, char *srv) {
+ switch (proto) {
+ case PROTO_UDP:
+ memcpy(srv, SRV_UDP_PREFIX, SRV_UDP_PREFIX_LEN);
+ memcpy(srv+SRV_UDP_PREFIX_LEN, name->s, name->len);
+ srv[SRV_UDP_PREFIX_LEN + name->len] = '\0';
+ break;
+ case PROTO_TCP:
+ memcpy(srv, SRV_TCP_PREFIX, SRV_TCP_PREFIX_LEN);
+ memcpy(srv+SRV_TCP_PREFIX_LEN, name->s, name->len);
+ srv[SRV_TCP_PREFIX_LEN + name->len] = '\0';
+ break;
+ case PROTO_TLS:
+ memcpy(srv, SRV_TLS_PREFIX, SRV_TLS_PREFIX_LEN);
+ memcpy(srv+SRV_TLS_PREFIX_LEN, name->s, name->len);
+ srv[SRV_TLS_PREFIX_LEN + name->len] = '\0';
+ break;
+ case PROTO_SCTP:
+ memcpy(srv, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
+ memcpy(srv+SRV_SCTP_PREFIX_LEN, name->s, name->len);
+ srv[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
+ break;
+ default:
+ LOG(L_CRIT, "BUG: %s: unknown proto %d\n", __func__, proto);
+ }
+}
+
+size_t create_srv_pref_list(char *proto, struct dns_srv_proto_t *list) {
+ struct dns_srv_proto_t tmp;
+ size_t i,j,list_len;
+ int default_order,max;
+
+ /* if proto available, then add only the forced protocol to the list */
+ if (proto && *proto!=PROTO_NONE){
+ list[0].proto=*proto;
+ list_len=1;
+ } else {
+ list_len = 0;
+ /*get protocols and preference scores, and add availble protocol(s) and score(s) to the list*/
+ for (i=PROTO_UDP; i<PROTO_LAST;i++) {
+ tmp.proto_pref = proto_pref_score(i);
+ /* if -1 so disabled continue with next protocol*/
+ if (naptr_proto_supported(i) == 0) {
+ continue;
+ } else {
+ list[i-1].proto_pref=tmp.proto_pref;
+ list[i-1].proto=i;
+ list_len++;
+ }
+ };
+
+ /* if all protocol prefence scores equal, then set the perference to default values: udp,tcp,tls,sctp */
+ for (i=1; i<list_len;i++) {
+ if(list[0].proto_pref!=list[i].proto_pref){
+ default_order=0;
+ }
+ }
+ if (default_order){
+ for (i=0; i<list_len;i++) {
+ list[i].proto_pref=proto_pref_score(i);
+ }
+ }
+
+ /* sorting the list */
+ for (i=0;i<list_len-1;i++) {
+ max=i;
+ for (j=i+1;j<list_len;j++) {
+ if (list[j].proto_pref>list[max].proto_pref) {
+ max=j;
+ }
+ }
+ if (i!=max) {
+ tmp=list[i];
+ list[i]=list[max];
+ list[max]=tmp;
+ }
+ }
+
+ }
+ return list_len;
+}
+
/* Resolves SRV if no naptr found.
* It reuse dns_pref values and according that resolves supported protocols.
* If dns_pref are equal then it use udp,tcp,tls,sctp order.
@@ -1457,19 +1521,14 @@ end:
struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, char* proto)
{
- struct dns_srv_proto_t {
- char proto;
- int proto_pref;
- } srv_proto_list[PROTO_LAST], tmp_srv_element;
+ struct dns_srv_proto_t srv_proto_list[PROTO_LAST];
struct hostent* he;
struct ip_addr* ip;
str srv_name;
static char tmp_srv[MAX_DNS_NAME]; /* tmp. buff. for SRV lookups */
- int len;
- unsigned char i,j,max,default_order=0,list_len=0;
+ size_t i,list_len;
/* init variables */
he=0;
- len=0;
/* check if it's an ip address */
if (((ip=str2ip(name))!=0)
@@ -1492,86 +1551,18 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch
LOG(L_WARN, "WARNING: no_naptr_srv_sip_resolvehost: domain name too long"
" (%d), unable to perform SRV lookup\n", name->len);
} else {
- /* if proto available, then add only the forced protocol to the list */
- if (proto && *proto!=PROTO_NONE){
- srv_proto_list[0].proto=*proto;
- list_len=1;
- } else {
-
- /*get protocols and preference scores, and add availble protocol(s) and score(s) to the list*/
- for (i=PROTO_UDP; i<PROTO_LAST;i++) {
- tmp_srv_element.proto_pref = proto_pref_score(i);
- /* if -1 so disabled continue with next protocol*/
- if (naptr_proto_supported(i) == 0 ) {
- continue;
- } else {
- srv_proto_list[i-1].proto_pref=tmp_srv_element.proto_pref;
- srv_proto_list[i-1].proto=i;
- list_len++;
- }
- };
-
- /* if all protocol prefence scores equal, then set the perference to default values: udp,tcp,tls,sctp */
- for (i=1; i<list_len;i++) {
- if(srv_proto_list[0].proto_pref!=srv_proto_list[i].proto_pref){
- default_order=0;
- }
- }
- if (default_order){
- for (i=0; i<list_len;i++) {
- srv_proto_list[i].proto_pref=proto_pref_score(i);;
- }
- }
-
- /* sorting the list */
- for (i=0;i<list_len-1;i++) {
- max=i;
- for (j=i+1;j<list_len;j++) {
- if (srv_proto_list[j].proto_pref>srv_proto_list[max].proto_pref) {
- max=j;
- }
- }
- if (i!=max) {
- tmp_srv_element=srv_proto_list[i];
- srv_proto_list[i]=srv_proto_list[max];
- srv_proto_list[max]=tmp_srv_element;
- }
- }
-
- }
/* looping on the ordered list until we found a protocol what has srv record */
+ list_len = create_srv_pref_list(proto, srv_proto_list);
for (i=0; i<list_len;i++) {
switch (srv_proto_list[i].proto) {
- case PROTO_NONE: /* no proto specified, use udp */
- if (proto)
- *proto=PROTO_UDP;
- /* no break */
case PROTO_UDP:
- memcpy(tmp_srv, SRV_UDP_PREFIX, SRV_UDP_PREFIX_LEN);
- memcpy(tmp_srv+SRV_UDP_PREFIX_LEN, name->s, name->len);
- tmp_srv[SRV_UDP_PREFIX_LEN + name->len] = '\0';
- len=SRV_UDP_PREFIX_LEN + name->len;
- break;
case PROTO_TCP:
- memcpy(tmp_srv, SRV_TCP_PREFIX, SRV_TCP_PREFIX_LEN);
- memcpy(tmp_srv+SRV_TCP_PREFIX_LEN, name->s, name->len);
- tmp_srv[SRV_TCP_PREFIX_LEN + name->len] = '\0';
- len=SRV_TCP_PREFIX_LEN + name->len;
- break;
case PROTO_TLS:
- memcpy(tmp_srv, SRV_TLS_PREFIX, SRV_TLS_PREFIX_LEN);
- memcpy(tmp_srv+SRV_TLS_PREFIX_LEN, name->s, name->len);
- tmp_srv[SRV_TLS_PREFIX_LEN + name->len] = '\0';
- len=SRV_TLS_PREFIX_LEN + name->len;
- break;
case PROTO_SCTP:
- memcpy(tmp_srv, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN);
- memcpy(tmp_srv+SRV_SCTP_PREFIX_LEN, name->s, name->len);
- tmp_srv[SRV_SCTP_PREFIX_LEN + name->len] = '\0';
- len=SRV_SCTP_PREFIX_LEN + name->len;
+ create_srv_name(srv_proto_list[i].proto, name, tmp_srv);
break;
default:
- LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",
+ LOG(L_CRIT, "BUG: no_naptr_srv_sip_resolvehost: unknown proto %d\n",
(int)srv_proto_list[i].proto);
return 0;
}
@@ -1583,7 +1574,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch
*proto = PROTO_UDP;
}
srv_name.s=tmp_srv;
- srv_name.len=len;
+ srv_name.len=strlen(tmp_srv);
#ifdef USE_DNS_CACHE
he=dns_srv_get_he(&srv_name, port, dns_flags);
#else
diff --git a/resolve.h b/resolve.h
index 3ff5e23..1d67e3d 100644
--- a/resolve.h
+++ b/resolve.h
@@ -487,6 +487,13 @@ int dns_reinit_fixup(void *handle, str *gname, str *name, void **val);
int dns_try_ipv6_fixup(void *handle, str *gname, str *name, void **val);
void reinit_naptr_proto_prefs(str *gname, str *name);
+struct dns_srv_proto_t {
+ char proto;
+ int proto_pref;
+};
+void create_srv_name(char proto, str *name, char *srv);
+size_t create_srv_pref_list(char *proto, struct dns_srv_proto_t *list);
+
#ifdef DNS_WATCHDOG_SUPPORT
/* callback function that is called by the child processes
* when they reinitialize the resolver
_______________________________________________
sr-dev mailing list
[email protected]
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
