December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10818 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta libsofia-sip-ua/nta/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:10:32 2008 New Revision: 10818 Log: Wed Nov 12 11:30:28 CST 2008 Fabio Ferrari <fabioferrari AT gmail DOT com> * nta: new tag NTATAG_TLS_RPORT() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:10:32 2008 @@ -1 +1 @@ -Tue Dec 16 13:59:44 CST 2008 +Tue Dec 16 14:10:06 CST 2008 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 Dec 16 15:10:32 2008 @@ -361,6 +361,7 @@ * NTATAG_SIP_T1X64(), NTATAG_SIP_T1(), NTATAG_SIP_T2(), NTATAG_SIP_T4(), * NTATAG_STATELESS(), * NTATAG_TAG_3261(), NTATAG_TCP_RPORT(), NTATAG_TIMEOUT_408(), + * NTATAG_TLS_RPORT(), * NTATAG_TIMER_C(), NTATAG_MAX_PROCEEDING(), * NTATAG_UA(), NTATAG_UDP_MTU(), NTATAG_USER_VIA(), * NTATAG_USE_NAPTR(), NTATAG_USE_SRV() and NTATAG_USE_TIMESTAMP(). @@ -935,6 +936,7 @@ * NTATAG_SIP_T1X64(), NTATAG_SIP_T1(), NTATAG_SIP_T2(), NTATAG_SIP_T4(), * NTATAG_STATELESS(), * NTATAG_TAG_3261(), NTATAG_TCP_RPORT(), NTATAG_TIMEOUT_408(), + * NTATAG_TLS_RPORT(), * NTATAG_TIMER_C(), NTATAG_MAX_PROCEEDING(), * NTATAG_UA(), NTATAG_UDP_MTU(), NTATAG_USER_VIA(), * NTATAG_USE_NAPTR(), NTATAG_USE_SRV() and NTATAG_USE_TIMESTAMP(). @@ -999,6 +1001,7 @@ int rport = agent->sa_rport; int server_rport = agent->sa_server_rport; int tcp_rport = agent->sa_tcp_rport; + int tls_rport = agent->sa_tls_rport; unsigned preload = agent->sa_preload; unsigned threadpool = agent->sa_tport_threadpool; char const *sigcomp = agent->sa_sigcomp_options; @@ -1045,6 +1048,7 @@ #endif NTATAG_STATELESS_REF(stateless), NTATAG_TCP_RPORT_REF(tcp_rport), + NTATAG_TLS_RPORT_REF(tls_rport), NTATAG_TIMEOUT_408_REF(timeout_408), NTATAG_UA_REF(ua), NTATAG_UDP_MTU_REF(udp_mtu), @@ -1214,6 +1218,7 @@ agent->sa_flags = flags & MSG_FLG_USERMASK; agent->sa_rport = rport != 0; agent->sa_tcp_rport = tcp_rport != 0; + agent->sa_tls_rport = tls_rport != 0; agent->sa_preload = preload; agent->sa_tport_threadpool = threadpool; @@ -2064,7 +2069,8 @@ if (!v->v_rport && ((self->sa_rport && v->v_protocol == sip_transport_udp) || - (self->sa_tcp_rport && v->v_protocol == sip_transport_tcp))) + (self->sa_tcp_rport && v->v_protocol == sip_transport_tcp) || + (self->sa_tls_rport && v->v_protocol == sip_transport_tls))) msg_header_add_param(msg_home(msg), v->v_common, "rport"); if (!orq->orq_tpn->tpn_comp) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Tue Dec 16 15:10:32 2008 @@ -229,6 +229,8 @@ unsigned sa_server_rport:2; /** If true, use rport with tcp, too */ unsigned sa_tcp_rport:1; + /** If true, use rport with tls, too */ + unsigned sa_tls_rport:1; /** If true, automatically create compartments */ unsigned sa_auto_comp:1; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Tue Dec 16 15:10:32 2008 @@ -1298,7 +1298,7 @@ * * @note The NTATAG_RPORT() is a synonym for this. * - * @sa @RFC3581, NTATAG_SERVER_RPORT(), NTATAG_TCP_RPORT(), @Via + * @sa @RFC3581, NTATAG_SERVER_RPORT(), NTATAG_TCP_RPORT(), NTATAG_TLS_RPORT(), @Via */ tag_typedef_t ntatag_client_rport = BOOLTAG_TYPEDEF(client_rport); @@ -1333,7 +1333,7 @@ * - 1 - use "rport" parameter (default) * - 0 - do not use "rport" parameter * - * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via + * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), NTATAG_TLS_RPORT(), @Via */ tag_typedef_t ntatag_server_rport = INTTAG_TYPEDEF(server_rport); @@ -1358,6 +1358,27 @@ */ tag_typedef_t ntatag_tcp_rport = BOOLTAG_TYPEDEF(tcp_rport); +/**@def NTATAG_TLS_RPORT(x) + * + * Use rport with TLS, too. + * + * @par Used with + * nua_create(), nua_set_params(), + * nta_agent_create(), nta_agent_set_params() + * + * @par Parameter type + * boolean: true (non-zero or non-NULL pointer) + * or false (zero or NULL pointer) + * + * @par Values + * - true - include rport parameter in the TLS via line on client side + * - false - do not include rport parameter in the TLS via line + * on client side + * + * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_SERVER_RPORT(), @Via + */ +tag_typedef_t ntatag_tls_rport = BOOLTAG_TYPEDEF(tls_rport); + /**@def NTATAG_PRELOAD(x) * * Preload by N bytes. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h Tue Dec 16 15:10:32 2008 @@ -369,6 +369,12 @@ NTA_DLL extern tag_typedef_t ntatag_tcp_rport_ref; #define NTATAG_TCP_RPORT_REF(x) ntatag_tcp_rport_ref, tag_bool_vr(&(x)) +NTA_DLL extern tag_typedef_t ntatag_tls_rport; +#define NTATAG_TLS_RPORT(x) ntatag_tls_rport, tag_bool_v((x)) + +NTA_DLL extern tag_typedef_t ntatag_tls_rport_ref; +#define NTATAG_TLS_RPORT_REF(x) ntatag_tls_rport_ref, tag_bool_vr(&(x)) + NTA_DLL extern tag_typedef_t ntatag_preload; #define NTATAG_PRELOAD(x) ntatag_preload, tag_uint_v((x))

1 0

[commit] r10817 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 15:01:12 2008 New Revision: 10817 Log: Thu Dec 11 06:02:09 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sdp_print.c: print sdptl in lowercase, too Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 15:01:12 2008 @@ -1 +1 @@ -Tue Dec 16 13:58:31 CST 2008 +Tue Dec 16 13:59:44 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Tue Dec 16 15:01:12 2008 @@ -588,7 +588,7 @@ case sdp_proto_udp: proto = "udp"; break; case sdp_proto_rtp: proto = "RTP/AVP"; break; case sdp_proto_srtp: proto = "RTP/SAVP"; break; - case sdp_proto_udptl: proto = "UDPTL"; break; + case sdp_proto_udptl: proto = "udptl"; break; case sdp_proto_tls: proto = "tls"; break; default: proto = m->m_proto_name; break; }

1 0

[commit] r10816 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:58:49 2008 New Revision: 10816 Log: Wed Nov 12 12:00:29 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sdp_parse.c: use lower-case udptl According to T.38 V3.4 some implementations are case-sensitive when checking transport protocol name. Thanks to Timo Bruhn for the hint. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:58:49 2008 @@ -1 +1 @@ -Tue Dec 16 13:54:44 CST 2008 +Tue Dec 16 13:58:31 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Tue Dec 16 14:58:49 2008 @@ -1374,8 +1374,9 @@ m->m_proto = sdp_proto_rtp, m->m_proto_name = "RTP/AVP"; else if (strcasecmp(s, "RTP/SAVP") == 0) m->m_proto = sdp_proto_srtp, m->m_proto_name = "RTP/SAVP"; - else if (strcasecmp(s, "UDPTL") == 0) - m->m_proto = sdp_proto_udptl, m->m_proto_name = "UDPTL"; + else if (strcasecmp(s, "udptl") == 0) + /* Lower case - be compatible with people living by T.38 examples */ + m->m_proto = sdp_proto_udptl, m->m_proto_name = "udptl"; else if (strcasecmp(s, "UDP") == 0) m->m_proto = sdp_proto_udp, m->m_proto_name = "UDP"; else if (strcasecmp(s, "TCP") == 0)

1 0

[commit] r10815 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:55:04 2008 New Revision: 10815 Log: Thu Dec 11 11:32:13 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su_taglist.c. removed globals which should have been static in first place - t_null_next(), t_null_move(), t_null_dup(), t_null_copy(), t_null_find() - 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() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:55:04 2008 @@ -1 +1 @@ -Tue Dec 16 13:52:51 CST 2008 +Tue Dec 16 13:54:44 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c Tue Dec 16 14:55:04 2008 @@ -828,29 +828,27 @@ /* ====================================================================== */ /* null tag */ +static tagi_t const *t_null_next(tagi_t const *t) { return NULL; } +static tagi_t *t_null_move(tagi_t *dst, tagi_t const *src) { memset(dst, 0, sizeof(*dst)); return dst + 1; } +static tagi_t *t_null_dup(tagi_t *dst, tagi_t const *src, void **bb) { memset(dst, 0, sizeof(*dst)); return dst + 1; } -tagi_t *t_null_copy(tagi_t *dst, tagi_t const *src, void **bb) -{ - memset(dst, 0, sizeof(*dst)); - return dst + 1; -} - +static tagi_t const * t_null_find(tag_type_t tt, tagi_t const lst[]) { return NULL; @@ -919,26 +917,31 @@ /* ====================================================================== */ /* skip tag - placeholder in tag list */ +static tagi_t const *t_skip_next(tagi_t const *t) { return t + 1; } +static tagi_t *t_skip_move(tagi_t *dst, tagi_t const *src) { return dst; } +static size_t t_skip_len(tagi_t const *t) { return 0; } +static tagi_t *t_skip_dup(tagi_t *dst, tagi_t const *src, void **bb) { return dst; } +static tagi_t *t_skip_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -968,11 +971,13 @@ /* ====================================================================== */ /* next tag - jump to next tag list */ +static tagi_t const *t_next_next(tagi_t const *t) { return (tagi_t *)(t->t_value); } +static tagi_t *t_next_move(tagi_t *dst, tagi_t const *src) { if (!src->t_value) @@ -980,6 +985,7 @@ return dst; } +static size_t t_next_len(tagi_t const *t) { if (!t->t_value) @@ -987,6 +993,7 @@ return 0; } +static tagi_t *t_next_dup(tagi_t *dst, tagi_t const *src, void **bb) { if (!src->t_value) @@ -994,6 +1001,7 @@ return dst; } +static tagi_t *t_next_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src, @@ -1023,6 +1031,7 @@ /* ====================================================================== */ /* filter tag - use function to filter tag */ +static tagi_t *t_filter_with(tagi_t *dst, tagi_t const *t, tagi_t const *src, @@ -1070,6 +1079,7 @@ /* ====================================================================== */ /* any tag - match to any tag when filtering */ +static tagi_t *t_any_filter(tagi_t *dst, tagi_t const filter[], tagi_t const *src,

1 0

[commit] r10814 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:53:46 2008 New Revision: 10814 Log: Mon Dec 8 08:59:04 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su: removed private functions accidentally declared as globals su_t64_to_time(), mutex_trylocker(), su_port_set_system_preferences() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:53:46 2008 @@ -1 +1 @@ -Tue Dec 16 13:51:53 CST 2008 +Tue Dec 16 13:52:51 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c Tue Dec 16 14:53:46 2008 @@ -37,6 +37,8 @@ #include "config.h" +#include <sofia-sip/heap.h> + #include <assert.h> #include <stdio.h> #include <sys/types.h> Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h Tue Dec 16 14:53:46 2008 @@ -111,6 +111,19 @@ SOFIAPUBFUN uint32_t su_ntp_fraq(su_time_t t); SOFIAPUBFUN uint32_t su_time_ms(su_time_t t); #else +su_inline uint32_t su_ntp_fraq(su_time_t t); +su_inline uint32_t su_time_ms(su_time_t t); +#endif + +SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); + +SOFIAPUBFUN uint64_t su_counter(void); + +SOFIAPUBFUN uint64_t su_nanocounter(void); + +SOFIAPUBFUN uint32_t su_random(void); + +#if SU_HAVE_INLINE /** Middle 32 bit of NTP timestamp. */ su_inline uint32_t su_ntp_fraq(su_time_t t) { @@ -129,14 +142,6 @@ } #endif -SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); - -SOFIAPUBFUN uint64_t su_counter(void); - -SOFIAPUBFUN uint64_t su_nanocounter(void); - -SOFIAPUBFUN uint32_t su_random(); - SOFIA_END_DECLS #endif /* !defined(SU_TIME_H) */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c Tue Dec 16 14:53:46 2008 @@ -57,7 +57,7 @@ return pthread_mutex_lock(mutex + 1); } -int mutex_trylocker(void *_mutex) +static int mutex_trylocker(void *_mutex) { pthread_mutex_t *mutex = _mutex; return pthread_mutex_trylock(mutex + 1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Tue Dec 16 14:53:46 2008 @@ -106,6 +106,7 @@ if (start) preferred_su_clone_start = start; } +static void su_port_set_system_preferences(char const *name) { su_port_create_f *create = preferred_su_port_create; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h Tue Dec 16 14:53:46 2008 @@ -168,6 +168,8 @@ SOFIAPUBFUN char const *su_port_name(su_port_t const *port); +SOFIAPUBFUN int su_timer_reset_all(su_timer_queue_t *, su_task_r ); + /* ---------------------------------------------------------------------- */ /* React to multiple events per one poll() to make sure Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Dec 16 14:53:46 2008 @@ -115,6 +115,14 @@ * Contains hint of number of sockets supported by su_root_t */ int su_root_size_hint = 64; +/* ====================================================================== */ + +_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); +int su_task_attach(su_task_r self, su_root_t *root); +int su_task_detach(su_task_r self); + +int su_timer_reset_all(su_timer_t **t0, su_task_r); + /* ========================================================================= * Tasks */ @@ -348,12 +356,6 @@ } } -_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); -int su_task_attach(su_task_r self, su_root_t *root); -int su_task_detach(su_task_r self); - -int su_timer_reset_all(su_timer_t **t0, su_task_r); - /* Note that is *not* necessary same as su_root_t, * as su_root_t can be extended */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Tue Dec 16 14:53:46 2008 @@ -202,6 +202,8 @@ typedef uint64_t su_t64_t; /* time with 64 bits */ +static su_time_t su_t64_to_time(su_t64_t const us); + const uint32_t su_res32 = 1000000UL; const su_t64_t su_res64 = (su_t64_t)1000000UL; @@ -307,6 +309,7 @@ return (uint32_t) (ntp >> 16) & 0xffffffffLU; } +static su_time_t su_t64_to_time(su_t64_t const us) { su_time_t tv;

1 0

[commit] r10813 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:52:05 2008 New Revision: 10813 Log: Thu Dec 11 11:32:49 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su_uniqueid.h: proper prototype for su_random() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:52:05 2008 @@ -1 +1 @@ -Tue Dec 16 13:50:36 CST 2008 +Tue Dec 16 13:51:53 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_uniqueid.h Tue Dec 16 14:52:05 2008 @@ -117,7 +117,7 @@ SOFIAPUBFUN void *su_randmem(void *mem, size_t siz); /** Generate a random 32-bit integer. */ -SOFIAPUBFUN uint32_t su_random(); +SOFIAPUBFUN uint32_t su_random(void); SOFIA_END_DECLS

1 0

[commit] r10812 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:50:56 2008 New Revision: 10812 Log: Thu Dec 11 11:30:29 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su/addrinfo.c, su/localinfo.c: made usage() static Make -Wmissing-prototypes happy. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:50:56 2008 @@ -1 +1 @@ -Tue Dec 16 13:48:18 CST 2008 +Tue Dec 16 13:50:36 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c Tue Dec 16 14:50:56 2008 @@ -84,7 +84,7 @@ int getopt(int argc, char * const argv[], char const *opstring); extern int optind; -void usage(void) +static void usage(void) { fputs(help, stderr); exit(1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Tue Dec 16 14:50:56 2008 @@ -110,7 +110,7 @@ int getopt(int argc, char * const argv[], char const *opstring); extern int optind; -void usage(int returncode) +static void usage(int returncode) { fputs(help, stderr); exit(returncode);

1 0

[commit] r10811 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:48:45 2008 New Revision: 10811 Log: Fri Nov 28 09:00:01 CST 2008 Tiago Katcipis <katcipis AT inf DOT ufcs DOT br> * tport_tls.c: #include <sofia-sip/*> before <openssl/*> Avoid lossage in Win32. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:48:45 2008 @@ -1 +1 @@ -Tue Dec 16 13:47:13 CST 2008 +Tue Dec 16 13:48:18 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Tue Dec 16 14:48:45 2008 @@ -36,6 +36,10 @@ #define OPENSSL_NO_KRB5 oh-no +#include <sofia-sip/su_types.h> +#include <sofia-sip/su.h> +#include <sofia-sip/su_wait.h> + #include <openssl/lhash.h> #include <openssl/bn.h> #include <openssl/x509.h> @@ -47,10 +51,6 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> -#include <sofia-sip/su_types.h> -#include <sofia-sip/su.h> -#include <sofia-sip/su_wait.h> - #include <assert.h> #include <stdio.h> #include <stdlib.h>

1 0

[commit] r10810 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:47:41 2008 New Revision: 10810 Log: Fri Nov 28 08:59:31 CST 2008 Tiago Katcipis <katcipis AT inf DOT ufcs DOT br> * tport_type_tls.c: add missing access() for Win32 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:47:41 2008 @@ -1 +1 @@ -Wed Nov 12 11:28:12 EST 2008 +Tue Dec 16 13:47:13 CST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c Tue Dec 16 14:47:41 2008 @@ -48,6 +48,19 @@ #include <string.h> #include <sofia-sip/string0.h> +#if HAVE_FUNC +#elif HAVE_FUNCTION +#define __func__ __FUNCTION__ +#else +static char const __func__[] = "tport_type_tls"; +#endif + +#if HAVE_WIN32 +#include <io.h> +#define access(_filename, _mode) _access(_filename, _mode) +#define R_OK (04) +#endif + /* ---------------------------------------------------------------------- */ /* TLS */

1 0

[commit] r10809 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 14:45:42 2008 New Revision: 10809 Log: Thu Nov 27 06:08:29 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/su.h: do not try to use "IPv6 tech preview" with XP Fix proposed by Filippo Della Betta. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Tue Dec 16 14:45:42 2008 @@ -67,11 +67,11 @@ # include <winsock2.h> # include <ws2tcpip.h> # if SU_HAVE_IN6 -# if defined(IPPROTO_IPV6) || (_WIN32_WINNT >= 0x0600) +# if defined(IPPROTO_IPV6) || (_WIN32_WINNT >= 0x0501) /* case 1: IPv6 defined in winsock2.h/ws2tcpip.h */ # else /* case 2: try to use "IPv6 Tech Preview" */ -# include <tpipv6.h> +# include <tpipv6.h> # endif # endif #endif

1 0