- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7977 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 13:54:28 2008 New Revision: 7977 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: refactor a little Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Fri Mar 28 13:54:28 2008 @@ -65,14 +65,19 @@ static void do_reopen(cdr_fd_t *fd) { + int x = 0; if (fd->fd > -1) { close(fd->fd); fd->fd = -1; } - if ((fd->fd = open(fd->path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) > -1) { - fd->bytes = fd_size(fd->fd); + for (x = 0 ; x < 10; x++) { + if ((fd->fd = open(fd->path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) > -1) { + fd->bytes = fd_size(fd->fd); + break; + } + switch_yield(100000); } } @@ -101,58 +106,57 @@ do_reopen(fd); if (fd->fd < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", fd->path); + switch_event_t *event; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening %s\n", fd->path); + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Critical-Error", "Error opening cdr file %s\n", fd->path); + switch_event_fire(&event); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s CDR logfile %s\n", globals.rotate ? "Rotated" : "Re-opened", fd->path); } - + } static void write_cdr(const char *path, const char *log_line) { cdr_fd_t *fd = NULL; - - if ((fd = switch_core_hash_find(globals.fd_hash, path))) { - switch_mutex_lock(fd->mutex); - } else { - int lfd = open(path, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); - - if (lfd > -1) { - fd = switch_core_alloc(globals.pool, sizeof(*fd)); - switch_mutex_init(&fd->mutex, SWITCH_MUTEX_NESTED, globals.pool); - fd->fd = lfd; - switch_mutex_lock(fd->mutex); - fd->path = switch_core_strdup(globals.pool, path); - fd->bytes = fd_size(fd->fd); - switch_core_hash_insert(globals.fd_hash, path, fd); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); - } + unsigned int bytes_in, bytes_out; + + if (!(fd = switch_core_hash_find(globals.fd_hash, path))) { + fd = switch_core_alloc(globals.pool, sizeof(*fd)); + switch_assert(fd); + memset(fd, 0, sizeof(*fd)); + fd->fd = -1; + switch_mutex_init(&fd->mutex, SWITCH_MUTEX_NESTED, globals.pool); + fd->path = switch_core_strdup(globals.pool, path); + switch_core_hash_insert(globals.fd_hash, path, fd); } - - if (fd) { - unsigned int bytes_in, bytes_out; - bytes_out = (unsigned)strlen(log_line); - - if (fd->bytes + bytes_out > UINT_MAX) { - do_rotate(fd); - } - + + switch_mutex_lock(fd->mutex); + bytes_out = (unsigned)strlen(log_line); + + if (fd->fd < 0) { + do_reopen(fd); if (fd->fd < 0) { - do_reopen(fd); - if (fd->fd < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); - return; - } - } - - if ((bytes_in = write(fd->fd, log_line, bytes_out)) != bytes_out) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s %d/%d\n", path, (int)bytes_in, (int)bytes_out); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); + goto end; } - fd->bytes += bytes_in; - switch_mutex_unlock(fd->mutex); } + if (fd->bytes + bytes_out > UINT_MAX) { + do_rotate(fd); + } + + if ((bytes_in = write(fd->fd, log_line, bytes_out)) != bytes_out) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write error to file %s %d/%d\n", path, (int)bytes_in, (int)bytes_out); + } + + fd->bytes += bytes_in; + + end: + + switch_mutex_unlock(fd->mutex); } static switch_status_t my_on_hangup(switch_core_session_t *session)

1 0

[commit] r7976 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 13:28:19 2008 New Revision: 7976 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: reset descriptor to -1 after closing file in rotate Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Fri Mar 28 13:28:19 2008 @@ -85,6 +85,7 @@ size_t len; close(fd->fd); + fd->fd = -1; if (globals.rotate) { switch_time_exp_lt(&tm, switch_timestamp_now());

1 0

[commit] r7975 - freeswitch/trunk/src
by Freeswitch SVN 28 Mar '08

28 Mar '08

Author: anthm Date: Fri Mar 28 11:27:17 2008 New Revision: 7975 Modified: freeswitch/trunk/src/switch_core_io.c Log: tweak Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Mar 28 11:27:17 2008 @@ -384,12 +384,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 1\n"); case SWITCH_STATUS_SUCCESS: session->enc_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); - session->enc_read_frame.timestamp = read_frame->timestamp; - session->enc_read_frame.rate = read_frame->rate; - session->enc_read_frame.ssrc = read_frame->ssrc; - session->enc_read_frame.seq = read_frame->seq; - session->enc_read_frame.m = read_frame->m; - session->enc_read_frame.payload = session->read_codec->implementation->ianacode; + if (perfect) { + session->enc_read_frame.timestamp = read_frame->timestamp; + session->enc_read_frame.rate = read_frame->rate; + session->enc_read_frame.ssrc = read_frame->ssrc; + session->enc_read_frame.seq = read_frame->seq; + session->enc_read_frame.m = read_frame->m; + session->enc_read_frame.payload = session->read_codec->implementation->ianacode; + } *frame = &session->enc_read_frame; break; case SWITCH_STATUS_NOOP: @@ -783,10 +785,8 @@ case SWITCH_STATUS_RESAMPLE: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; - session->enc_write_frame.seq = frame->seq; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; if (!session->write_resampler) { @@ -806,10 +806,6 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - if (!ptime_mismatch) { - session->enc_write_frame.timestamp = frame->timestamp; - session->enc_write_frame.seq = frame->seq; - } session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; @@ -824,10 +820,8 @@ } enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); - enc_frame->timestamp = frame->timestamp; enc_frame->m = frame->m; enc_frame->ssrc = frame->ssrc; - enc_frame->seq = frame->seq; enc_frame->payload = enc_frame->codec->implementation->ianacode; write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS;

1 0

[commit] r7974 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 18:46:47 2008 New Revision: 7974 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_loadable_module.c Log: tweak Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Mar 27 18:46:47 2008 @@ -45,7 +45,7 @@ #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 #define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX / 2; else if (n < SWITCH_SMIN) n = SWITCH_SMIN / 2; -#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uk@%ui", \ +#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uh@%ui", \ codec->implementation->iananame, \ codec->implementation->samples_per_second, \ codec->implementation->microseconds_per_frame / 1000) 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 Thu Mar 27 18:46:47 2008 @@ -162,9 +162,6 @@ rate = imp->samples_per_second; - if (ptime && ptime != imp->microseconds_per_frame / 1000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); - } switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); @@ -343,7 +340,7 @@ codec_string = tech_pvt->profile->codec_string; } } - + if ((ocodec = switch_channel_get_variable(tech_pvt->channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { codec_string = ocodec; @@ -354,7 +351,7 @@ } } } - + if (codec_string) { char *tmp_codec_string; if ((tmp_codec_string = switch_core_session_strdup(tech_pvt->session, codec_string))) { Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Mar 27 18:46:47 2008 @@ -1251,11 +1251,10 @@ last = name = next = cur = buf; for (;;) { - - if (!next) { break; } + if ((p = strchr(next, '@'))) { *p++ = '\0'; }

1 0

[commit] r7973 - in freeswitch/trunk/src: . include
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 18:22:46 2008 New Revision: 7973 Modified: freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c Log: fix some stuff Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Mar 27 18:22:46 2008 @@ -306,11 +306,14 @@ break; \ } +SWITCH_DECLARE(uint32_t) switch_core_codec_next_id(void); + #define SWITCH_ADD_CODEC(codec_int, int_name) \ for (;;) { \ - codec_int = (switch_codec_interface_t *)switch_loadable_module_create_interface(*module_interface, SWITCH_CODEC_INTERFACE); \ - codec_int->interface_name = switch_core_strdup(pool, int_name); \ - break; \ + codec_int = (switch_codec_interface_t *)switch_loadable_module_create_interface(*module_interface, SWITCH_CODEC_INTERFACE); \ + codec_int->interface_name = switch_core_strdup(pool, int_name); \ + codec_int->codec_id = switch_core_codec_next_id(); \ + break; \ } @@ -373,7 +376,7 @@ impl->encode = encode; impl->decode = decode; impl->destroy = destroy; - + impl->codec_id = codec_interface->codec_id; impl->next = codec_interface->implementations; codec_interface->implementations = impl; } Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Mar 27 18:22:46 2008 @@ -560,6 +560,7 @@ switch_core_codec_decode_func_t decode; /*! deinitalize a codec handle using this implementation */ switch_core_codec_destroy_func_t destroy; + uint32_t codec_id; struct switch_codec_implementation *next; }; @@ -569,6 +570,7 @@ const char *interface_name; /*! a list of codec implementations related to the codec */ switch_codec_implementation_t *implementations; + uint32_t codec_id; struct switch_codec_interface *next; }; Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Mar 27 18:22:46 2008 @@ -35,6 +35,14 @@ #include <switch.h> #include "private/switch_core_pvt.h" +static uint32_t CODEC_ID = 0; + +SWITCH_DECLARE(uint32_t) switch_core_codec_next_id(void) +{ + return CODEC_ID++; +} + + SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Mar 27 18:22:46 2008 @@ -323,7 +323,6 @@ } if (session->read_codec) { - if (session->read_resampler) { short *data = read_frame->data; switch_mutex_lock(session->resample_mutex); @@ -353,6 +352,7 @@ goto done; } } + if (perfect || switch_buffer_inuse(session->raw_read_buffer) >= session->read_codec->implementation->bytes_per_frame) { if (perfect) { @@ -484,7 +484,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_frame_t *enc_frame = NULL, *write_frame = frame; - unsigned int flag = 0, need_codec = 0, perfect = 0, do_bugs = 0, do_write = 0, do_resample = 0; + unsigned int flag = 0, need_codec = 0, perfect = 0, do_bugs = 0, do_write = 0, do_resample = 0, ptime_mismatch = 0; switch_io_flag_t io_flag = SWITCH_IO_FLAG_NOOP; switch_assert(session != NULL); @@ -514,6 +514,9 @@ if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE; + if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) { + ptime_mismatch = TRUE; + } } if (session->write_codec && !frame->codec) { @@ -525,13 +528,13 @@ } if (session->bugs && !need_codec) { - do_bugs = 1; - need_codec = 1; + do_bugs = TRUE; + need_codec = TRUE; } if (frame->codec->implementation->actual_samples_per_second != session->write_codec->implementation->actual_samples_per_second) { - need_codec = 1; - do_resample = 1; + need_codec = TRUE; + do_resample = TRUE; } if (need_codec) { @@ -671,7 +674,7 @@ } if (do_bugs) { - do_write = 1; + do_write = TRUE; write_frame = frame; goto done; } @@ -768,7 +771,7 @@ } else { rate = session->write_codec->implementation->actual_samples_per_second; } - + status = switch_core_codec_encode(session->write_codec, frame->codec, enc_frame->data, @@ -776,7 +779,6 @@ rate, session->enc_write_frame.data, &session->enc_write_frame.datalen, &session->enc_write_frame.rate, &flag); - switch (status) { case SWITCH_STATUS_RESAMPLE: session->enc_write_frame.codec = session->write_codec; @@ -804,10 +806,12 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; + if (!ptime_mismatch) { + session->enc_write_frame.timestamp = frame->timestamp; + session->enc_write_frame.seq = frame->seq; + } session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc; - session->enc_write_frame.seq = frame->seq; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; break; @@ -855,6 +859,7 @@ if (flag & SFF_CNG) { switch_set_flag(write_frame, SFF_CNG); } + if ((status = perform_write(session, write_frame, timeout, io_flag, stream_id)) != SWITCH_STATUS_SUCCESS) { break; } @@ -865,7 +870,7 @@ } } } else { - do_write = 1; + do_write = TRUE; } done:

1 0

[commit] r7972 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/endpoints/mod_sofia
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 16:36:03 2008 New Revision: 7972 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_loadable_module.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Mar 27 16:36:03 2008 @@ -4140,6 +4140,12 @@ conf_xml_cfg_t xml_cfg = { 0 }; switch_event_t *params = NULL; + /* Save the original read codec. */ + if (!(read_codec = switch_core_session_get_read_codec(session))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel has no media!\n"); + return; + } + if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid arguments\n"); @@ -4376,9 +4382,7 @@ if (!switch_channel_test_flag(channel, CF_OUTBOUND)) switch_set_flag(conference, CFLAG_ANSWERED); } - - /* Save the original read codec. */ - read_codec = switch_core_session_get_read_codec(session); + member.orig_read_codec = read_codec; member.native_rate = read_codec->implementation->samples_per_second; member.pool = switch_core_session_get_pool(session); 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 Thu Mar 27 16:36:03 2008 @@ -1043,7 +1043,6 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); - if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); 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 Thu Mar 27 16:36:03 2008 @@ -1961,6 +1961,7 @@ for (map = m->m_rtpmaps; map; map = map->rm_next) { int32_t i; + uint32_t near_rate = 0; const switch_codec_implementation_t *mimp = NULL, *near_match = NULL; const char *rm_encoding; @@ -2018,8 +2019,9 @@ match = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1; } - if (match && (map->rm_rate == codec_rate)) { - if (ptime && ptime * 1000 != imp->microseconds_per_frame) { + if (match) { + if ((ptime && ptime * 1000 != imp->microseconds_per_frame) || map->rm_rate != codec_rate) { + near_rate = map->rm_rate; near_match = imp; match = 0; continue; @@ -2036,8 +2038,8 @@ char *prefs[1]; char tmp[80]; int num; - - switch_snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", near_match->iananame, near_match->samples_per_second, ptime); + + switch_snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", near_match->iananame, near_rate ? near_rate : near_match->samples_per_second, ptime); prefs[0] = tmp; num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); @@ -2047,9 +2049,9 @@ } else { mimp = near_match; } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Substituting codec %s@%ums\n", - mimp->iananame, mimp->microseconds_per_frame / 1000); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Substituting codec %s@%ui@%uh\n", + mimp->iananame, mimp->microseconds_per_frame / 1000, mimp->samples_per_second); match = 1; } Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Mar 27 16:36:03 2008 @@ -41,6 +41,8 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; + switch_assert(codec->implementation); + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", codec->implementation->iananame); @@ -75,6 +77,8 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; + switch_assert(codec->implementation); + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", codec->implementation->iananame); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Mar 27 16:36:03 2008 @@ -160,7 +160,10 @@ } else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n", extension->current_application->application_name, switch_channel_get_name(session->channel)); - switch_channel_pre_answer(session->channel); + if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n"); + return; + } } if ((expanded = Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Mar 27 16:36:03 2008 @@ -1245,7 +1245,7 @@ for (x = 0; x < preflen; x++) { char *cur, *last = NULL, *next = NULL, *name, *p, buf[256]; - uint32_t interval = 0, rate = 0; + uint32_t interval = 0, rate = 8000; switch_copy_string(buf, prefs[x], sizeof(buf)); last = name = next = cur = buf;

1 0

[commit] r7971 - in freeswitch/trunk: conf/dialplan src/mod/applications/mod_commands
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: brian Date: Thu Mar 27 16:34:49 2008 New Revision: 7971 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak configs slightly to use the acl for rfc1918 check Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Mar 27 16:34:49 2008 @@ -40,8 +40,8 @@ <extension name="global" continue="true"> <condition field="${network_addr}" expression="^$" break="never"> - <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> - <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> + <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> </condition> <!-- This will setup some variables if the user isn't authenticated. numbering_plan is required for the demo to function properly. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Mar 27 16:34:49 2008 @@ -505,7 +505,7 @@ SWITCH_STANDARD_API(lan_addr_function) { - stream->write_function(stream, "%s", switch_is_lan_addr(cmd) ? "yes" : "no"); + stream->write_function(stream, "%s", switch_is_lan_addr(cmd) ? "true" : "false"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7970 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: anthm Date: Thu Mar 27 13:38:30 2008 New Revision: 7970 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: the power of r 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 Thu Mar 27 13:38:30 2008 @@ -940,7 +940,7 @@ rpid_domain = switch_core_session_strdup(session, use_from_str); sofia_glue_get_url_from_contact(rpid_domain, 0); - if ((rpid_domain = strchr(rpid_domain, '@'))) { + if ((rpid_domain = strrchr(rpid_domain, '@'))) { rpid_domain++; if ((p = strchr(rpid_domain, ';'))) { *p = '\0';

1 0

[commit] r7969 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock
by Freeswitch SVN 27 Mar '08

27 Mar '08

Author: intralanman Date: Thu Mar 27 09:48:17 2008 New Revision: 7969 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php Log: allow a null sock in send_command Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_sock/fs_sock.php Thu Mar 27 09:48:17 2008 @@ -255,7 +255,7 @@ * @param string $cmd command string to send to socket excluding any \r or \n * @return boolean */ - public function send_command($cmd, $sock) { + public function send_command($cmd, $sock=null) { $sock = is_null($sock) ? $this -> sock : $sock; $this -> debug('command is ' . $cmd); $cmd_split = split(' ', $cmd);

1 0

[commit] r7968 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 26 Mar '08

26 Mar '08

Author: brian Date: Wed Mar 26 18:19:38 2008 New Revision: 7968 Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml Log: add rfc1918 acl Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/acl.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/acl.conf.xml Wed Mar 26 18:19:38 2008 @@ -1,5 +1,11 @@ <configuration name="acl.conf" description="Network Lists"> <network-lists> + <list name="rfc1918" default="deny"> + <node type="allow" cidr="10.0.0.0/8"/> + <node type="allow" cidr="172.16.0.0/12"/> + <node type="allow" cidr="192.168.0.0/16"/> + </list> + <list name="lan" default="allow"> <node type="deny" cidr="192.168.42.0/24"/> <node type="allow" cidr="192.168.42.42/32"/>

1 0