- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9100 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: brian Date: Fri Jul 18 18:26:51 2008 New Revision: 9100 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: and eh? :) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Jul 18 18:26:51 2008 @@ -321,14 +321,14 @@ host = "none"; } - switch_snprintf(sql, sizeof(sql), "select *,%d from sip_registrations where call_id='%s' or (sip_user='%s' && sip_host='%s')", + switch_snprintf(sql, sizeof(sql), "select *,%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", reboot, call_id, user, host); switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); switch_mutex_unlock(profile->ireg_mutex); - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' && sip_host='%s')", + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s')", call_id, user, host); sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE);

1 0

[commit] r9099 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 18:04:10 2008 New Revision: 9099 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_stun.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 18:04:10 2008 @@ -471,7 +471,7 @@ } } if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, error); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, stun_port, error); goto out; } if (!*ip) { Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Fri Jul 18 18:04:10 2008 @@ -489,6 +489,12 @@ switch_stun_random_string(username, 32, NULL); switch_stun_packet_attribute_add_username(packet, username, 32); bytes = switch_stun_packet_length(packet); + + if (funny) { + packet = (switch_stun_packet_t *) buf; + bytes += 4; + } + switch_socket_sendto(sock, remote_addr, 0, (void *) packet, &bytes); started = switch_timestamp_now();

1 0

[commit] r9098 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 17:16:52 2008 New Revision: 9098 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: per call vm recording ext with vm_message_ext variable Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Jul 18 17:16:52 2008 @@ -2211,8 +2211,8 @@ const char *caller_id_number = NULL; switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params = NULL, x_param = NULL; switch_event_t *vars = NULL; - const char *vm_cc = NULL; - + const char *vm_cc = NULL, *vtmp, *vm_ext = NULL; + if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { caller_id_name = caller_profile->caller_id_name; } @@ -2315,7 +2315,12 @@ switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", id, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, prefs_callback, &cbt); - file_path = switch_mprintf("%s%smsg_%s.%s", dir_path, SWITCH_PATH_SEPARATOR, uuid, profile->file_ext); + vm_ext = profile->file_ext; + if ((vtmp = switch_channel_get_variable(channel, "vm_message_ext"))) { + vm_ext = vtmp; + } + + file_path = switch_mprintf("%s%smsg_%s.%s", dir_path, SWITCH_PATH_SEPARATOR, uuid, vm_ext); if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { int num = atoi(voicemail_greeting_number);

1 0

[commit] r9097 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 16:45:07 2008 New Revision: 9097 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix compiler warn Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 16:45:07 2008 @@ -448,8 +448,8 @@ int iport; *p++ = '\0'; iport = atoi(p); - if (iport > 0) { - stun_port = iport; + if (iport > 0 && iport < 0xFFFF) { + stun_port = (switch_port_t) iport; } }

1 0

[commit] r9096 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 16:25:39 2008 New Revision: 9096 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Jul 18 16:25:39 2008 @@ -418,7 +418,8 @@ */ SWITCH_DECLARE(void *) switch_rtp_get_private(switch_rtp_t *rtp_session); -SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, uint32_t packet_count, switch_bool_t funny); +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, switch_port_t stun_port, + uint32_t packet_count, switch_bool_t funny); /*! \} Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Jul 18 16:25:39 2008 @@ -426,6 +426,7 @@ char *record_route; char *extrtpip; char *stun_ip; + switch_port_t stun_port; uint32_t stun_flags; int crypto_tag; unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 16:25:39 2008 @@ -433,24 +433,38 @@ switch_port_t myport = *port; const char *var; int funny = 0; + switch_port_t stun_port = SWITCH_STUN_DEFAULT_PORT; + char *stun_ip = NULL; if (!sourceip) { return status; } if (!strncasecmp(sourceip, "stun:", 5)) { - char *stun_ip = sourceip + 5; - if (!stun_ip) { + char *p; + stun_ip = strdup(sourceip + 5); + + if ((p = strchr(stun_ip, ':'))) { + int iport; + *p++ = '\0'; + iport = atoi(p); + if (iport > 0) { + stun_port = iport; + } + } + + if (switch_strlen_zero(stun_ip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER\n"); - return status; + goto out; } + for (x = 0; x < 5; x++) { if ((profile->pflags & PFLAG_FUNNY_STUN) || (tech_pvt && (var = switch_channel_get_variable(tech_pvt->channel, "funny_stun")) && switch_true(var))) { error = "funny"; funny++; } - if ((status = switch_stun_lookup(ip, port, stun_ip, SWITCH_STUN_DEFAULT_PORT, &error, pool)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_stun_lookup(ip, port, stun_ip, stun_port, &error, pool)) != SWITCH_STATUS_SUCCESS) { switch_yield(100000); } else { break; @@ -458,18 +472,20 @@ } if (status != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, error); - return status; + goto out; } if (!*ip) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! No IP returned\n"); - return SWITCH_STATUS_FALSE; + goto out; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Success [%s]:[%d]\n", *ip, *port); + status = SWITCH_STATUS_SUCCESS; if (tech_pvt) { if (myport == *port && !strcmp(*ip, tech_pvt->profile->rtpip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Not Required ip and port match. [%s]:[%d]\n", *ip, *port); } else { tech_pvt->stun_ip = switch_core_session_strdup(tech_pvt->session, stun_ip); + tech_pvt->stun_port = stun_port; tech_pvt->stun_flags |= STUN_FLAG_SET; if (funny) { tech_pvt->stun_flags |= STUN_FLAG_FUNNY; @@ -478,8 +494,14 @@ } } else { *ip = sourceip; + status = SWITCH_STATUS_SUCCESS; } - return SWITCH_STATUS_SUCCESS; + + out: + + switch_safe_free(stun_ip); + + return status; } @@ -1804,7 +1826,8 @@ if (stun_ping) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting stun ping to %s:%d\n", tech_pvt->stun_ip, stun_ping); - switch_rtp_activate_stun_ping(tech_pvt->rtp_session, tech_pvt->stun_ip, stun_ping, (tech_pvt->stun_flags & STUN_FLAG_FUNNY) ? 1 : 0); + switch_rtp_activate_stun_ping(tech_pvt->rtp_session, tech_pvt->stun_ip, tech_pvt->stun_port, + stun_ping, (tech_pvt->stun_flags & STUN_FLAG_FUNNY) ? 1 : 0); } if ((val = switch_channel_get_variable(tech_pvt->channel, "jitterbuffer_msec"))) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jul 18 16:25:39 2008 @@ -194,6 +194,7 @@ int reading; int writing; char *stun_ip; + switch_port_t stun_port; }; static int global_init = 0; @@ -890,11 +891,12 @@ rtp_session->cng_pt = pt; } -SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, uint32_t packet_count, switch_bool_t funny) +SWITCH_DECLARE(switch_status_t) switch_rtp_activate_stun_ping(switch_rtp_t *rtp_session, const char *stun_ip, switch_port_t stun_port, + uint32_t packet_count, switch_bool_t funny) { if (switch_sockaddr_info_get(&rtp_session->remote_stun_addr, stun_ip, SWITCH_UNSPEC, - SWITCH_STUN_DEFAULT_PORT, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !rtp_session->remote_stun_addr) { + rtp_session->stun_port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS || !rtp_session->remote_stun_addr) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error resolving stun ping addr\n"); return SWITCH_STATUS_FALSE; @@ -904,6 +906,8 @@ rtp_session->funny_stun++; } + rtp_session->stun_port = stun_port; + rtp_session->default_stuncount = packet_count; rtp_session->stun_ip = switch_core_strdup(rtp_session->pool, stun_ip);

1 0

[commit] r9095 - freeswitch/trunk/src
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 15:29:29 2008 New Revision: 9095 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: don't parse ringback varable in proxy situations Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jul 18 15:29:29 2008 @@ -256,7 +256,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session) { - switch_channel_t *caller_channel = switch_core_session_get_channel(session); + switch_channel_t *caller_channel = NULL; switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); const char *ringback_data = NULL; switch_frame_t write_frame = { 0 }; @@ -271,6 +271,10 @@ const char *var = switch_channel_get_variable(caller_channel, "call_timeout"); switch_time_t start = 0; + if (session) { + caller_channel = switch_core_session_get_channel(session); + } + if ((switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { return SWITCH_STATUS_SUCCESS; } @@ -288,17 +292,23 @@ timelimit *= 1000000; start = switch_timestamp_now(); - if (switch_channel_test_flag(caller_channel, CF_ANSWERED)) { - ringback_data = switch_channel_get_variable(caller_channel, "transfer_ringback"); - } + if (caller_channel) { + if (switch_channel_test_flag(caller_channel, CF_ANSWERED)) { + ringback_data = switch_channel_get_variable(caller_channel, "transfer_ringback"); + } + + if (!ringback_data) { + ringback_data = switch_channel_get_variable(caller_channel, "ringback"); + } + - if (!ringback_data) { - ringback_data = switch_channel_get_variable(caller_channel, "ringback"); + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) || switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) { + ringback_data = NULL; + } } - if (read_codec && (ringback_data || - (!(switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA))))) { + if (read_codec && ringback_data) { if (!(pass = (uint8_t) switch_test_flag(read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH))) { if (switch_core_codec_init(&write_codec, "L16", @@ -366,7 +376,9 @@ } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error!\n"); - switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE); + if (caller_channel) { + switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE); + } read_codec = NULL; } } @@ -1031,6 +1043,12 @@ endfor1: + if (caller_channel) { + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) || switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) { + ringback_data = NULL; + } + } + if (ringback_data && !switch_channel_test_flag(caller_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { if ((status = switch_channel_pre_answer(caller_channel)) != SWITCH_STATUS_SUCCESS) { @@ -1039,10 +1057,7 @@ } } - if (session && (read_codec = switch_core_session_get_read_codec(session)) && - (ringback_data || - (!(switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA))))) { - + if (session && (read_codec = switch_core_session_get_read_codec(session)) && ringback_data) { if (!(pass = (uint8_t) switch_test_flag(read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH))) { if (switch_core_codec_init(&write_codec, "L16",

1 0

[commit] r9094 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: mikej Date: Fri Jul 18 15:18:24 2008 New Revision: 9094 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: patch multiple SDP connection lines in sdp for proxy media mode (MODENDP-109) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 15:18:24 2008 @@ -779,7 +779,7 @@ p = ip_ptr; x = 0; - while (x < sizeof(rip) && p && *p && ((*p >= '0' && *p <= '9') || *p == '.')) { + while (x < sizeof(rip) && p && *p && ((*p >= '0' && *p <= '9') || *p == '.' || *p == ':' || (*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F'))) { rip[x++] = *p; p++; } @@ -861,8 +861,10 @@ void sofia_glue_tech_patch_sdp(private_object_t *tech_pvt) { switch_size_t len; - char *p, *q, *ip_ptr = NULL, *port_ptr = NULL, *vport_ptr = NULL; - int x; + char *p, *q; + int has_video=0,has_audio=0,has_ip=0; + char port_buf[25] = ""; + char vport_buf[25] = ""; if (switch_strlen_zero(tech_pvt->local_sdp_str)) { return; @@ -870,39 +872,13 @@ len = strlen(tech_pvt->local_sdp_str) + 384; - if ((p = (char *) switch_stristr("c=IN IP4 ", tech_pvt->local_sdp_str)) || - (p = (char *) switch_stristr("c=IN IP6 ", tech_pvt->local_sdp_str))) { - ip_ptr = p + 9; + if (switch_stristr("sendonly", tech_pvt->local_sdp_str) || switch_stristr("0.0.0.0", tech_pvt->local_sdp_str)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n"); + return; } - - if ((ip_ptr && !strncmp(ip_ptr, "0.0.0.0", 7)) || switch_stristr("sendonly", tech_pvt->local_sdp_str)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n"); - return; - } - - if ((p = (char *) switch_stristr("m=audio ", tech_pvt->local_sdp_str))) { - port_ptr = p + 8; - } - - if ((p = (char *) switch_stristr("m=video ", tech_pvt->local_sdp_str))) { - vport_ptr = p + 8; - } - - if (!(ip_ptr && port_ptr)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", - switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str); - return; - } - - if (vport_ptr) { - sofia_glue_tech_choose_video_port(tech_pvt, 1); - tech_pvt->video_rm_encoding = "PROXY-VID"; - tech_pvt->video_rm_rate = 90000; - tech_pvt->video_codec_ms = 0; - } - + if (switch_strlen_zero(tech_pvt->adv_sdp_audio_ip) || !tech_pvt->adv_sdp_audio_port) { - if (sofia_glue_tech_choose_port(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) { + if (sofia_glue_tech_choose_port(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel)); return; } @@ -910,47 +886,77 @@ tech_pvt->rm_rate = 8000; tech_pvt->codec_ms = 20; } - + + switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_audio_port); tech_pvt->orig_local_sdp_str = tech_pvt->local_sdp_str; tech_pvt->local_sdp_str = switch_core_session_alloc(tech_pvt->session, len); - q = tech_pvt->local_sdp_str; p = tech_pvt->orig_local_sdp_str; + q = tech_pvt->local_sdp_str; - while (p && *p) { - if (p == ip_ptr) { + while(p && *p) { + if (!strncmp("c=IN IP", p, 7)) { + strncpy(q, p, 9); + p += 9; + q += 9; strncpy(q, tech_pvt->adv_sdp_audio_ip, strlen(tech_pvt->adv_sdp_audio_ip)); q += strlen(tech_pvt->adv_sdp_audio_ip); - x = 0; - while (p && *p && ((*p >= '0' && *p <= '9') || *p == '.')) { + + while(p && *p && ((*p >= '0' && *p <= '9') || *p == '.' || *p == ':' || (*p >= 'A' && *p <= 'F') || (*p >= 'a' && *p <= 'f'))) { p++; } - } else if (p == port_ptr) { - char port_buf[25] = ""; + has_ip++; - switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_audio_port); + } else if (!strncmp("m=audio ", p, 8)) { + strncpy(q,p,8); + p += 8; + q += 8; strncpy(q, port_buf, strlen(port_buf)); q += strlen(port_buf); - x = 0; + while (p && *p && (*p >= '0' && *p <= '9')) { p++; } - } else if (vport_ptr && tech_pvt->adv_sdp_video_port && p == vport_ptr) { - char port_buf[25] = ""; - switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_video_port); - strncpy(q, port_buf, strlen(port_buf)); - q += strlen(port_buf); - x = 0; + has_audio++; + + } else if (!strncmp("m=video ", p, 8)) { + if (!has_video) { + sofia_glue_tech_choose_video_port(tech_pvt, 1); + tech_pvt->video_rm_encoding = "PROXY-VID"; + tech_pvt->video_rm_rate = 90000; + tech_pvt->video_codec_ms = 0; + switch_snprintf(vport_buf, sizeof(vport_buf), "%u", tech_pvt->adv_sdp_video_port); + } + + strncpy(q, p, 8); + p += 8; + q += 8; + strncpy(q, vport_buf, strlen(vport_buf)); + q += strlen(vport_buf); + while (p && *p && (*p >= '0' && *p <= '9')) { p++; } - } - *q++ = *p++; + has_video++; + } + + while (p && *p && *p != '\n') { + *q++ = *p++; + } + + *q++ = *p++; } + if (!has_ip && !has_audio) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", + switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str); + tech_pvt->local_sdp_str = tech_pvt->orig_local_sdp_str; + return; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Patched SDP\n---\n%s\n+++\n%s\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->orig_local_sdp_str, tech_pvt->local_sdp_str); }

1 0

[commit] r9093 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 13:51:01 2008 New Revision: 9093 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: add small padding to end of mp3 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Fri Jul 18 13:51:01 2008 @@ -86,13 +86,15 @@ if (context->fp) { unsigned char mp3buffer[8192]; - int16_t blank[1024] = {0}, *r = NULL; int len; + int16_t blank[2048] = {0}, *r = NULL; + + len = lame_encode_buffer(context->gfp, blank, r, sizeof(blank) / 2, mp3buffer, sizeof(mp3buffer)); - if ((len = lame_encode_buffer(context->gfp, blank, r, sizeof(blank) / 2, mp3buffer, sizeof(mp3buffer)))) { + if (len) { ret = fwrite(mp3buffer, 1, len, context->fp); } - + while ((len = lame_encode_flush(context->gfp, mp3buffer, sizeof(mp3buffer))) > 0) { ret = fwrite(mp3buffer, 1, len, context->fp); if (ret < 0) {

1 0

[commit] r9092 - in freeswitch/trunk/src/mod: endpoints/mod_sofia formats/mod_shout
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: anthm Date: Fri Jul 18 13:33:30 2008 New Revision: 9092 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 18 13:33:30 2008 @@ -464,7 +464,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! No IP returned\n"); return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Success [%s]:[%d] [%s][%d]\n", *ip, *port, tech_pvt->profile->rtpip, myport); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Success [%s]:[%d]\n", *ip, *port); if (tech_pvt) { if (myport == *port && !strcmp(*ip, tech_pvt->profile->rtpip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Not Required ip and port match. [%s]:[%d]\n", *ip, *port); Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Fri Jul 18 13:33:30 2008 @@ -85,16 +85,21 @@ } if (context->fp) { - unsigned char mp3buffer[1024]; + unsigned char mp3buffer[8192]; + int16_t blank[1024] = {0}, *r = NULL; int len; + if ((len = lame_encode_buffer(context->gfp, blank, r, sizeof(blank) / 2, mp3buffer, sizeof(mp3buffer)))) { + ret = fwrite(mp3buffer, 1, len, context->fp); + } + while ((len = lame_encode_flush(context->gfp, mp3buffer, sizeof(mp3buffer))) > 0) { ret = fwrite(mp3buffer, 1, len, context->fp); if (ret < 0) { break; } } - + lame_mp3_tags_fid(context->gfp, context->fp); fclose(context->fp);

1 0

[commit] r9091 - freeswitch/trunk/debian
by Freeswitch SVN 18 Jul '08

18 Jul '08

Author: ctrix Date: Fri Jul 18 13:02:57 2008 New Revision: 9091 Modified: freeswitch/trunk/debian/control Log: Restore support for lenny in debian builds Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Fri Jul 18 13:02:57 2008 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev +Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev Standards-Version: 3.7.3 Package: freeswitch

1 0