June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13927 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: crienzo Date: Tue Jun 23 18:28:09 2009 New Revision: 13927 Log: use inline: for inline grammars. local files are now handled like mod_pocketsphinx Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Tue Jun 23 18:28:09 2009 @@ -149,6 +149,7 @@ #define BUILTIN_ID "builtin:" #define SESSION_ID "session:" #define HTTP_ID "http://" +#define INLINE_ID "inline:" static int text_starts_with(const char *text, const char *match); /** @@ -2449,7 +2450,7 @@ switch_size_t grammar_file_size = 0, to_read = 0; grammar_type_t type = GRAMMAR_TYPE_UNKNOWN; const char *lname = switch_strlen_zero(name) ? "grammar" : name; - + char *filename = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar = %s, name = %s\n", schannel->name, grammar, name); if (switch_strlen_zero(grammar)) { @@ -2463,45 +2464,48 @@ goto done; } - /* check for local file grammar or URI grammar */ + /* figure out what type of grammar this is */ if (text_starts_with(grammar, HTTP_ID) || text_starts_with(grammar, SESSION_ID) || text_starts_with(grammar, BUILTIN_ID)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is URI\n", schannel->name); type = GRAMMAR_TYPE_URI; grammar_data = grammar; - } else if (switch_is_file_path(grammar)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is inside file\n", schannel->name); + } else if (text_starts_with(grammar, INLINE_ID)) { + grammar_data = grammar + strlen(INLINE_ID); + } else { /* grammar points to file containing the grammar text. We assume the MRCP server can't get to this file * so read the data from the file and cache it */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is inside file\n", schannel->name); + if (switch_is_file_path(grammar)) { + filename = switch_mprintf("%s.gram", grammar); + } else { + filename = switch_mprintf("%s%s%s.gram", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar); + } grammar_data = NULL; - - if (switch_file_open(&grammar_file, grammar, SWITCH_FOPEN_READ, 0, schannel->memory_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read grammar file: %s\n", schannel->name, grammar); + if (switch_file_open(&grammar_file, filename, SWITCH_FOPEN_READ, 0, schannel->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read grammar file: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_size = switch_file_get_size(grammar_file); if (grammar_file_size == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file is empty: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file is empty: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_data = (char *)switch_core_alloc(schannel->memory_pool, grammar_file_size + 1); to_read = grammar_file_size; if (switch_file_read(grammar_file, grammar_file_data, &to_read) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file read error: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file read error: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } if (to_read != grammar_file_size) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read entire grammar file: %s\n", schannel->name, grammar); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read entire grammar file: %s\n", schannel->name, filename); status = SWITCH_STATUS_FALSE; goto done; } grammar_file_data[to_read] = '\0'; grammar_data = grammar_file_data; - } else { - /* assume inline grammar */ - grammar_data = grammar; } /* determine content type of file grammar or inline grammar */ @@ -2532,6 +2536,7 @@ done: + switch_safe_free(filename); if (grammar_file) { switch_file_close(grammar_file); }

1 0

[commit] r13926 - freeswitch/trunk
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 17:32:06 2009 New Revision: 13926 Log: make libtool version detection more portable Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jun 23 17:32:06 2009 @@ -129,9 +129,9 @@ # AC_MSG_CHECKING([libtool major version]) libtool="${switch_builddir}/libtool" -LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk -F . '{print $1}'`" +LIBTOOL_MAJOR_VERSION="`$libtool --version 2>/dev/null| sed -e 's/([[^)]]*)//g;s/^[[^0-9]]*//;s/[[- ]].*//g;q'| awk 'BEGIN { FS = "." } { print $1 }' `" if test -z "$LIBTOOL_MAJOR_VERSION" ; then - LIBTOOL_MAJOR_VERSION="`sed -n -e '/^VERSION/{s/^.*=\"\?$[[0-9]]\+$\..\+/\1/;p}' ${switch_srcdir}/build/config/ltmain.sh`" + LIBTOOL_MAJOR_VERSION="`sed -n -e '/^VERSION/{s/^.*=\"\?$[[0-9]]\+$\..\+/\1/;p;}' ${switch_srcdir}/build/config/ltmain.sh`" fi if test -z "$LIBTOOL_MAJOR_VERSION" ; then AC_MSG_ERROR([Failed to detect your libtool version, please open a bug report on http://jira.freeswitch.org/]

1 0

[commit] r13925 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: anthm Date: Tue Jun 23 16:41:22 2009 New Revision: 13925 Log: FSCORE-385 Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jun 23 16:41:22 2009 @@ -871,7 +871,6 @@ int mask = 0; char guess_mask[16] = ""; char *tmp_name; - int ip_tmp = 0; struct in_addr in; switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); @@ -912,6 +911,10 @@ tmp_name = "nat.auto"; switch_network_list_create(&rfc_list, tmp_name, SWITCH_FALSE, IP_LIST.pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Created ip list %s default (deny)\n", tmp_name); + if (switch_network_list_add_host_mask(rfc_list, guess_ip, guess_mask, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Adding %s/%s (deny) to list %s\n", guess_ip, guess_mask, tmp_name); + } switch_network_list_add_cidr(rfc_list, "10.0.0.0/8", SWITCH_TRUE); switch_network_list_add_cidr(rfc_list, "172.16.0.0/12", SWITCH_TRUE); switch_network_list_add_cidr(rfc_list, "192.168.0.0/16", SWITCH_TRUE); @@ -933,16 +936,6 @@ } switch_core_hash_insert(IP_LIST.hash, tmp_name, list); - switch_inet_pton(AF_INET, guess_ip, &ip_tmp); - ip_tmp = htonl(ip_tmp); - tmp_name = "nat.auto"; - - if (switch_network_list_validate_ip_token(rfc_list, ip_tmp, NULL)) { - switch_network_list_add_host_mask(rfc_list, guess_ip, guess_mask, SWITCH_FALSE); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, - "Adding %s/%s (deny) to list %s\n", guess_ip, guess_mask, tmp_name); - } - if ((xml = switch_xml_open_cfg("acl.conf", &cfg, NULL))) { if ((x_lists = switch_xml_child(cfg, "network-lists"))) {

1 0

[commit] r13924 - freeswitch/trunk
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: andrew Date: Tue Jun 23 16:23:44 2009 New Revision: 13924 Log: Add -DHAVE_OPENSSL to openssl_CFLAGS if in fact we do have openssl Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jun 23 16:23:44 2009 @@ -613,6 +613,10 @@ SAC_OPENSSL +if test x$HAVE_OPENSSL = x1; then + openssl_CFLAGS="$openssl_CFLAGS -DHAVE_OPENSSL"; +fi + AX_CHECK_JAVA

1 0

[commit] r13923 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:49:44 2009 New Revision: 13923 Log: Tue Jun 23 10:07:20 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_nta_client: test case for sf.net bug #2531152 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:49:44 2009 @@ -1 +1 @@ -Tue Jun 23 14:48:11 CDT 2009 +Tue Jun 23 14:48:51 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.c Tue Jun 23 14:49:44 2009 @@ -110,6 +110,7 @@ suite_add_tcase(suite, check_nta_api_1_0()); suite_add_tcase(suite, check_nta_client_2_0()); suite_add_tcase(suite, check_nta_client_2_1()); + suite_add_tcase(suite, check_nta_client_2_2()); runner = srunner_create(suite); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta.h Tue Jun 23 14:49:44 2009 @@ -128,5 +128,6 @@ TCase *check_nta_api_1_0(void); TCase *check_nta_client_2_0(void); TCase *check_nta_client_2_1(void); +TCase *check_nta_client_2_2(void); #endif Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Tue Jun 23 14:49:44 2009 @@ -386,3 +386,96 @@ return tc; } + +/* ---------------------------------------------------------------------- */ + +#include <sofia-resolv/sres_record.h> + +START_TEST(client_2_2_0) +{ + nta_outgoing_t *orq; + struct message *request; + struct event *response; + static tp_name_t const tpn[1] = {{ "*", "*", "*", "5060", NULL, NULL }}; + static char const * const default_protocols[] = { "udp", "tcp", NULL }; + + char proxy[] = "sip:cname.example.org:0000000"; + + S2_CASE("2.2.0", "Send MESSAGE", + "Basic non-INVITE transaction with target using CNAME"); + /* Test for sf.net bug #2531152 */ + + s2_nta_setup("NTA", NULL, TAG_END()); + + s2_nta_setup_logs(7); + + fail_unless(s2sip->udp.contact != NULL); + + if (s2sip->udp.contact->m_url->url_port == NULL || + tport_tbind(s2sip->master, tpn, default_protocols, + TPTAG_SERVER(1), + TAG_END()) == -1) { + snprintf(proxy, sizeof proxy, "sip:cname.example.org:%s", + s2sip->udp.contact->m_url->url_port); + } + else { + strcpy(proxy, "sip:cname.example.org"); + } + + s2_dns_default("example.org."); + + s2_dns_record("cname.example.org.", sres_type_a, + "", sres_type_cname, "a.example.org.", + "a", sres_type_a, s2sip->udp.contact->m_url->url_host, + NULL); + + s2_dns_record("cname.example.org.", sres_type_naptr, + "", sres_type_cname, "a.example.org.", + NULL); + + s2_dns_record("cname.example.org.", sres_type_aaaa, + "", sres_type_cname, "a.example.org.", + NULL); + + s2_dns_record("a.example.org.", sres_type_a, + "", sres_type_a, s2sip->udp.contact->m_url->url_host, + NULL); + + + s2_nta_agent_setup(URL_STRING_MAKE("sip:0.0.0.0:*"), NULL, NULL, + NTATAG_DEFAULT_PROXY(proxy), + TAG_END()); + + orq = nta_outgoing_tcreate(s2->default_leg, + s2_nta_orq_callback, NULL, NULL, + SIP_METHOD_MESSAGE, + URL_STRING_MAKE("sip:test2.2.example.org"), + SIPTAG_FROM_STR("<sip:client@example.net>"), + TAG_END()); + fail_unless(orq != NULL); + request = s2_sip_wait_for_request(SIP_METHOD_MESSAGE); + fail_unless(request != NULL); + s2_sip_respond_to(request, NULL, 200, "2.2.0", TAG_END()); + response = s2_nta_wait_for(wait_for_orq, orq, + wait_for_status, 200, + 0); + s2_sip_free_message(request); + s2_nta_free_event(response); + nta_outgoing_destroy(orq); +} +END_TEST + +TCase * +check_nta_client_2_2(void) +{ + TCase *tc = tcase_create("NTA 2.2 - Client"); + + tcase_add_checked_fixture(tc, NULL, client_teardown); + + tcase_set_timeout(tc, 2); + + tcase_add_test(tc, client_2_2_0); + + return tc; +} +

1 0

[commit] r13922 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:49:03 2009 New Revision: 13922 Log: Tue Jun 23 09:58:14 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres.c: use original query with callback when doing CNAME recurse Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:49:03 2009 @@ -1 +1 @@ -Tue Jun 23 14:47:41 CDT 2009 +Tue Jun 23 14:48:11 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Jun 23 14:49:03 2009 @@ -324,7 +324,6 @@ uint16_t q_retry_count; uint8_t q_n_servers; uint8_t q_i_server; - int8_t q_aliased; int8_t q_edns; uint8_t q_n_subs; sres_query_t *q_subqueries[1 + SRES_MAX_SEARCH]; @@ -404,6 +403,7 @@ sres_config_t const *old_c); static sres_server_t **sres_servers_new(sres_resolver_t *res, sres_config_t const *c); +static sres_answer_f sres_resolving_cname; /** Generate new 16-bit identifier for DNS query. */ static void @@ -3083,15 +3083,35 @@ static void sres_resolve_cname(sres_resolver_t *res, - const sres_query_t *orig_query, - const char *alias) + sres_query_t *orig_query, + char const *cname) { sres_query_t *query; + query = sres_query_alloc(res, - orig_query->q_callback, orig_query->q_context, orig_query->q_type, - alias); - query->q_aliased = 1; - sres_send_dns_query(res, query); + sres_resolving_cname, + (sres_context_t *)orig_query, + orig_query->q_type, + cname); + + if (query) + sres_send_dns_query(res, query); + else + sres_query_report_error(orig_query, NULL); +} + +static void +sres_resolving_cname(sres_context_t *original_query, + sres_query_t *query, + sres_record_t **answers) +{ + sres_query_t *orig = (sres_query_t *)original_query; + + /* Notify the listener */ + if (orig->q_callback != NULL) + (orig->q_callback)(orig->q_context, orig, answers); + + sres_free_query(orig->q_res, orig); } /** Get a server by socket */ @@ -3486,17 +3506,18 @@ if (sres_cache_get(res->res_cache, query->q_type, alias, &cached) > 0) { reply = cached; - } else { - /* Resubmit the query with the aliased name, dropping this result */ + } + else { + /* Submit a query with the aliased name, dropping this result */ sres_resolve_cname(res, query, alias); - reply = NULL; + return 1; } } - if (reply) { - /* Notify the listener */ - if (query->q_callback != NULL) - (query->q_callback)(query->q_context, query, reply); - } + + /* Notify the listener */ + if (query->q_callback != NULL) + (query->q_callback)(query->q_context, query, reply); + sres_free_query(res, query); } else { @@ -3670,7 +3691,8 @@ } if (m->m_ancount > 0 && errorcount == 0 && query->q_type < sres_qtype_tsig - && (query->q_aliased || answers[0]->sr_type != sres_type_cname)) { + && (query->q_callback == sres_resolving_cname || + answers[0]->sr_type != sres_type_cname)) { for (i = 0; i < m->m_ancount; i++) { if (query->q_type == answers[i]->sr_type)

1 0

[commit] r13921 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:48:28 2009 New Revision: 13921 Log: Tue Jun 23 08:41:35 CDT 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * sresolv/sres.c: a comment to clarify code Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:48:28 2009 @@ -1 +1 @@ -Tue Jun 23 14:47:05 CDT 2009 +Tue Jun 23 14:47:41 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Jun 23 14:48:28 2009 @@ -3606,7 +3606,9 @@ if ((m->m_flags & 15) == SRES_FORMAT_ERR && query->q_edns) return SRES_EDNS0_ERR; - /* Scan question section */ + /* Scan question section. + * XXX: never mind the useless result values, this is done + * for the side effects in m */ for (i = 0; i < m->m_qdcount; i++) { char name[1024]; uint16_t qtype, qclass;

1 0

[commit] r13920 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:47:59 2009 New Revision: 13920 Log: Tue Jun 23 08:38:48 CDT 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * sresolv/sres.c: Refactored the query ID generation Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:47:59 2009 @@ -1 +1 @@ -Tue Jun 23 14:46:33 CDT 2009 +Tue Jun 23 14:47:05 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Jun 23 14:47:59 2009 @@ -74,6 +74,12 @@ #include <iphlpapi.h> #endif +#if HAVE_IP_RECVERR || HAVE_IPV6_RECVERR +#include <linux/types.h> +#include <linux/errqueue.h> +#include <sys/uio.h> +#endif + #include <time.h> #include "sofia-resolv/sres.h" @@ -184,6 +190,13 @@ #define va_copy(dst, src) (memcpy(&(dst), &(src), sizeof (va_list))) #endif +/* + * 3571 is a prime => + * we hash successive id values to different parts of hash tables + */ +#define Q_PRIME 3571 +#define SRES_QUERY_HASH(q) ((q)->q_hash) + /** * How often to recheck nameserver information (seconds). */ @@ -393,10 +406,14 @@ sres_config_t const *c); /** Generate new 16-bit identifier for DNS query. */ -static uint16_t -sres_new_id(sres_resolver_t *res) +static void +sres_gen_id(sres_resolver_t *res, sres_query_t *query) { - return res->res_id ? res->res_id++ : (res->res_id = 2, 1); + if (res->res_id == 0) { + res->res_id = 1; + } + query->q_id = res->res_id++; + query->q_hash = query->q_id * Q_PRIME; } /** Return true if we have a search list or a local domain name. */ @@ -1688,13 +1705,6 @@ res->res_updcb(res->res_async, INVALID_SOCKET, INVALID_SOCKET); } -/* - * 3571 is a prime => - * we hash successive id values to different parts of hash tables - */ -#define Q_PRIME 3571 -#define SRES_QUERY_HASH(q) ((q)->q_hash) - HTABLE_BODIES_WITH(sres_qtable, qt, sres_query_t, SRES_QUERY_HASH, unsigned, size_t); @@ -1726,10 +1736,11 @@ query->q_timestamp = res->res_now; query->q_name = strcpy((char *)(query + 1), domain); - query->q_id = sres_new_id(res); assert(query->q_id); + sres_gen_id(res, query); + assert(query->q_id); + query->q_i_server = res->res_i_server; query->q_n_servers = res->res_n_servers; - query->q_hash = query->q_id * Q_PRIME /* + query->q_i_server */; sres_qtable_append(res->res_queries, query); @@ -3138,12 +3149,6 @@ } } -#if HAVE_IP_RECVERR || HAVE_IPV6_RECVERR -#include <linux/types.h> -#include <linux/errqueue.h> -#include <sys/uio.h> -#endif - static int sres_no_update(sres_async_t *async, sres_socket_t new_socket, @@ -3462,8 +3467,7 @@ dns->dns_edns = edns_not_supported; assert(query->q_id); sres_remove_query(res, query, 0); - query->q_id = sres_new_id(res); - query->q_hash = query->q_id * Q_PRIME; + sres_gen_id(res, query); sres_qtable_append(res->res_queries, query); sres_send_dns_query(res, query); query->q_retry_count++;

1 0

[commit] r13919 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:47:23 2009 New Revision: 13919 Log: Tue Jun 23 08:18:24 CDT 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * sresolv/sres.c: implemented automatic CNAME resolution Ignore-this: 1483f6b65deb976e372921ef7ff1b0a0 Fixes sf.net bug #2531152 Behavioral change: intermediate CNAME results are not retrieved to the client. The only cases where CNAME results are retrieved are queries for sres_type_cname and sres_qtype_any, meaning no CNAME resolution is performed. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:47:23 2009 @@ -1 +1 @@ -Tue Jun 23 14:45:32 CDT 2009 +Tue Jun 23 14:46:33 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Jun 23 14:47:23 2009 @@ -311,6 +311,7 @@ uint16_t q_retry_count; uint8_t q_n_servers; uint8_t q_i_server; + int8_t q_aliased; int8_t q_edns; uint8_t q_n_subs; sres_query_t *q_subqueries[1 + SRES_MAX_SEARCH]; @@ -3069,6 +3070,18 @@ sres_query_report_error(q, NULL); } +static void +sres_resolve_cname(sres_resolver_t *res, + const sres_query_t *orig_query, + const char *alias) +{ + sres_query_t *query; + query = sres_query_alloc(res, + orig_query->q_callback, orig_query->q_context, orig_query->q_type, + alias); + query->q_aliased = 1; + sres_send_dns_query(res, query); +} /** Get a server by socket */ static @@ -3456,10 +3469,30 @@ query->q_retry_count++; } else if (!error && reply) { - /* Remove the query from the pending list and notify the listener */ + /* Remove the query from the pending list */ sres_remove_query(res, query, 1); - if (query->q_callback != NULL) - (query->q_callback)(query->q_context, query, reply); + + /* Resolve the CNAME alias, if necessary */ + if (query->q_type != sres_type_cname && query->q_type != sres_qtype_any && + reply[0] && reply[0]->sr_type == sres_type_cname) { + const char *alias = reply[0]->sr_cname[0].cn_cname; + sres_record_t **cached = NULL; + + /* Check for the aliased results in the cache */ + if (sres_cache_get(res->res_cache, query->q_type, alias, &cached) + > 0) { + reply = cached; + } else { + /* Resubmit the query with the aliased name, dropping this result */ + sres_resolve_cname(res, query, alias); + reply = NULL; + } + } + if (reply) { + /* Notify the listener */ + if (query->q_callback != NULL) + (query->q_callback)(query->q_context, query, reply); + } sres_free_query(res, query); } else { @@ -3630,15 +3663,17 @@ return -1; } - if (m->m_ancount > 0 && errorcount == 0 && query->q_type < sres_qtype_tsig) { - char b0[8], b1[8]; + if (m->m_ancount > 0 && errorcount == 0 && query->q_type < sres_qtype_tsig + && (query->q_aliased || answers[0]->sr_type != sres_type_cname)) { + for (i = 0; i < m->m_ancount; i++) { if (query->q_type == answers[i]->sr_type) break; } if (i == m->m_ancount) { - /* The queried request was not found. CNAME? */ + char b0[8], b1[8]; + /* The queried request was not found */ SU_DEBUG_5(("sres_decode_msg: sent query %s, got %s\n", sres_record_type(query->q_type, b0), sres_record_type(answers[0]->sr_type, b1))); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c Tue Jun 23 14:47:23 2009 @@ -226,14 +226,6 @@ struct frame *f, frame = { previous, domain }; unsigned hash = sres_hash_key(domain = cname->cn_cname); - if (cached) { - if (dcount >= len) - return -1; - cached[dcount] = (sres_record_t *)cname; - cname->cn_record->r_refcount++; - } - dcount++; - /* Check for cname loops */ for (f = previous; f; f = f->previous) { if (su_casematch(domain, f->domain)) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c Tue Jun 23 14:47:23 2009 @@ -998,22 +998,12 @@ TEST_1(result = ctx->result); TEST_1(sr = result[0]); TEST_1(sr->sr_record->r_status == SRES_RECORD_ERR); - TEST_1(cn = result[1]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "sip00.example.com."); sres_free_answers(res, ctx->result), ctx->result = NULL; TEST_1(result = sres_cached_answers(res, sres_type_naptr, domain)); TEST_1(sr = result[0]); TEST_1(sr->sr_record->r_status == SRES_RECORD_ERR); - TEST_1(cn = result[1]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "sip00.example.com."); sres_free_answers(res, result), ctx->result = NULL; @@ -1031,24 +1021,14 @@ TEST_RUN(ctx); TEST_1(result = ctx->result); - TEST_1(cn = result[0]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "sip00.example.com."); - TEST_1(sr = result[1]); + TEST_1(sr = result[0]); TEST(sr->sr_record->r_class, sres_class_in); TEST(sr->sr_record->r_type, sres_type_a); sres_free_answers(res, ctx->result), ctx->result = NULL; TEST_1(result = sres_cached_answers(res, sres_type_a, domain)); - TEST_1(cn = result[0]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "sip00.example.com."); - TEST_1(sr = result[1]); + TEST_1(sr = result[0]); TEST(sr->sr_record->r_class, sres_class_in); TEST(sr->sr_record->r_type, sres_type_a); @@ -1062,54 +1042,12 @@ TEST_1(result = ctx->result); TEST_1(sr = result[0]); TEST_1(sr->sr_record->r_status == SRES_RECORD_ERR); - TEST_1(cn = result[1]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop0.example.com."); - TEST_1(cn = result[2]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop1.example.com."); - TEST_1(cn = result[3]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop2.example.com."); - TEST_1(cn = result[4]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop0.example.com."); - TEST_1(result[5] == NULL); sres_free_answers(res, ctx->result), ctx->result = NULL; TEST_1(result = sres_cached_answers(res, sres_type_a, domain)); TEST_1(sr = result[0]); TEST_1(sr->sr_record->r_status == SRES_RECORD_ERR); - TEST_1(cn = result[1]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop0.example.com."); - TEST_1(cn = result[2]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop1.example.com."); - TEST_1(cn = result[3]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop2.example.com."); - TEST_1(cn = result[4]->sr_cname); - TEST(cn->cn_record->r_class, sres_class_in); - TEST(cn->cn_record->r_type, sres_type_cname); - TEST(cn->cn_record->r_ttl, 60); - TEST_S(cn->cn_cname, "cloop0.example.com."); - TEST_1(result[5] == NULL); sres_free_answers(res, result);

1 0

[commit] r13918 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 23 Jun '09

23 Jun '09

Author: mikej Date: Tue Jun 23 14:46:28 2009 New Revision: 13918 Log: Tue Jun 23 06:56:48 CDT 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * Fixed an s2 state breakage when running tests unforked Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jun 23 14:46:28 2009 @@ -1 +1 @@ -Tue Jun 23 14:44:45 CDT 2009 +Tue Jun 23 14:45:32 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Tue Jun 23 14:46:28 2009 @@ -299,6 +299,8 @@ sres_sip_unref(srs); + s2_dns_set_filter(NULL, NULL); + su_timer_destroy(faster); } END_TEST

1 0