- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r12283 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 13:36:39 2009 New Revision: 12283 Log: Wed Feb 25 12:40:44 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2dns: added s2_dns_set_filter() Ignore-this: dc9bf478b6a90d5b351b56c3d77a7ec9 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c freeswitch/trunk/libs/sofia-sip/s2check/s2dns.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 25 13:36:39 2009 @@ -1 +1 @@ -Wed Feb 25 13:35:46 CST 2009 +Wed Feb 25 13:36:25 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c Wed Feb 25 13:36:39 2009 @@ -18,6 +18,8 @@ su_socket_t socket; su_wait_t wait[1]; int reg; + int (*filter)(void *data, size_t len, void *userdata); + void *userdata; } s2dns; static @@ -94,6 +96,14 @@ s2dns.socket = socket; } +/* Set filter function */ +void s2_dns_set_filter(int (*filter)(void *data, size_t len, void *userdata), + void *userdata) +{ + s2dns.filter = filter; + s2dns.userdata = userdata; +} + void s2_dns_teardown(void) { struct s2_dns_response *r, *next; @@ -145,7 +155,8 @@ || ntohs(request.header->mh_qdcount) != 1) { flags |= FLAGS_QR | FLAGS_UNIMPL_ERR; request.header->mh_flags = htons(flags); - su_sendto(socket, request.buffer, len, 0, &su->su_sa, sulen); + if (!s2dns.filter || s2dns.filter(request.buffer, len, s2dns.userdata)) + su_sendto(socket, request.buffer, len, 0, &su->su_sa, sulen); return 0; } @@ -170,7 +181,8 @@ } request.header->mh_flags = htons(flags); - su_sendto(socket, request.buffer, len, 0, &su->su_sa, sulen); + if (!s2dns.filter || s2dns.filter(request.buffer, len, s2dns.userdata)) + su_sendto(socket, request.buffer, len, 0, &su->su_sa, sulen); return 0; } Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2dns.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2dns.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2dns.h Wed Feb 25 13:36:39 2009 @@ -38,6 +38,8 @@ SOFIA_BEGIN_DECLS void s2_dns_setup(su_root_t *root); +void s2_dns_set_filter(int (*filter)(void *data, size_t len, void *userdata), + void *userdata); void s2_dns_teardown(void); char const *s2_dns_default(char const *domain);

1 0

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

25 Feb '09

Author: mikej Date: Wed Feb 25 13:35:59 2009 New Revision: 12282 Log: Tue Feb 24 09:03:08 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/heap.h: use static scope for functions given to sort() Ignore-this: 72e91b9470ccc23300ce06eb836d56f4 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 25 13:35:59 2009 @@ -1 +1 @@ -Wed Feb 25 13:31:50 CST 2009 +Wed Feb 25 13:35:46 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h Wed Feb 25 13:35:59 2009 @@ -310,11 +310,11 @@ struct prefix##priv *_priv = *(void **)&h; \ return _priv ? _priv->_used : 0; \ } \ -scope int prefix##_less(void *h, size_t a, size_t b) \ +static int prefix##_less(void *h, size_t a, size_t b) \ { \ type *_heap = h; return less(_heap[a], _heap[b]); \ } \ -scope void prefix##_swap(void *h, size_t a, size_t b) \ +static void prefix##_swap(void *h, size_t a, size_t b) \ { \ type *_heap = h; type _swap = _heap[a]; \ set(_heap, a, _heap[b]); set(_heap, b, _swap); \

1 0

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

25 Feb '09

Author: mikej Date: Wed Feb 25 13:34:54 2009 New Revision: 12281 Log: Wed Feb 25 11:29:23 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_uniqueid.c: fixed seed array usage Ignore-this: b6e6a195f3f34abc2119a741f8b6f5e2 Paper bags, anyone? Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.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:34:54 2009 @@ -1 +1 @@ -Wed Feb 25 13:30:44 CST 2009 +Wed Feb 25 13:31:50 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Wed Feb 25 13:34:54 2009 @@ -136,11 +136,14 @@ { int i; +#define N_SEED 32 + #if HAVE_INITSTATE /* Allow libsofia-sip-ua.so to unload. */ - uint32_t *seed = calloc(32, sizeof(uint32_t)); + uint32_t *seed = calloc(N_SEED, sizeof *seed); #else - static uint32_t seed[32] = { 0 }; + static uint32_t _seed[N_SEED] = { 0 }; + uint32_t *seed = _seed; #endif su_time_t now; @@ -153,25 +156,25 @@ #endif /* HAVE_DEV_URANDOM */ if (urandom) { - size_t len = fread(seed, sizeof seed, 1, urandom); (void)len; + size_t len = fread(seed, sizeof *seed, N_SEED, urandom); (void)len; } else { - for (i = 0; i < 16; i++) { + for (i = 0; i < N_SEED; i += 2) { #if HAVE_CLOCK_GETTIME struct timespec ts; (void)clock_gettime(CLOCK_REALTIME, &ts); - seed[2*i] ^= ts.tv_sec; seed[2*i+1] ^= ts.tv_nsec; + seed[i] ^= ts.tv_sec; seed[i + 1] ^= ts.tv_nsec; #endif su_time(&now); - seed[2*i] ^= now.tv_sec; seed[2*i+1] ^= now.tv_sec; + seed[i] ^= now.tv_sec; seed[i + 1] ^= now.tv_sec; } - seed[30] ^= getuid(); - seed[31] ^= getpid(); + seed[0] ^= getuid(); + seed[1] ^= getpid(); } #if HAVE_INITSTATE - initstate(seed[0] ^ seed[1], (char *)seed, 32 * sizeof(uint32_t)); + initstate(seed[0] ^ seed[1], (void *)seed, N_SEED * (sizeof *seed)); #else srand(seed[0] ^ seed[1]); #endif

1 0

[commit] r12280 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: mikej Date: Wed Feb 25 13:31:10 2009 New Revision: 12280 Log: Fri Feb 13 05:53:00 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2_localinfo.h: added Added: freeswitch/trunk/libs/sofia-sip/s2check/s2_localinfo.h Modified: freeswitch/trunk/libs/sofia-sip/.update Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Feb 25 13:31:10 2009 @@ -1 +1 @@ -Tue Feb 24 08:44:37 CST 2009 +Wed Feb 25 13:30:44 CST 2009 Added: freeswitch/trunk/libs/sofia-sip/s2check/s2_localinfo.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2_localinfo.h Wed Feb 25 13:31:10 2009 @@ -0,0 +1,66 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2005 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)nokia.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#ifndef S2_LOCALINFO_H +/** Defined when <s2_localinfo.h> has been included. */ +#define S2_LOCALINFO_H + + +/**@internal + * @file s2_localinfo.h - Test su_localinfo() users + * + * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> + * + */ + +#ifndef SU_LOCALINFO_H +#include <sofia-sip/su_localinfo.h> +#endif + +SOFIA_BEGIN_DECLS + +int s2_getlocalinfo(su_localinfo_t const *hints, su_localinfo_t **res); +void s2_freelocalinfo(su_localinfo_t *); +char const *s2_gli_strerror(int error); +su_localinfo_t *s2_copylocalinfo(su_localinfo_t const *li0); +int s2_sockaddr_scope(su_sockaddr_t const *su, socklen_t sulen); + +void s2_localinfo_ifaces(char const **ifaces); + +#define S2_LOCALINFO_STUBS(static) \ + static int su_getlocalinfo(su_localinfo_t const *hints, su_localinfo_t **res) \ + { return s2_getlocalinfo(hints, res); } \ + static void su_freelocalinfo(su_localinfo_t *li) \ + { s2_freelocalinfo(li); } \ + static char const *su_gli_strerror(int error) \ + { return s2_gli_strerror(error); } \ + static su_localinfo_t *su_copylocalinfo(su_localinfo_t const *li0) \ + { return s2_copylocalinfo(li0); } \ + static int su_sockaddr_scope(su_sockaddr_t const *su, socklen_t sulen) \ + { return s2_sockaddr_scope(su, sulen); } \ + static int su_localinfo_stubs \ + +SOFIA_END_DECLS + +#endif /* !defined(S2_LOCALINFO_H) */

1 0