- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12756 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:54:18 2009 New Revision: 12756 Log: Tue Mar 3 12:23:35 CST 2009 Della Betta Filippo <filippo DOT dellabetta AT telecomitalia DOT it> * su_uniqueid.c: srand() must be called per-thread on windows Ignore-this: ee98b86faadc4a39186ba4991b073c40 Mon Mar 23 12:41:53 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * su_uniqueid.c: simple threadsafe implementation Ignore-this: b3597fb6032b79a61b63f004f121188b Using /dev/urandom where available, simple 64-bit prng elsewhere. 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 Tue Mar 24 10:54:18 2009 @@ -1 +1 @@ -Tue Mar 24 10:48:07 CDT 2009 +Tue Mar 24 10:52:57 CDT 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 Tue Mar 24 10:54:18 2009 @@ -74,116 +74,133 @@ #include "sofia-sip/su_uniqueid.h" /* For random number generator */ -static int initialized = 0; +static FILE *urandom; -static void init(void); -static void init_node(void); +union state { + uint64_t u64; +}; -/* Constants */ -static const unsigned version = 1; /* Current version */ -static const unsigned reserved = 128; /* DCE variant */ -#define granularity (10000000UL) -static const uint64_t mask60 = SU_U64_C(0xfffFFFFffffFFFF); -#define MAGIC (16384) +#if SU_HAVE_PTHREADS -/* 100-nanosecond intervals between 15 October 1582 and 1 January 1900 */ -static const uint64_t ntp_epoch = -(uint64_t)(141427) * (24 * 60 * 60L) * granularity; - -/* State */ -static uint64_t timestamp0 = 0; -static unsigned clock_sequence = MAGIC; -static unsigned char node[6]; +#include <pthread.h> -FILE *urandom; +static pthread_once_t once = PTHREAD_ONCE_INIT; +static int done_once = 1; +static pthread_key_t state_key; -/* - * Get current timestamp - */ -static uint64_t timestamp(void) +static void +init_once(void) { - uint64_t tl = su_ntp_now(); - uint64_t hi = su_ntp_hi(tl), lo = su_ntp_lo(tl); + pthread_key_create(&state_key, free); +#if HAVE_DEV_URANDOM + urandom = fopen("/dev/urandom", "rb"); +#endif /* HAVE_DEV_URANDOM */ + done_once = 1; +} - lo *= granularity; - hi *= granularity; +#else +static int initialized; +#endif - tl = hi + (lo >> 32) + ntp_epoch; +static union state * +get_state(void) +{ + static union state *retval, state0[1]; -#ifdef TESTING - printf("timestamp %08x-%08x\n", (unsigned)(tl >>32), (unsigned)tl); -#endif +#if SU_HAVE_PTHREADS - tl &= mask60; + pthread_once(&once, init_once); - if (tl <= timestamp0) - clock_sequence = (clock_sequence + 1) & (MAGIC - 1); + if (urandom) + return NULL; - timestamp0 = tl; + retval = pthread_getspecific(state_key); + if (retval) { + return retval; + } - return tl; -} + retval = calloc(1, sizeof *retval); + if (retval != NULL) + pthread_setspecific(state_key, retval); + else + retval = state0; -#if !HAVE_RANDOM -#define random() rand() -#define srandom(x) srand(x) -#endif +#else /* !SU_HAVE_PTHREADS */ -/* - * Initialize clock_sequence and timestamp0 - */ -static void init(void) -{ - int i; + if (urandom == NULL) { +#if HAVE_DEV_URANDOM + urandom = fopen("/dev/urandom", "rb"); +#endif /* HAVE_DEV_URANDOM */ + } -#define N_SEED 32 + if (urandom) + return NULL; -#if HAVE_INITSTATE - /* Allow libsofia-sip-ua.so to unload. */ - uint32_t *seed = calloc(N_SEED, sizeof *seed); -#else - static uint32_t _seed[N_SEED] = { 0 }; - uint32_t *seed = _seed; + retval = state0; + + if (initialized) + return retval; #endif - su_time_t now; - initialized = 1; + { + uint32_t seed[32]; + int i; + union { + uint32_t u32; + pthread_t tid; + } tid32 = { 0 }; - /* Initialize our random number generator */ -#if HAVE_DEV_URANDOM - if (!urandom) - urandom = fopen("/dev/urandom", "rb"); -#endif /* HAVE_DEV_URANDOM */ + tid32.tid = pthread_self(); - if (urandom) { - size_t len = fread(seed, sizeof *seed, N_SEED, urandom); (void)len; - } - else { - for (i = 0; i < N_SEED; i += 2) { + memset(seed, 0, sizeof seed); /* Make valgrind happy */ + + for (i = 0; i < 32; i += 2) { #if HAVE_CLOCK_GETTIME struct timespec ts; (void)clock_gettime(CLOCK_REALTIME, &ts); seed[i] ^= ts.tv_sec; seed[i + 1] ^= ts.tv_nsec; -#endif +#else + su_time_t now; su_time(&now); seed[i] ^= now.tv_sec; seed[i + 1] ^= now.tv_sec; +#endif } seed[0] ^= getuid(); seed[1] ^= getpid(); + seed[2] ^= tid32.u32; + seed[3] ^= (uint32_t)(intptr_t)retval; + + for (i = 0; i < 32; i+= 4) { + retval->u64 += ((uint64_t)seed[i] << 32) | seed[i + 1]; + retval->u64 *= ((uint64_t)seed[i + 3] << 32) | seed[i + 2]; + } + + retval->u64 += (uint64_t)su_nanotime(NULL); } -#if HAVE_INITSTATE - initstate(seed[0] ^ seed[1], (void *)seed, N_SEED * (sizeof *seed)); -#else - srand(seed[0] ^ seed[1]); -#endif + return retval; +} - clock_sequence = su_randint(0, MAGIC - 1); +#if !defined(WIN32) && !defined(WIN64) +void sofia_su_uniqueid_destructor(void) + __attribute__((destructor)); +#endif - (void)timestamp(); +void +sofia_su_uniqueid_destructor(void) +{ +#if HAVE_DEV_URANDOM + if (urandom) + fclose(urandom); +#endif /* HAVE_DEV_URANDOM */ - init_node(); +#if SU_HAVE_PTHREADS + if (done_once) { + pthread_key_delete(state_key); + done_once = 0; + } +#endif } #if HAVE_GETIFADDRS @@ -196,10 +213,8 @@ #endif static -void init_node(void) +void init_node(uint8_t node[6]) { - size_t i; - #if HAVE_GETIFADDRS && HAVE_SOCKADDR_LL struct ifaddrs *ifa, *results; @@ -232,24 +247,18 @@ } #endif - if (urandom) { - size_t len = fread(node, sizeof node, 1, urandom); (void)len; - } - else for (i = 0; i < sizeof(node); i++) { - unsigned r = random(); - node[i] = (r >> 24) ^ (r >> 16) ^ (r >> 8) ^ r; - } - + su_randmem(node, 6); node[0] |= 1; /* "multicast" address */ } +static unsigned char node[6]; + size_t su_node_identifier(void *address, size_t addrlen) { if (addrlen > sizeof node) addrlen = sizeof node; - if (!initialized) init(); - + su_guid_generate(NULL); memcpy(address, node, addrlen); return addrlen; @@ -257,21 +266,66 @@ void su_guid_generate(su_guid_t *v) { - uint64_t time; - unsigned clock; + /* Constants */ + static const unsigned version = 1; /* Current version */ + static const unsigned reserved = 128; /* DCE variant */ +#define granularity (10000000UL) + static const uint64_t mask60 = SU_U64_C(0xfffFFFFffffFFFF); +#define MAGIC (16384) + + /* 100-nanosecond intervals between 15 October 1582 and 1 January 1900 */ + static const uint64_t ntp_epoch = + (uint64_t)(141427) * (24 * 60 * 60L) * granularity; + + static uint64_t timestamp0 = 0; + static unsigned clock_sequence = MAGIC; + +#if SU_HAVE_PTHREADS + static pthread_mutex_t update = PTHREAD_MUTEX_INITIALIZER; +#endif + + uint64_t tl = su_ntp_now(); + uint64_t hi = su_ntp_hi(tl), lo = su_ntp_lo(tl); + + lo *= granularity; + hi *= granularity; - if (!initialized) init(); + tl = hi + (lo >> 32) + ntp_epoch; + +#ifdef TESTING + printf("timestamp %08x-%08x\n", (unsigned)(tl >>32), (unsigned)tl); +#endif + + tl &= mask60; + if (tl == 0) tl++; + +#if SU_HAVE_PTHREADS + pthread_mutex_lock(&update); +#endif + + if (timestamp0 == 0) { + clock_sequence = su_randint(0, MAGIC - 1); + init_node(node); + } + else if (tl <= timestamp0) { + clock_sequence = (clock_sequence + 1) & (MAGIC - 1); + } + + timestamp0 = tl; - time = timestamp(); - clock = clock_sequence; +#if SU_HAVE_PTHREADS + pthread_mutex_unlock(&update); +#endif - v->s.time_high_and_version = - htons((unsigned short)(((time >> 48) & 0x0fff) | (version << 12))); - v->s.time_mid = htons((unsigned short)((time >> 32) & 0xffff)); - v->s.time_low = htonl((unsigned long)(time & 0xffffffffUL)); - v->s.clock_seq_low = clock & 0xff; - v->s.clock_seq_hi_and_reserved = (clock >> 8) | reserved; - memcpy(v->s.node, node, sizeof(v->s.node)); + if (v) { + v->s.time_high_and_version = + htons((unsigned short)(((tl >> 48) & 0x0fff) | (version << 12))); + v->s.time_mid = htons((unsigned short)((tl >> 32) & 0xffff)); + v->s.time_low = htonl((unsigned long)(tl & 0xffffffffUL)); + v->s.clock_seq_low = clock_sequence & 0xff; + v->s.clock_seq_hi_and_reserved = (clock_sequence >> 8) | reserved; + memcpy(v->s.node, node, sizeof(v->s.node)); + } } /* @@ -292,58 +346,73 @@ return su_guid_strlen; } -/* - * Generate random integer in range [lb, ub] (inclusive) - */ -int su_randint(int lb, int ub) +uint64_t su_random64(void) { - unsigned rnd = 0; + union state *state = get_state(); - if (!initialized) init(); - - if (urandom) { - size_t len = fread(&rnd, 1, sizeof rnd, urandom); (void)len; + if (state) { + /* Simple rand64 from AoCP */ + return state->u64 = state->u64 * 0X5851F42D4C957F2DULL + 1ULL; + } + else { + uint64_t retval; + size_t len = fread(&retval, 1, sizeof retval, urandom); (void)len; + return retval; } - else - rnd = random(); - - if (ub - lb + 1 != 0) - rnd %= (ub - lb + 1); - - return rnd + lb; } void *su_randmem(void *mem, size_t siz) { - size_t i; + union state *state = get_state(); - if (!initialized) init(); - - if (urandom) { - size_t len = fread(mem, 1, siz, urandom); (void)len; + if (state) { + size_t i; + uint64_t r64; + uint32_t r32; + + for (i = 0; i < siz; i += 4) { + /* Simple rand64 from AoCP */ + state->u64 = r64 = state->u64 * 0X5851F42D4C957F2DULL + 1ULL; + r32 = (uint32_t) (r64 >> 32) ^ (uint32_t)r64; + if (siz - i >= 4) + memcpy((char *)mem + i, &r32, 4); + else + memcpy((char *)mem + i, &r32, siz - i); + } } - else for (i = 0; i < siz; i++) { - unsigned r = random(); - ((char *)mem)[i] = (r >> 24) ^ (r >> 16) ^ (r >> 8) ^ r; + else { + size_t len = fread(mem, 1, siz, urandom); (void)len; } return mem; } -/** Get random number for RTP timestamps. - * - * This function returns a 32-bit random integer. It also initializes the - * random number generator, if needed. +/** + * Generate random integer in range [lb, ub] (inclusive) */ -uint32_t su_random(void) +int su_randint(int lb, int ub) { - if (!initialized) init(); + uint64_t rnd; + unsigned modulo = (unsigned)(ub - lb + 1); - if (urandom) { - uint32_t rnd; - size_t len = fread(&rnd, 1, sizeof rnd, urandom); (void)len; - return rnd; + if (modulo != 0) { + do { + rnd = su_random64(); + } while (rnd / modulo == 0xffffFFFFffffFFFFULL / modulo); + + rnd %= modulo; } + else { + rnd = su_random64(); + } + + return (int)rnd + lb; +} - return (uint32_t)random(); +/** Get random 32-bit unsigned number. + * + */ +uint32_t su_random(void) +{ + return (uint32_t)(su_random64() >> 16); }

1 0

[commit] r12755 - freeswitch/trunk/libs/sofia-sip
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:49:03 2009 New Revision: 12755 Log: Mon Mar 23 12:27:27 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * RELEASE: urandom is no more public Ignore-this: 353234331d627b77c66841036c9d77f7 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/RELEASE Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:49:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:47:23 CDT 2009 +Tue Mar 24 10:48:07 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Mar 24 10:49:03 2009 @@ -51,7 +51,7 @@ - t_skip_next(), t_skip_move(), t_skip_len(), t_skip_dup(), t_skip_filter() - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() - t_filter_with(), t_any_filter() - - sres_record_class() + - sres_record_class(), urandom - u2s_alloc() libsofia-sip-ua-glib:

1 0

[commit] r12754 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:48:19 2009 New Revision: 12754 Log: Mon Mar 23 12:22:50 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: use random key when generating tags Ignore-this: 3e989f42549acbdbc259383b1b64e74d Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:48:19 2009 @@ -1 +1 @@ -Tue Mar 24 10:46:45 CDT 2009 +Tue Mar 24 10:47:23 CDT 2009 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 Tue Mar 24 10:48:19 2009 @@ -1175,10 +1175,9 @@ static int agent_tag_init(nta_agent_t *self) { sip_contact_t *m = self->sa_contact; - uint32_t hash = 1; + uint32_t hash = su_random(); if (m) { - if (m->m_url->url_user) hash = 914715421U * hash + msg_hash_string(m->m_url->url_user); if (m->m_url->url_host) @@ -1192,7 +1191,7 @@ if (hash == 0) hash = 914715421U; - self->sa_branch = NTA_BRANCH_PRIME * su_ntp_now(); + self->sa_branch = NTA_BRANCH_PRIME * (uint64_t)su_nanotime(NULL); self->sa_branch *= hash; self->sa_tags = NTA_TAG_PRIME * self->sa_branch; @@ -2505,6 +2504,8 @@ if (!self->sa_contact) return -1; + agent_tag_init(self); + return 0; }

1 0

[commit] r12753 - freeswitch/trunk/libs/sofia-sip
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:47:43 2009 New Revision: 12753 Log: Mon Mar 23 10:41:29 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * configure.ac: check for dlopen in -ldl Ignore-this: e1fa8a4bf30eb9023e54264dbe8c42bd Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/configure.ac Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:47:43 2009 @@ -1 +1 @@ -Tue Mar 24 10:46:04 CDT 2009 +Tue Mar 24 10:46:45 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Tue Mar 24 10:47:43 2009 @@ -110,6 +110,12 @@ fi AC_CHECK_HEADERS([fnmatch.h]) +dnl dl is currently used only in testing +AC_CHECK_LIB([dl], [dlopen], [ + dnl Note: -ldl is not added to LIBS + AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dl library is available]) +]) + ### internal modules ### ---------------- AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always])

1 0

[commit] r12752 - in freeswitch/trunk/libs/sofia-sip: . tests
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:46:59 2009 New Revision: 12752 Log: Mon Mar 23 10:41:08 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tests: added check_dlopen_sofia.c Ignore-this: 1f3a1a6dc3e9099c6488a637e5f06e9a Added: freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:46:59 2009 @@ -1 +1 @@ -Tue Mar 24 10:45:18 CDT 2009 +Tue Mar 24 10:46:04 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Tue Mar 24 10:46:59 2009 @@ -33,8 +33,8 @@ libtestnat_a_SOURCES = test_nat.h test_nat.c test_nat_tags.c if HAVE_CHECK -TESTS += check_sofia -check_PROGRAMS += check_sofia +TESTS += check_dlopen_sofia check_sofia +check_PROGRAMS += check_dlopen_sofia check_sofia endif check_sofia_CFLAGS = @CHECK_CFLAGS@ @@ -46,6 +46,9 @@ ${sofiabuilddir}/libsofia-sip-ua.la \ @CHECK_LIBS@ +check_dlopen_sofia_CFLAGS = -I$(top_srcdir)/s2check @CHECK_CFLAGS@ +check_dlopen_sofia_LDADD = ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ + CLEANFILES = tmp_sippasswd.?????? # ---------------------------------------------------------------------- Added: freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c Tue Mar 24 10:46:59 2009 @@ -0,0 +1,124 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2009 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 + * + */ + +/**@CFILE check_dlopen_sofia.c + * + * @brief Check dlopen()ing and dlclose() with libsofia-sip-ua + * + * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> + * + * @copyright (C) 2009 Nokia Corporation. + */ + +#include "config.h" + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + +#include <assert.h> + +#if HAVE_CHECK && HAVE_LIBDL + +#include <check.h> +#include <s2check.h> + +#include <sofia-sip/su_types.h> +#include <dlfcn.h> + +static uint64_t (*su_random64)(void); + +START_TEST(load_su_uniqueid) +{ + void *sofia; + uint64_t rnd; + + sofia = dlopen("../libsofia-sip-ua/.libs/libsofia-sip-ua.so", RTLD_NOW); + su_random64 = dlsym(sofia, "su_random64"); + fail_unless(su_random64 != NULL); + rnd = su_random64(); + fail_unless(sofia != NULL); + fail_unless(dlclose(sofia) == 0); +} +END_TEST + +TCase *dl_tcase(void) +{ + TCase *tc = tcase_create("1 - dlopen/dlclose"); + + tcase_add_test(tc, load_su_uniqueid); + + return tc; +} + +/* ---------------------------------------------------------------------- */ + +static void usage(int exitcode) +{ + fprintf(exitcode ? stderr : stdout, + "usage: check_dlopen_sofia [--xml=logfile] case,...\n"); + exit(exitcode); +} + +int main(int argc, char *argv[]) +{ + int i, failed = 0; + + Suite *suite = suite_create("dlopen()ing and dlclose() with libsofia-sip-ua"); + SRunner *runner; + char const *xml = NULL; + + s2_select_tests(getenv("CHECK_CASES")); + + for (i = 1; argv[i]; i++) { + if (strncmp(argv[i], "--xml=", strlen("--xml=")) == 0) { + xml = argv[i] + strlen("--xml="); + } + else if (strcmp(argv[i], "--xml") == 0) { + if (!(xml = argv[++i])) + usage(2); + } + else if (strcmp(argv[i], "-?") == 0 || + strcmp(argv[i], "-h") == 0 || + strcmp(argv[i], "--help") == 0) + usage(0); + else + s2_select_tests(argv[i]); + } + + suite_add_tcase(suite, dl_tcase()); + + runner = srunner_create(suite); + if (xml) + srunner_set_xml(runner, xml); + srunner_run_all(runner, CK_ENV); + failed = srunner_ntests_failed(runner); + srunner_free(runner); + + exit(failed ? EXIT_FAILURE : EXIT_SUCCESS); +} + +#else +int main(void) { return 77; } +#endif

1 0

[commit] r12751 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:46:13 2009 New Revision: 12751 Log: Wed Mar 11 11:52:58 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport.c: silence VC warnings Ignore-this: b81c43b73fcefa2dd58dd3366dd60368 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:46:13 2009 @@ -1 +1 @@ -Tue Mar 24 10:44:50 CDT 2009 +Tue Mar 24 10:45:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Tue Mar 24 10:46:13 2009 @@ -3078,7 +3078,7 @@ int tport_subject_search(char const *subject, su_strlst_t const *lst) { - int idx, ilen; + usize_t idx, ilen; const char *subjuri; if (!subject || su_strmatch(tpn_any, subject))

1 0

[commit] r12750 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:45:45 2009 New Revision: 12750 Log: Wed Mar 11 11:51:43 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres_sip.c: silence VC warnings Ignore-this: dd9d4b774716430cdf429ed86664b109 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 Tue Mar 24 10:45:45 2009 @@ -1 +1 @@ -Tue Mar 24 10:44:15 CDT 2009 +Tue Mar 24 10:44:50 CDT 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 Tue Mar 24 10:45:45 2009 @@ -1440,8 +1440,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); su->su_family = ai->ai_family = AF_INET6; su->su_port = htons(step->sp_port); @@ -1477,8 +1477,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); su->su_family = ai->ai_family = AF_INET; su->su_port = htons(step->sp_port); @@ -1541,8 +1541,8 @@ memset(ai, 0, (sizeof ai)); (void)buffer; if (host_is_ip4_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET, target, &su->su_sin.sin_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1551,8 +1551,8 @@ } #if SU_HAVE_IN6 else if (host_is_ip6_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET6, target, &su->su_sin6.sin6_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1562,8 +1562,8 @@ else if (host_is_ip6_reference(target)) { size_t len = strlen(target) - 2; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (len >= sizeof buffer || !memcpy(buffer, target + 1, len) ||

1 0

[commit] r12749 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:45:13 2009 New Revision: 12749 Log: Wed Mar 11 11:50:44 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * msg_mime.c: explicit cast when assigning to mp_len Ignore-this: ca5b8291eb84d8b166ab7f659bcf69f8 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:45:13 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:39 CDT 2009 +Tue Mar 24 10:44:15 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Tue Mar 24 10:45:13 2009 @@ -513,7 +513,7 @@ for (mp = all; mp; mp = mp->mp_next) { mp->mp_data = boundary; - mp->mp_len = blen; + mp->mp_len = (unsigned)blen; /* XXX */ assert(mp->mp_payload || mp->mp_separator); @@ -613,7 +613,8 @@ for (; mp; mp = mp->mp_next) { if (mp->mp_data == NULL) { - mp->mp_data = boundary, mp->mp_len = blen; + mp->mp_data = boundary; + mp->mp_len = (unsigned)blen; /* XXX */ } else { if (mp->mp_len < 3) return -1;

1 0

[commit] r12748 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:44:33 2009 New Revision: 12748 Log: Wed Mar 11 11:58:14 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_config.h: include extern in SOFIAPUBVAR Ignore-this: 7cccd45776e8452a8e404aaf01eaeadf Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:08 CDT 2009 +Tue Mar 24 10:43:39 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Tue Mar 24 10:44:33 2009 @@ -84,7 +84,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport) extern @@ -104,7 +104,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) extern + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport)

1 0

[commit] r12747 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:44:04 2009 New Revision: 12747 Log: Wed Mar 11 09:50:20 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * s2check: added exit77.c to EXTRA_DIST Ignore-this: ae3403c0bd1b4596c24bc7304916fa85 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:04 2009 @@ -1 +1 @@ -Tue Mar 24 10:42:34 CDT 2009 +Tue Mar 24 10:43:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Tue Mar 24 10:44:04 2009 @@ -28,7 +28,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = +EXTRA_DIST = exit77.c # ---------------------------------------------------------------------- # Tests

1 0