diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-06-11 16:51:18 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-06-11 16:51:18 +0000 |
| commit | 3f873c23f1ba23394203a2083e0f76f47266492b (patch) | |
| tree | f9f3f16697f25274fed21c8738a837842a1e19fd /pjsip | |
| parent | 7ea58155c60008e40e21b47ae3ecdaeb6dba5c94 (diff) | |
Ticket #330: Changed DNS SRV resolver to use the new DNS A response parser
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1357 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index f7a3b07a..c0e6098a 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -742,8 +742,11 @@ static void stun_dns_srv_resolver_cb(void *user_data, return; } - pj_memcpy(&pjsua_var.stun_srv, &rec->entry[0].addr, - rec->entry[0].addr_len); + pj_assert(rec->count != 0 && rec->entry[0].server.addr_count != 0); + pj_sockaddr_in_init(&pjsua_var.stun_srv.ipv4, NULL, + rec->entry[0].port); + pjsua_var.stun_srv.ipv4.sin_addr.s_addr = + rec->entry[0].server.addr[0].s_addr; PJ_LOG(3,(THIS_FILE, "_stun._udp.%.*s resolved, found %d entry(s):", (int)pjsua_var.ua_cfg.stun_domain.slen, @@ -754,8 +757,8 @@ static void stun_dns_srv_resolver_cb(void *user_data, PJ_LOG(3,(THIS_FILE, " %d: prio=%d, weight=%d %s:%d", i, rec->entry[i].priority, rec->entry[i].weight, - pj_inet_ntoa(rec->entry[i].addr.ipv4.sin_addr), - (int)pj_ntohs(rec->entry[i].addr.ipv4.sin_port))); + pj_inet_ntoa(rec->entry[i].server.addr[0]), + (int)rec->entry[i].port)); } } @@ -793,7 +796,7 @@ pj_status_t pjsua_resolve_stun_server(pj_bool_t wait) status = pj_dns_srv_resolve(&pjsua_var.ua_cfg.stun_domain, &res_type, 3478, pjsua_var.pool, pjsua_var.resolver, - 0, NULL, &stun_dns_srv_resolver_cb); + 0, NULL, &stun_dns_srv_resolver_cb, NULL); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Error starting DNS SRV resolution", pjsua_var.stun_status); |