- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12293 - freeswitch/trunk/libs/spandsp/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: robertj Date: Wed Feb 25 20:37:44 2009 New Revision: 12293 Log: Added case significant ignorance Modified: freeswitch/trunk/libs/spandsp/src/ (props changed)

1 0

[commit] r12292 - in freeswitch/trunk: libs/esl/src src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: anthm Date: Wed Feb 25 18:38:14 2009 New Revision: 12292 Log: missed a spot Modified: freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Wed Feb 25 18:38:14 2009 @@ -147,7 +147,7 @@ { *event = NULL; - if (event_id != ESL_EVENT_CUSTOM && subclass_name) { + if ((event_id > 0 && event_id != ESL_EVENT_CUSTOM) && subclass_name) { return ESL_FAIL; } @@ -157,9 +157,10 @@ memset(*event, 0, sizeof(esl_event_t)); - (*event)->event_id = event_id; - - esl_event_add_header_string(*event, ESL_STACK_BOTTOM, "Event-Name", esl_event_name((*event)->event_id)); + if (event_id) { + (*event)->event_id = event_id; + esl_event_add_header_string(*event, ESL_STACK_BOTTOM, "Event-Name", esl_event_name((*event)->event_id)); + } if (subclass_name) { (*event)->subclass_name = DUP(subclass_name); @@ -389,20 +390,17 @@ ESL_DECLARE(esl_status_t) esl_event_dup(esl_event_t **event, esl_event_t *todup) { - esl_event_header_t *hp, *hp2; + esl_event_header_t *hp; - if (esl_event_create_subclass(event, todup->event_id, todup->subclass_name) != ESL_SUCCESS) { + if (esl_event_create_subclass(event, 0, todup->subclass_name) != ESL_SUCCESS) { return ESL_FAIL; } - if (todup->subclass_name) { - (*event)->subclass_name = DUP(todup->subclass_name); - } + (*event)->event_id = todup->event_id; + (*event)->event_user_data = todup->event_user_data; (*event)->bind_user_data = todup->bind_user_data; - hp2 = (*event)->headers; - for (hp = todup->headers; hp; hp = hp->next) { esl_event_add_header_string(*event, ESL_STACK_BOTTOM, hp->name, hp->value); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Feb 25 18:38:14 2009 @@ -598,7 +598,7 @@ *event = NULL; - if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) { + if ((event_id > 0 && event_id != SWITCH_EVENT_CUSTOM) && subclass_name) { return SWITCH_STATUS_GENERR; } @@ -611,9 +611,10 @@ memset(*event, 0, sizeof(switch_event_t)); - (*event)->event_id = event_id; - - switch_event_prep_for_delivery_detailed(file, func, line, *event); + if (event_id) { + (*event)->event_id = event_id; + switch_event_prep_for_delivery_detailed(file, func, line, *event); + } if (subclass_name) { (*event)->subclass_name = DUP(subclass_name); @@ -810,20 +811,16 @@ SWITCH_DECLARE(switch_status_t) switch_event_dup(switch_event_t **event, switch_event_t *todup) { - switch_event_header_t *hp, *hp2; + switch_event_header_t *hp; - if (switch_event_create_subclass(event, todup->event_id, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create_subclass(event, 0, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; } - if (todup->subclass_name) { - (*event)->subclass_name = DUP(todup->subclass_name); - } + (*event)->event_id = todup->event_id; (*event)->event_user_data = todup->event_user_data; (*event)->bind_user_data = todup->bind_user_data; - hp2 = (*event)->headers; - for (hp = todup->headers; hp; hp = hp->next) { switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, hp->name, hp->value); }

1 0

[commit] r12291 - in freeswitch/trunk: libs/esl/src src src/mod/asr_tts/mod_flite src/mod/endpoints/mod_opal
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: anthm Date: Wed Feb 25 18:14:03 2009 New Revision: 12291 Log: mighty putty for a big leak Modified: freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Wed Feb 25 18:14:03 2009 @@ -389,7 +389,7 @@ ESL_DECLARE(esl_status_t) esl_event_dup(esl_event_t **event, esl_event_t *todup) { - esl_event_header_t *header, *hp, *hp2, *last = NULL; + esl_event_header_t *hp, *hp2; if (esl_event_create_subclass(event, todup->event_id, todup->subclass_name) != ESL_SUCCESS) { return ESL_FAIL; @@ -404,21 +404,7 @@ hp2 = (*event)->headers; for (hp = todup->headers; hp; hp = hp->next) { - header = ALLOC(sizeof(*header)); - esl_assert(header); - - memset(header, 0, sizeof(*header)); - - header->name = DUP(hp->name); - header->value = DUP(hp->value); - - if (last) { - last->next = header; - } else { - (*event)->headers = header; - } - - (*event)->last_header = last = header; + esl_event_add_header_string(*event, ESL_STACK_BOTTOM, hp->name, hp->value); } if (todup->body) { Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Wed Feb 25 18:14:03 2009 @@ -5,7 +5,7 @@ $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \ $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \ $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ - $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm + $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm -lasound LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include LOCAL_LIBADD=$(FLITE_A) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Feb 25 18:14:03 2009 @@ -446,6 +446,8 @@ } } + switch_event_destroy(&params); + if (xml) switch_xml_free(xml); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Feb 25 18:14:03 2009 @@ -810,7 +810,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_dup(switch_event_t **event, switch_event_t *todup) { - switch_event_header_t *header, *hp, *hp2, *last = NULL; + switch_event_header_t *hp, *hp2; if (switch_event_create_subclass(event, todup->event_id, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; @@ -825,27 +825,7 @@ hp2 = (*event)->headers; for (hp = todup->headers; hp; hp = hp->next) { - void *pop; - - if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { - header = (switch_event_header_t *) pop; - } else { - header = ALLOC(sizeof(*header)); - switch_assert(header); - } - - memset(header, 0, sizeof(*header)); - - header->name = DUP(hp->name); - header->value = DUP(hp->value); - - if (last) { - last->next = header; - } else { - (*event)->headers = header; - } - - (*event)->last_header = last = header; + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, hp->name, hp->value); } if (todup->body) {

1 0

[commit] r12290 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 17:07:45 2009 New Revision: 12290 Log: Some little birdie said "what if we could add params to the contact that isn't a gateway?" SO IT SHALL BE! /b Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Feb 25 17:07:45 2009 @@ -1168,6 +1168,7 @@ const char *screen = "no"; const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); const char *invite_to_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_to_params"); + const char *invite_contact_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_contact_params"); const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params"); const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); @@ -1256,7 +1257,7 @@ } url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); - invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, invite_contact_params); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params ? invite_to_params : invite_params);

1 0

[commit] r12289 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 14:59:50 2009 New Revision: 12289 Log: revert svn revision 12104 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am Wed Feb 25 14:59:50 2009 @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = libstun.la -#bin_PROGRAMS = stunc +bin_PROGRAMS = stunc check_PROGRAMS = lookup_stun_server # ----------------------------------------------------------------------

1 0

[commit] r12288 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 14:33:18 2009 New Revision: 12288 Log: I realized I can't break backwards compat so if you set sip_invite_params it will be used on to and ruri as before but you can override the to params with sip_invite_to_params to make it be different if you want Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Feb 25 14:33:18 2009 @@ -1258,7 +1258,7 @@ url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params ? invite_to_params : invite_params); /*

1 0

[commit] r12287 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 14:22:12 2009 New Revision: 12287 Log: allow you to set invite, to and from params independantly Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Feb 25 14:22:12 2009 @@ -1167,6 +1167,8 @@ const char *priv = "off"; const char *screen = "no"; const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); + const char *invite_to_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_to_params"); + const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params"); const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); if (switch_strlen_zero(tech_pvt->dest)) { @@ -1255,8 +1257,8 @@ url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); - from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, NULL); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_params); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params); /*

1 0

[commit] r12286 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 13:40:22 2009 New Revision: 12286 Log: Wed Feb 25 13:11:19 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_sres_sip.c: added test cases for bad DNS server, timeout Ignore-this: f14a52817f3612c0b8b776761a12ef3e 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 Wed Feb 25 13:40:22 2009 @@ -1 +1 @@ -Wed Feb 25 13:39:07 CST 2009 +Wed Feb 25 13:40:08 CST 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 Wed Feb 25 13:40:22 2009 @@ -215,6 +215,93 @@ } END_TEST +START_TEST(failure) +{ + sres_sip_t *srs; + su_addrinfo_t const *ai; + + /* there is no server at all */ + s2_dns_teardown(); + + srs = sres_sip_new(x->sres, (void *)"sip:timeout.example.net", NULL, + 1, 1, + resolver_callback, x->root); + fail_if(srs == NULL); + + while (sres_sip_next_step(srs)) + su_root_run(x->root); + + ai = sres_sip_results(srs); + fail_if(ai != NULL); + + fail_if(sres_sip_error(srs) != SRES_SIP_ERR_AGAIN); + + sres_sip_unref(srs); +} +END_TEST + +/* time() replacement */ +static time_t offset; + +time_t +time(time_t *return_time) +{ + su_time_t tv; + time_t now; + + su_time(&tv); + + now = tv.tv_sec + offset - 2208988800UL; /* NTP_EPOCH */ + + if (return_time) + *return_time = now; + + return now; +} + +/* Drop packet */ +static int drop(void *data, size_t len, void *userdata) +{ + return 0; +} + +/* Fast forward time, call resolver timer */ +static void wakeup(su_root_magic_t *magic, + su_timer_t *timer, + su_timer_arg_t *extra) +{ + offset++; + sres_resolver_timer(x->sres, 0); +} + +START_TEST(timeout) +{ + sres_sip_t *srs; + su_addrinfo_t const *ai; + su_timer_t *faster = su_timer_create(su_root_task(x->root), 10); + + su_timer_run(faster, wakeup, NULL); + + s2_dns_set_filter(drop, NULL); + + srs = sres_sip_new(x->sres, (void *)"sip:timeout.example.net", NULL, + 1, 1, + resolver_callback, x->root); + fail_if(srs == NULL); + + while (sres_sip_next_step(srs)) + su_root_run(x->root); + + ai = sres_sip_results(srs); + fail_if(ai != NULL); + + fail_if(sres_sip_error(srs) != SRES_SIP_ERR_AGAIN); + + sres_sip_unref(srs); + + su_timer_destroy(faster); +} +END_TEST START_TEST(found_a) { @@ -342,6 +429,10 @@ "", sres_type_cname, "a.example.com.", NULL); + s2_dns_record("cname1.example.com", sres_type_aaaa, + "", sres_type_cname, "a.example.com.", + NULL); + s2_dns_record("a.example.com", sres_type_a, "", sres_type_a, "11.12.13.14", NULL); @@ -933,6 +1024,8 @@ tcase_add_test(tc, invalid); tcase_add_test(tc, not_found); + tcase_add_test(tc, failure); + tcase_add_test(tc, timeout); tcase_add_test(tc, found_a); tcase_add_test(tc, found_cname); tcase_add_test(tc, found_ip);

1 0

[commit] r12285 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 13:39:24 2009 New Revision: 12285 Log: Wed Feb 25 13:10:24 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sres_sip.c: be more robust if the DNS fails badly Ignore-this: 1922836529de164a842ab88e848066a0 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 25 13:39:24 2009 @@ -1 +1 @@ -Wed Feb 25 13:37:49 CST 2009 +Wed Feb 25 13:39:07 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Wed Feb 25 13:39:24 2009 @@ -767,24 +767,26 @@ (void *)srs, sres_record_type(type, NULL), domain, answers ? " (cached)" : "")); - if (answers) { - sres_sip_answer(step, NULL, answers); - return process = 1; - } + if (answers) + ; else if (srs->srs_blocking) { sres_blocking_query(srs->srs_resolver, type, domain, 0, &answers); - sres_sip_answer(step, NULL, answers); - return process = 1; } else { step->sp_query = sres_query(srs->srs_resolver, sres_sip_answer, step, type, domain); - /* Query all self-generated SRV records at the same time */ - parallel = step->sp_trace == NULL && type == sres_type_srv; - if (!parallel) - break; + if (step->sp_query) { + /* Query all self-generated SRV records at the same time */ + parallel = step->sp_trace == NULL && type == sres_type_srv; + if (!parallel) + break; + continue; + } } + + sres_sip_answer(step, NULL, answers); + return process = 1; } return process = 0; @@ -837,7 +839,10 @@ { int i; - for (i = 0; answers && answers[i]; i++) { + if (answers == NULL) + return SRES_NETWORK_ERR; + + for (i = 0; answers[i]; i++) { if (answers[i]->sr_record->r_type == type) { return answers[i]->sr_record->r_status; } @@ -956,12 +961,16 @@ break; case SRES_SERVER_ERR: case SRES_TIMEOUT_ERR: + case SRES_NETWORK_ERR: srs->srs_error = SRES_SIP_ERR_AGAIN; break; } if (srs->srs_error) break; } + + if (!srs->srs_error) + srs->srs_error = SRES_SIP_ERR_FAIL; } if (srs->srs_callback) {

1 0

[commit] r12284 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv libsofia-sip-ua/sresolv/sofia-resolv
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 13:38:05 2009 New Revision: 12284 Log: Wed Feb 25 13:09:35 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sres.c: improved error handling Ignore-this: a64e098f8575511bb6e5ef3129635d98 Returning records with SRES_NETWORK_ERR or SRES_TIMEOUT_ERR. Also setting errno if there is no available DNS servers. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h 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 Wed Feb 25 13:38:05 2009 @@ -1 +1 @@ -Wed Feb 25 13:36:25 CST 2009 +Wed Feb 25 13:37:49 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h Wed Feb 25 13:38:05 2009 @@ -73,6 +73,7 @@ SRES_TIMEOUT_ERR = 32, /**< Timeout occurred */ SRES_RECORD_ERR = 33, /**< Name has no given record type */ SRES_INTERNAL_ERR = 34, /**< Internal error */ + SRES_NETWORK_ERR = 35, /**< Network or DNS configuration error. */ _SRES_LAST_ERR }; 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 Wed Feb 25 13:38:05 2009 @@ -1554,6 +1554,7 @@ case SRES_TIMEOUT_ERR: return "TIMEOUT_ERR"; case SRES_RECORD_ERR: return "RECORD_ERR"; case SRES_INTERNAL_ERR: return "INTERNAL_ERR"; + case SRES_NETWORK_ERR: return "NETWORK_ERR"; default: if (buffer) @@ -2749,6 +2750,8 @@ if (i0 > N) i0 = 0; /* Number of DNS servers reduced */ dns = servers[i = i0]; + error = EIO; + if (res->res_config->c_opt.rotate || dns->dns_error || dns->dns_icmp) dns = sres_next_server(res, &q->q_i_server, 1), i = q->q_i_server; @@ -2938,10 +2941,21 @@ } } - for (i = 0; answers[i]; i++) { - status = answers[i]->sr_record->r_status; - if (status) - break; + if (answers == NULL) { + sres_cache_t *cache = q->q_res->res_cache; + + status = q->q_retry_count ? SRES_TIMEOUT_ERR : SRES_NETWORK_ERR; + + answers = su_zalloc(CHOME(cache), 2 * sizeof *answers); + if (answers) + answers[0] = sres_create_error_rr(cache, q, status); + } + else { + for (i = 0; answers[i]; i++) { + status = answers[i]->sr_record->r_status; + if (status) + break; + } } SU_DEBUG_5(("sres(q=%p): reporting error %s for %s %s\n",

1 0