February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:21:30 2009 New Revision: 11956 Log: Thu Feb 12 14:45:02 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_uniqueid: call initstate() with memory from heap Ignore-this: af9e58551676e173844d0b77af0e287a When libsofia-sip-ua.so gets unloaded, its data segment gets unloaded, but random() still wants to use the memory. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:21:30 2009 @@ -1 +1 @@ -Thu Feb 12 15:19:02 CST 2009 +Thu Feb 12 15:21:20 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 Thu Feb 12 15:21:30 2009 @@ -136,7 +136,12 @@ { int i; +#if HAVE_INITSTATE + /* Allow libsofia-sip-ua.so to unload. */ + uint32_t *seed = calloc(32, sizeof *seed); +#else static uint32_t seed[32] = { 0 }; +#endif su_time_t now; initialized = 1; Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Thu Feb 12 15:21:30 2009 @@ -526,7 +526,7 @@ AC_FUNC_ALLOCA -AC_CHECK_FUNCS([gettimeofday strerror random tcsetattr flock \ +AC_CHECK_FUNCS([gettimeofday strerror random initstate tcsetattr flock \ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \

1 0

[commit] r11955 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: mrene Date: Thu Feb 12 15:19:52 2009 New Revision: 11955 Log: Make max argument optional on the limit app, set the limit_usage variable with the current count after inserting the call in the db Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Thu Feb 12 15:19:52 2009 @@ -701,7 +701,7 @@ } } -#define LIMIT_USAGE "<realm> <id> <max> [number [dialplan [context]]]" +#define LIMIT_USAGE "<realm> <id> [<max> [number [dialplan [context]]]]" #define LIMIT_DESC "limit access to a resource and transfer to an extension if the limit is exceeded" static char *limit_def_xfer_exten = "limit_exceeded"; @@ -727,14 +727,23 @@ if (argc < 3) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit %s\n", LIMIT_USAGE); - return; + goto done; } switch_mutex_lock(globals.mutex); realm = argv[0]; id = argv[1]; - max = atoi(argv[2]); + + if (argc > 2) { + max = atoi(argv[2]); + if (max < 0) { + max = 0; + } + } + else { + max = -1; + } if (argc >= 4) { xfer_exten = argv[3]; @@ -742,9 +751,6 @@ xfer_exten = limit_def_xfer_exten; } - if (max < 0) { - max = 0; - } new_channel = !switch_channel_get_variable(channel, "limit_realm"); switch_channel_set_variable(channel, "limit_realm", realm); @@ -758,7 +764,7 @@ switch_safe_free(sql); got = atoi(buf); - if (got + 1 > max) { + if (max > 0 && got + 1 > max) { switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); goto done; } @@ -771,8 +777,11 @@ switch_core_session_get_uuid(session)); limit_execute_sql(sql, NULL); switch_safe_free(sql); + + switch_channel_set_variable(channel, "limit_usage", switch_core_session_sprintf(session, "%d", ++got)); done: + switch_safe_free(mydata); switch_mutex_unlock(globals.mutex); }

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:19:13 2009 New Revision: 11954 Log: Thu Feb 12 14:28:27 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2dns.c: fixed cname records Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2dns.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:19:13 2009 @@ -1 +1 @@ -Thu Feb 12 15:18:14 CST 2009 +Thu Feb 12 15:19:02 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 Thu Feb 12 15:19:13 2009 @@ -176,7 +176,7 @@ static char const *default_domain; -/* Set default domain */ +/** Set default domain suffix used with s2_dns_record() */ char const * s2_dns_default(char const *domain) { @@ -328,7 +328,7 @@ put_uint32(m, s2_dns_ttl); start = put_len_at(m); - put_data(m, (void *)cname, strlen(cname)); + put_domain(m, cname); put_len(m, start); } @@ -543,7 +543,16 @@ va_end(va0); } -/** Insert DNS record */ +/** Insert DNS response. + + s2_dns_record("example.com", sres_type_naptr, + // order priority flags services regexp target + "", sres_type_naptr, 20, 50, "a", "SIP+D2U", "", "sip00", + "", sres_type_naptr, 20, 50, "a", "SIP+D2T", "", "sip00", + "", sres_type_naptr, 20, 50, "a", "SIPS+D2T", "", "sip00", + "sip00", sres_type_a, "12.13.14.15", + NULL); +*/ void s2_dns_record( char const *qdomain, unsigned qtype, /* unsigned atype, domain, */

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:18:20 2009 New Revision: 11953 Log: Thu Feb 12 14:27:12 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2tcase.c: allow multiple calls to s2_select_tests() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2check.h freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:18:20 2009 @@ -1 +1 @@ -Thu Feb 12 15:17:34 CST 2009 +Thu Feb 12 15:18:14 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2check.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2check.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2check.h Thu Feb 12 15:18:20 2009 @@ -47,6 +47,8 @@ void s2_tcase_add_test(TCase *, TFun, char const *name); +void s2_select_tests(char const *pattern); + SOFIA_END_DECLS #endif /* S2CHECK_H */ Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Thu Feb 12 15:18:20 2009 @@ -30,6 +30,7 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <assert.h> #include <check.h> @@ -79,7 +80,7 @@ */ void s2_select_tests(char const *pattern) { - size_t i; + size_t i, n; char *cases, *s, **patterns; if (!pattern) @@ -91,10 +92,22 @@ for (i = 2, s = cases; (s = strchr(s, ',')); s++) i++; - patterns = calloc(i, sizeof *patterns); + if (test_patterns != default_patterns) { + patterns = (char **)test_patterns; + for (n = 0; patterns[n]; n++) + ; + patterns = realloc(patterns, (n + i) * (sizeof *patterns)); + } + else { + n = 0; + patterns = malloc(i * (sizeof *patterns)); + } + + assert(patterns); + memset(&patterns[n], 0, i * (sizeof *patterns)); /* Split by commas */ - for (i = 0, s = cases;; i++) { + for (i = n, s = cases;; i++) { patterns[i] = s; if (s == NULL) break;

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:17:44 2009 New Revision: 11952 Log: Thu Feb 12 14:24:41 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sres: sres_record_type() now checks pointer argument 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 Thu Feb 12 15:17:44 2009 @@ -1 +1 @@ -Thu Feb 12 15:16:22 CST 2009 +Thu Feb 12 15:17:34 CST 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 Thu Feb 12 15:17:44 2009 @@ -1533,7 +1533,8 @@ case sres_qtype_any: return "ANY"; default: - sprintf(buffer, "%u?", type & 65535); + if (buffer) + sprintf(buffer, "%u?", type & 65535); return buffer; } }

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:16:37 2009 New Revision: 11951 Log: Thu Feb 12 14:21:21 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sresolv: added asynchrous sip resolver Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:16:37 2009 @@ -1 +1 @@ -Thu Feb 12 15:15:10 CST 2009 +Thu Feb 12 15:16:22 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Thu Feb 12 15:16:37 2009 @@ -21,12 +21,17 @@ TESTS = torture_sresolv run_test_sresolv +check_PROGRAMS += check_sres_sip +TESTS += check_sres_sip +check_sres_sip_LDADD = $(LDADD) ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ +CFLAGS += -I${top_srcdir}/s2check + CLEANFILES = resolv.conf error.conf named.conf.tmp \ .test_sresolv.api.conf.?????? \ named.run -LDADD = ../url/liburl.la ../bnf/libbnf.la \ - libsresolv.la \ +LDADD = libsresolv.la \ + ../url/liburl.la ../bnf/libbnf.la \ ../su/libsu.la test_sresolv_LDFLAGS = -static @@ -36,13 +41,15 @@ nobase_include_sofia_HEADERS = \ sofia-sip/sresolv.h \ + sofia-sip/sres_sip.h \ sofia-resolv/sres.h \ sofia-resolv/sres_config.h \ sofia-resolv/sres_async.h \ sofia-resolv/sres_cache.h \ sofia-resolv/sres_record.h -libsresolv_la_SOURCES = sres.c sres_cache.c sres_blocking.c sresolv.c +libsresolv_la_SOURCES = sres.c sres_cache.c sres_blocking.c \ + sresolv.c sres_sip.c COVERAGE_INPUT = $(libsresolv_la_SOURCES) $(include_sofia_HEADERS)

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:15:20 2009 New Revision: 11950 Log: Thu Feb 12 14:20:26 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sres.c: improve logging upon errors 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 Thu Feb 12 15:15:20 2009 @@ -1 +1 @@ -Thu Feb 12 15:14:36 CST 2009 +Thu Feb 12 15:15:10 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 Thu Feb 12 15:15:20 2009 @@ -71,7 +71,10 @@ /* Errors generated by sresolv */ SRES_TIMEOUT_ERR = 32, /**< Timeout occurred */ - SRES_RECORD_ERR = 33 /**< Name has no given record type */ + SRES_RECORD_ERR = 33, /**< Name has no given record type */ + SRES_INTERNAL_ERR = 34, /**< Internal error */ + + _SRES_LAST_ERR }; /** Start of a zone of authority record (@RFC1035). */ @@ -248,6 +251,9 @@ /** Convert type to its name. */ SRESPUBFUN char const *sres_record_type(int type, char buffer[8]); +/** Convert status to its name. */ +SRESPUBFUN char const *sres_record_status(int status, char buffer[8]); + /** Compare two records. */ SRESPUBFUN int sres_record_compare(sres_record_t const *, sres_record_t const *); 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 Thu Feb 12 15:15:20 2009 @@ -1538,6 +1538,30 @@ } } +/** Convert record status to its name */ +char const *sres_record_status(int status, char buffer[8]) +{ + switch (status) { + case SRES_OK: return "OK"; + case SRES_FORMAT_ERR: return "FORMAT_ERR"; + case SRES_SERVER_ERR: return "SERVER_ERR"; + case SRES_NAME_ERR: return "NAME_ERR"; + case SRES_UNIMPL_ERR: return "UNIMPL_ERR"; + case SRES_AUTH_ERR: return "AUTH_ERR"; + + /* Errors generated by sresolv */ + case SRES_TIMEOUT_ERR: return "TIMEOUT_ERR"; + case SRES_RECORD_ERR: return "RECORD_ERR"; + case SRES_INTERNAL_ERR: return "INTERNAL_ERR"; + + default: + if (buffer) + sprintf(buffer, "%u?", status & 255); + return buffer; + } +} + + /** Convert class to its name. */ static char const * sres_record_class(int rclass, char buffer[8]) @@ -2899,6 +2923,9 @@ int i; if (q->q_callback) { + char sbuf[8], tbuf[8]; + int status = 0; + for (i = 0; i <= SRES_MAX_SEARCH; i++) { if (q->q_subqueries[i]) /* a pending query... */ return; @@ -2910,8 +2937,16 @@ } } - SU_DEBUG_5(("sres(q=%p): reporting errors for %u %s\n", - (void *)q, q->q_type, q->q_name)); + 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", + (void *)q, + sres_record_status(status, sbuf), + sres_record_type(q->q_type, tbuf), q->q_name)); sres_remove_query(q->q_res, q, 1); (q->q_callback)(q->q_context, q, answers); @@ -3567,7 +3602,9 @@ } if (i < total) { - SU_DEBUG_5(("sres_decode_msg: %s\n", "less records than promised")); + SU_DEBUG_5(("sres_decode_msg: got %u but expected " + "errors=%u an=%u ar=%u ns=%u\n", i, errorcount, + m->m_ancount, m->m_arcount, m->m_nscount)); for (i = 0; i < total; i++) sres_cache_free_record(res->res_cache, answers[i]); su_free(chome, answers);

1 0

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

12 Feb '09

Author: mikej Date: Thu Feb 12 15:14:45 2009 New Revision: 11949 Log: Tue Feb 10 19:39:02 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sres_cache: added sres_cache_copy_answers() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/torture_sresolv.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:14:45 2009 @@ -1 +1 @@ -Thu Feb 12 15:13:11 CST 2009 +Thu Feb 12 15:14:36 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h Thu Feb 12 15:14:45 2009 @@ -90,6 +90,10 @@ /** Free and zero one record. */ SRESPUBFUN void sres_cache_free_one(sres_cache_t *, sres_record_t *answer); +/** Copy list of records */ +SRESPUBFUN +sres_record_t **sres_cache_copy_answers(sres_cache_t *, sres_record_t **); + /** Remove old records from cache. */ SRESPUBFUN void sres_cache_clean(sres_cache_t *cache, time_t now); 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 Thu Feb 12 15:14:45 2009 @@ -131,6 +131,8 @@ void _sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer); su_inline void _sres_cache_free_answers(sres_cache_t *cache, sres_record_t **answers); +su_inline sres_record_t **_sres_cache_copy_answers( + sres_cache_t *, sres_record_t **); static unsigned sres_hash_key(const char *string); @@ -458,6 +460,20 @@ } } +/** Copy the list of records. */ +sres_record_t ** +sres_cache_copy_answers(sres_cache_t *cache, sres_record_t **answers) +{ + sres_record_t **copy = NULL; + + if (answers && LOCK(cache)) { + copy = _sres_cache_copy_answers(cache, answers); + UNLOCK(cache); + } + + return copy; +} + /* ---------------------------------------------------------------------- */ /* Private functions */ @@ -488,6 +504,29 @@ } } +su_inline sres_record_t ** +_sres_cache_copy_answers(sres_cache_t *cache, sres_record_t **answers) +{ + int i, n; + sres_record_t **copy; + + for (n = 0; answers[n] != NULL; n++) + ; + + copy = su_alloc(cache->cache_home, (n + 1) * (sizeof *copy)); + if (copy == NULL) + return NULL; + + for (i = 0; i < n; i++) { + copy[i] = answers[i]; + copy[i]->sr_refcount++; + } + + copy[i] = NULL; + + return copy; +} + /** Calculate a hash key for a string */ static unsigned Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/torture_sresolv.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/torture_sresolv.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/torture_sresolv.c Thu Feb 12 15:14:45 2009 @@ -234,6 +234,7 @@ BEGIN(); sres_a_record_t *a, a0[1], **all; + sres_record_t **copy; char host[128]; sres_cache_t *cache; time_t now, base; @@ -292,6 +293,11 @@ for (i = 0, N; i < N; i++) TEST(all[i]->a_record->r_refcount, 2); + TEST_1(copy = sres_cache_copy_answers(cache, (sres_record_t **)all)); + + for (i = 0, N; i < N; i++) + TEST(all[i]->a_record->r_refcount, 3); + clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t0); for (now = base; now <= base + 3660; now += 30) @@ -307,6 +313,11 @@ } for (i = 0, N; i < N; i++) + TEST(all[i]->a_record->r_refcount, 2); + + sres_cache_free_answers(cache, copy), copy = NULL; + + for (i = 0, N; i < N; i++) TEST(all[i]->a_record->r_refcount, 1); base += 24 * 3600;

1 0

[commit] r11948 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: mikej Date: Thu Feb 12 15:13:20 2009 New Revision: 11948 Log: Thu Feb 12 14:11:37 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua_client.c: fix request message reference counting problem Ignore-this: ac81944c1c2c095fdc66a51ca857e87c Internal error response already decreases reference count. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 12 15:13:20 2009 @@ -1 +1 @@ -Thu Feb 12 15:11:37 CST 2009 +Thu Feb 12 15:13:11 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Thu Feb 12 15:13:20 2009 @@ -877,7 +877,7 @@ else error = nua_base_client_request(cr, msg, sip, NULL); - if (error != 0 && error != -2) + if (error == -1) msg_destroy(msg); return error; @@ -906,9 +906,9 @@ /** Send request. * * @retval 0 success - * @retval -1 if error occurred, but event has not been sent - * @retval -2 if error occurred, event has not been sent, - * and @a msg has been destroyed + * @retval -1 if error occurred, but event has not been sent, + * and caller has to destroy request message @ msg + * @retval -2 if error occurred, event has not been sent * @retval >=1 if error event has been sent */ int nua_base_client_request(nua_client_request_t *cr, msg_t *msg, sip_t *sip, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h Thu Feb 12 15:13:20 2009 @@ -71,8 +71,8 @@ * * @retval 1 when request has been responded * @retval 0 when request has been sent - * @retval -1 upon an error (request message has not been destroyed) - * @retval -2 upon an error (request message has been destroyed) + * @retval -1 upon an error (but request message has not been destroyed) + * @retval -2 upon an error */ int (*crm_send)(nua_client_request_t *, msg_t *msg, sip_t *sip, @@ -80,7 +80,7 @@ /** @a crm_check_restart is called each time when a response is received. * - * It is used to restart reqquest after responses with method-specific + * It is used to restart request after responses with method-specific * status code or method-specific way of restarting the request. * * @retval 1 when request has been restarted

1 0

[commit] r11947 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: mikej Date: Thu Feb 12 15:12:25 2009 New Revision: 11947 Log: Wed Feb 11 15:10:34 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: fixed nta_agent_add_tport() documentation Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Thu Feb 12 15:12:25 2009 @@ -2086,7 +2086,7 @@ * and how they are preferred. If no protocol is specified, both UDP and TCP * are used for SIP URL and TLS for SIPS URL. The preference can be * indicated with a comma-separated list of transports, for instance, - * parameter @code transport=tcp,udp @endocde indicates that TCP is + * parameter @code transport=tcp,udp @endcode indicates that TCP is * preferred to UDP. * * The "maddr" parameter determines to which address the stack binds in @@ -2095,7 +2095,7 @@ * are created. [::] means that only IPv6 sockets are created. * * The "comp" parameter determines the supported compression protocol. - * Currently only sigcomp is supported (with suitable library. + * Currently only sigcomp is supported (with suitable library). * * @par Examples: * @code sip:172.21.40.24;maddr=* @endcode \n

1 0