- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13360 - freeswitch/trunk/src
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 12:55:53 2009 New Revision: 13360 Log: use uint16_t instead of u_short (FSBUILD-160) Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 15 12:55:53 2009 @@ -1981,7 +1981,7 @@ switch_set_flag(frame, SFF_RFC2833); } frame->timestamp = ntohl(rtp_session->recv_msg.header.ts); - frame->seq = (uint16_t) ntohs((u_short) rtp_session->recv_msg.header.seq); + frame->seq = (uint16_t) ntohs((uint16_t) rtp_session->recv_msg.header.seq); frame->ssrc = ntohl(rtp_session->recv_msg.header.ssrc); frame->m = rtp_session->recv_msg.header.m ? SWITCH_TRUE : SWITCH_FALSE;

1 0

[commit] r13359 - freeswitch/trunk/src
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 12:50:37 2009 New Revision: 13359 Log: setgroup/initgroup availability on linux (FSBUILD-160) Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri May 15 12:50:37 2009 @@ -33,6 +33,11 @@ * */ + +#ifdef __linux__ +#define _BSD_SOURCE +#endif + #include <switch.h> #include <switch_version.h> #include "private/switch_core_pvt.h" @@ -44,6 +49,7 @@ #endif #include <errno.h> + SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; /* The main runtime obj we keep this hidden for ourselves */

1 0

[commit] r13358 - freeswitch/trunk/src
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 12:44:47 2009 New Revision: 13358 Log: ensure vasprintf is available on linux (FSBUILD-160) Modified: freeswitch/trunk/src/switch_apr.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Fri May 15 12:44:47 2009 @@ -30,6 +30,10 @@ * */ +#ifdef __linux__ +#define _GNU_SOURCE +#endif + #include <switch.h> #ifndef WIN32 #include <switch_private.h>

1 0

[commit] r13357 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 12:07:07 2009 New Revision: 13357 Log: MODENDP-219 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri May 15 12:07:07 2009 @@ -557,6 +557,7 @@ TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SIPTAG_CALL_INFO_STR(switch_channel_get_variable(tech_pvt->channel, SOFIA_SIP_HEADER_PREFIX "call_info")), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); sofia_set_flag_locked(tech_pvt, TFLAG_ANS); @@ -2994,6 +2995,7 @@ const char *from_uri = switch_event_get_header(event, "from-uri"); const char *call_info = switch_event_get_header(event, "call-info"); const char *alert_info = switch_event_get_header(event, "alert-info"); + const char *call_id = switch_event_get_header(event, "call-id"); const char *body = switch_event_get_body(event); sofia_profile_t *profile = NULL; nua_handle_t *nh; @@ -3007,12 +3009,12 @@ goto done; } - if (!to_uri && !local_user_full) { + if (!call_id && !to_uri && !local_user_full) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To-URI header\n"); goto done; } - if (!from_uri) { + if (!call_id && !from_uri) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing From-URI header\n"); goto done; } @@ -3023,37 +3025,47 @@ goto done; } + if (call_id) { + nh = nua_handle_by_call_id(profile->nua, call_id); - if (local_user_full) { - local_dup = strdup(local_user_full); - local_user = local_dup; - if ((local_host = strchr(local_user, '@'))) { - *local_host++ = '\0'; - } - - if (!local_user || !local_host || !sofia_reg_find_reg_url(profile, local_user, local_host, buf, sizeof(buf))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find local user\n"); + if (!nh) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Call-ID %s\n", call_id); goto done; } + } - to_uri = sofia_glue_get_url_from_contact(buf, 0); - - if ((p = strstr(to_uri, ";fs_"))) { - *p = '\0'; - } + else { + if (local_user_full) { + local_dup = strdup(local_user_full); + local_user = local_dup; + if ((local_host = strchr(local_user, '@'))) { + *local_host++ = '\0'; + } - } + if (!local_user || !local_host || !sofia_reg_find_reg_url(profile, local_user, local_host, buf, sizeof(buf))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find local user\n"); + goto done; + } + to_uri = sofia_glue_get_url_from_contact(buf, 0); + + if ((p = strstr(to_uri, ";fs_"))) { + *p = '\0'; + } - nh = nua_handle(profile->nua, - NULL, - NUTAG_URL(to_uri), - SIPTAG_FROM_STR(from_uri), - SIPTAG_TO_STR(to_uri), - SIPTAG_CONTACT_STR(profile->url), - TAG_END()); - - nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + } + + + nh = nua_handle(profile->nua, + NULL, + NUTAG_URL(to_uri), + SIPTAG_FROM_STR(from_uri), + SIPTAG_TO_STR(to_uri), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + } nua_info(nh, NUTAG_WITH_THIS(profile->nua), @@ -3063,6 +3075,9 @@ TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), TAG_END()); + if (call_id && nh) { + nua_handle_unref(nh); + } if (profile) { sofia_glue_release_profile(profile);

1 0

[commit] r13356 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 12:04:53 2009 New Revision: 13356 Log: the price you pay for TLS it seems Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri May 15 12:04:53 2009 @@ -770,6 +770,7 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERIFY_POLICY(0)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), + TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_KEEPALIVE(20000)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), TAG_IF(sofia_test_pflag(profile, PFLAG_DISABLE_SRV), NTATAG_USE_SRV(0)), TAG_IF(sofia_test_pflag(profile, PFLAG_DISABLE_NAPTR), NTATAG_USE_NAPTR(0)),

1 0

[commit] r13355 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:27:26 2009 New Revision: 13355 Log: fix typos Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c 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 Fri May 15 11:27:26 2009 @@ -87,6 +87,8 @@ sizeof(printer_memory_error.pr_buffer) }; +static void printing_error(sdp_printer_t *p, const char *fmt, ...); + static void print_session(sdp_printer_t *p, sdp_session_t const *session); /** Print a SDP description. @@ -154,7 +156,7 @@ p->pr_mode_manual = (flags & sdp_f_mode_manual) != 0; p->pr_mode_always = (flags & sdp_f_mode_always) != 0; - if (sdp) + if (session) print_session(p, session); else printing_error(p, "NULL session description"); @@ -264,7 +266,6 @@ const char *, sdp_list_t const *l); static void sdp_printf(sdp_printer_t *p, const char *fmt, ...); -static void printing_error(sdp_printer_t *p, const char *fmt, ...); static void print_session(sdp_printer_t *p, sdp_session_t const *sdp) {

1 0

[commit] r13354 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:19:19 2009 New Revision: 13354 Log: Thu May 14 13:05:43 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nta: clarify outgoing_ack() logic Ignore-this: a745b3e7df63835d9768ec9dc3d5c5b2 Coverity issue. 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 Fri May 15 11:19:19 2009 @@ -1 +1 @@ -Fri May 15 11:17:32 CDT 2009 +Fri May 15 11:18:36 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 Fri May 15 11:19:19 2009 @@ -9353,7 +9353,6 @@ */ void outgoing_ack(nta_outgoing_t *orq, sip_t *sip) { - nta_outgoing_t *ack; msg_t *ackmsg; assert(orq); @@ -9367,18 +9366,16 @@ assert(orq->orq_tport); ackmsg = outgoing_ackmsg(orq, SIP_METHOD_ACK, SIPTAG_TO(sip->sip_to), TAG_END()); + if (!ackmsg) + return; - if (ackmsg) { - if ((ack = outgoing_create(orq->orq_agent, NULL, NULL, - NULL, orq->orq_tpn, ackmsg, - NTATAG_BRANCH_KEY(sip->sip_via->v_branch), - NTATAG_USER_VIA(1), - NTATAG_STATELESS(1), - TAG_END()))) - ; - else - msg_destroy(ackmsg); - } + if (!outgoing_create(orq->orq_agent, NULL, NULL, + NULL, orq->orq_tpn, ackmsg, + NTATAG_BRANCH_KEY(sip->sip_via->v_branch), + NTATAG_USER_VIA(1), + NTATAG_STATELESS(1), + TAG_END())) + msg_destroy(ackmsg); } /** Generate messages for hop-by-hop ACK or CANCEL.

1 0

[commit] r13353 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:18:10 2009 New Revision: 13353 Log: Wed May 13 13:39:29 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_stack_ack(), nua_invite_client_ack(): cleaned code Ignore-this: 9edf1594e20f27f4e2effb43c83858ea Fixed clean-up after ACK. Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:18:10 2009 @@ -1 +1 @@ -Fri May 15 11:17:02 CDT 2009 +Fri May 15 11:17:32 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 11:18:10 2009 @@ -1190,11 +1190,8 @@ return 1; } - if (tags) { + if (tags) nua_stack_set_params(nua, nh, nua_i_error, tags); - if (nh->nh_soa) - soa_set_params(nh->nh_soa, TAG_NEXT(tags)); - } nua_client_request_ref(cr); error = nua_invite_client_ack(cr, tags); @@ -1387,8 +1384,8 @@ error: cr->cr_acked = 1; /* ... or we have at least tried */ - nua_client_request_clean(cr); nua_client_request_remove(cr); + nua_client_request_clean(cr); return error; }

1 0

[commit] r13352 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:17:09 2009 New Revision: 13352 Log: Wed May 13 13:33:21 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sres.c: use unsigned lenghts with m_get_string() and m_get_domain() Ignore-this: 7b09dd7d26a10dabb645156563c0cd6c Coverity issue. 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 Fri May 15 11:17:09 2009 @@ -1 +1 @@ -Fri May 15 11:16:18 CDT 2009 +Fri May 15 11:17:02 CDT 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 Fri May 15 11:17:09 2009 @@ -543,8 +543,8 @@ static uint16_t m_get_uint16(sres_message_t *m); static uint8_t m_get_uint8(sres_message_t *m); -static int m_get_string(char *d, int n, sres_message_t *m, uint16_t offset); -static int m_get_domain(char *d, int n, sres_message_t *m, uint16_t offset); +static unsigned m_get_string(char *d, unsigned n, sres_message_t *m, uint16_t offset); +static unsigned m_get_domain(char *d, unsigned n, sres_message_t *m, uint16_t offset); /* ---------------------------------------------------------------------- */ @@ -3673,7 +3673,7 @@ uint16_t m_size; char name[1025]; - int len; + unsigned len; char btype[8], bclass[8]; sr = memset(sr0, 0, sizeof sr0); @@ -3686,7 +3686,10 @@ sr->sr_parsed = 1; if (m->m_error) goto error; - + if (len >= (sizeof name)) { + m->m_error = "too long domain name in record"; + goto error; + } name[len] = 0; SU_DEBUG_9(("%s RR received %s %s %s %d rdlen=%d\n", @@ -3766,7 +3769,7 @@ sres_message_t *m) { uint16_t moffset, roffset; - int mnamelen, rnamelen; + unsigned mnamelen, rnamelen; soa->soa_record->r_size = sizeof *soa; @@ -3818,8 +3821,8 @@ sres_message_t *m) { - int suffixlen = 0, i; - int prefixlen = 0; + unsigned suffixlen = 0, i; + unsigned prefixlen = 0; uint16_t offset; a6->a6_record->r_size = sizeof *a6; @@ -3876,7 +3879,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; cn->cn_record->r_size = sizeof *cn; @@ -3898,7 +3901,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; ptr->ptr_record->r_size = sizeof *ptr; @@ -3920,7 +3923,7 @@ sres_message_t *m) { uint16_t offset; - int dlen; + unsigned dlen; srv->srv_record->r_size = sizeof *srv; @@ -3944,7 +3947,7 @@ sres_message_t *m) { uint16_t offset[4]; - int len[4]; + unsigned len[4]; na->na_record->r_size = sizeof *na; @@ -4186,10 +4189,11 @@ /** * Get a string. */ -static int m_get_string(char *d, - int n, - sres_message_t *m, - uint16_t offset) +static unsigned +m_get_string(char *d, + unsigned n, + sres_message_t *m, + uint16_t offset) { uint8_t size; uint8_t *p = m->m_data; @@ -4231,13 +4235,14 @@ * * @param offset start uncompression from this point in message */ -static int m_get_domain(char *d, - int n, - sres_message_t *m, - uint16_t offset) +static unsigned +m_get_domain(char *d, + unsigned n, + sres_message_t *m, + uint16_t offset) { uint8_t cnt; - int i = 0; + unsigned i = 0; uint8_t *p = m->m_data; uint16_t new_offset; int save_offset;

1 0

[commit] r13351 - in freeswitch/trunk/libs/sofia-sip: . utils
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 11:16:35 2009 New Revision: 13351 Log: Wed May 13 13:21:12 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * sip-date.c: not using uninit data. Ignore-this: 48751cc510886e42e23e48c535a869bc Coverity issue. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/utils/sip-date.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 11:16:35 2009 @@ -1 +1 @@ -Fri May 15 11:15:49 CDT 2009 +Fri May 15 11:16:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-date.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-date.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-date.c Fri May 15 11:16:35 2009 @@ -99,7 +99,7 @@ int main(int ac, char *av[]) { int numeric = 0; - sip_time_t t, t2; + sip_time_t t = 0, t2 = 0; char const *s; char buf[1024]; @@ -132,8 +132,6 @@ } else { for (; *s; ) { - t2 = 0; - if (msg_delta_d(&s, &t2) < 0) usage();

1 0