- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r1834 - freeswitch/branches/waryan
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 17:17:41 2006 New Revision: 1834 Added: freeswitch/branches/waryan/ Log: Creating empty folder for waryan

1 0

[commit] r1833 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: mikej Date: Tue Jul 11 16:59:07 2006 New Revision: 1833 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_loadable_module.c Log: fix windows build 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 Tue Jul 11 16:59:07 2006 @@ -557,7 +557,7 @@ for (x = 0; x < imember->read / 2; x++) { int32_t z = muxed[x] + bptr[x]; normalize_to_16bit(z); - muxed[x] = z; + muxed[x] = (int16_t)z; } ready++; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jul 11 16:59:07 2006 @@ -2870,9 +2870,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err) { + switch_xml_t xml = NULL, cfg = NULL; memset(&runtime, 0, sizeof(runtime)); runtime.session_limit = 1000; - switch_xml_t xml = NULL, cfg = NULL; switch_core_set_globals(); Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Tue Jul 11 16:59:07 2006 @@ -668,7 +668,7 @@ name = prefs[x]; if ((p = strchr(name, '@'))) { p++; - len = p-name; + len = (uint32_t)(p-name); if (len > sizeof(buf)) { len = sizeof(buf); @@ -683,7 +683,7 @@ for (imp = codec_interface->implementations; imp; imp = imp->next) { if (!interval) { array[i++] = imp; - } else if ((imp->microseconds_per_frame / 1000) == interval) { + } else if ((uint32_t)(imp->microseconds_per_frame / 1000) == interval) { array[i++] = imp; } }

1 0

[commit] r1832 - in freeswitch/branches/cypromis: trunk trunk-old
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: cypromis Date: Tue Jul 11 16:52:05 2006 New Revision: 1832 Added: freeswitch/branches/cypromis/trunk-old/ - copied from r1831, /freeswitch/branches/cypromis/trunk/ Removed: freeswitch/branches/cypromis/trunk/ Log: lets archive old stuff and try again fresh

1 0

[commit] r1831 - freeswitch/branches/mm22m83
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 15:22:45 2006 New Revision: 1831 Added: freeswitch/branches/mm22m83/ Log: Creating empty folder for mm22m83

1 0

[commit] r1830 - freeswitch/trunk/src/mod/loggers/mod_syslog
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: anthm Date: Tue Jul 11 13:39:50 2006 New Revision: 1830 Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: fix logical error Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Jul 11 13:39:50 2006 @@ -106,12 +106,15 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { *interface = &console_module_interface; + switch_status_t status; - switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); + if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { + return status; + } - load_config(); - openlog(globals.ident, LOG_PID, LOG_USER); + + switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); return SWITCH_STATUS_SUCCESS; } @@ -129,27 +132,28 @@ char *var, *val; char *cf = "syslog.conf"; - if (!switch_config_open_file(&cfg, cf)) { + memset(&globals, 0, sizeof(globals)); + + if (switch_config_open_file(&cfg, cf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); - return SWITCH_STATUS_TERM; - } - while (switch_config_next_pair(&cfg, &var, &val)) { - if (!strcasecmp(cfg.category, "settings")) { - if (!strcmp(var, "ident")) { - set_global_ident(val); - } else if (!strcmp(var, "facility")) { - set_global_facility(val); - } else if (!strcmp(var, "format")) { - set_global_format(val); - } else if (!strcmp(var, "level")) { - set_global_level(val);; + while (switch_config_next_pair(&cfg, &var, &val)) { + if (!strcasecmp(cfg.category, "settings")) { + if (!strcmp(var, "ident")) { + set_global_ident(val); + } else if (!strcmp(var, "facility")) { + set_global_facility(val); + } else if (!strcmp(var, "format")) { + set_global_format(val); + } else if (!strcmp(var, "level")) { + set_global_level(val);; + } } } + + switch_config_close_file(&cfg); } - switch_config_close_file(&cfg); - if (switch_strlen_zero(globals.ident)) { set_global_ident(DEFAULT_IDENT); }

1 0

[commit] r1829 - freeswitch/branches/bhikubhai
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 06:33:42 2006 New Revision: 1829 Added: freeswitch/branches/bhikubhai/ Log: Creating empty folder for bhikubhai

1 0

[commit] r1828 - freeswitch/branches/tykecom
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 04:12:40 2006 New Revision: 1828 Added: freeswitch/branches/tykecom/ Log: Creating empty folder for tykecom

1 0

[commit] r1827 - freeswitch/branches/vanhuisw
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 01:02:42 2006 New Revision: 1827 Added: freeswitch/branches/vanhuisw/ Log: Creating empty folder for vanhuisw

1 0

[commit] r1826 - freeswitch/branches/vanhui
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: sphere Date: Tue Jul 11 00:31:40 2006 New Revision: 1826 Added: freeswitch/branches/vanhui/ Log: Creating empty folder for vanhui

1 0

[commit] r1825 - freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip
by Freeswitch SVN 11 Jul '06

11 Jul '06

Author: stkn Date: Mon Jul 10 21:02:17 2006 New Revision: 1825 Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c Log: Partially revert mod_pjsip codec handling changes, we might want to traverse the list of implementations for a codec (e.g. renegotiation) in call_on_media_update() Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.c Mon Jul 10 21:02:17 2006 @@ -864,7 +864,7 @@ struct pjsip_tech_pvt *pvt; const pjmedia_sdp_session *remote_sdp, *local_sdp; pj_pool_t *pool; - const switch_codec_implementation_t *imp; + const switch_codec_implementation_t *codec, *imp; switch_channel_t *channel; switch_core_session_t *session; switch_status_t ret; @@ -935,7 +935,7 @@ } /* retrieve stream (= codec) information */ - status = mod_pjsip_codec_from_sdp( pvt, pool, local_sdp, remote_sdp, 0, &imp ); + status = mod_pjsip_codec_from_sdp( pvt, pool, local_sdp, remote_sdp, 0, &codec, &imp ); if( status != PJ_SUCCESS ) { /* No valid codec found */ switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SDP negotation failed, codec unknown\n" ); @@ -949,10 +949,10 @@ rate = imp->bits_per_second / 8; ms = imp->microseconds_per_frame / 1000; - switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, rate: %d, ms per frame: %d\n", imp->iananame, rate, ms ); + switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, rate: %d, ms per frame: %d\n", codec->iananame, rate, ms ); /* initialize codecs */ - ret = switch_core_codec_init(&pvt->read_codec, imp->iananame, rate, ms, 1, + ret = switch_core_codec_init(&pvt->read_codec, codec->iananame, rate, ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool( session )); @@ -962,7 +962,7 @@ return; } - ret = switch_core_codec_init(&pvt->write_codec, imp->iananame, rate, ms, 1, + ret = switch_core_codec_init(&pvt->write_codec, codec->iananame, rate, ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool( session )); @@ -991,7 +991,7 @@ strncpy( pvt->remote_sdp_audio_addr, pj_inet_ntoa( tmp_addr ), sizeof(pvt->remote_sdp_audio_addr) ); } - switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, %s:%d\n", imp->iananame, pvt->remote_sdp_audio_addr, pvt->remote_sdp_audio_port ); + switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec %s, %s:%d\n", codec->iananame, pvt->remote_sdp_audio_addr, pvt->remote_sdp_audio_port ); /* start rtp */ start_rtp( pvt ); Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip.h Mon Jul 10 21:02:17 2006 @@ -42,7 +42,8 @@ const pjmedia_sdp_session *local, const pjmedia_sdp_session *remote, const unsigned int stream_idx, - const switch_codec_implementation_t **codec_imp ); + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ); /* * Get address from sdp Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_pjsip/mod_pjsip_sdp.c Mon Jul 10 21:02:17 2006 @@ -46,13 +46,15 @@ struct pjsip_tech_pvt *pvt, unsigned int pt, unsigned int clock_rate, - const switch_codec_implementation_t **codec_imp ) + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ) { const switch_codec_implementation_t *tmp_imp; int i; + assert( codec != NULL ); assert( pvt != NULL ); - assert( codec_imp != NULL ); + assert( imp != NULL ); tmp_imp = NULL; for( i = 0; i < pvt->num_codecs; i++ ) { @@ -62,7 +64,8 @@ while( tmp_imp != NULL ) { if ( tmp_imp->samples_per_second == clock_rate ) { - *codec_imp = tmp_imp; + *codec = pvt->codecs[i]; + *imp = tmp_imp; return PJ_SUCCESS; } @@ -80,7 +83,8 @@ const pjmedia_sdp_session *local, const pjmedia_sdp_session *remote, const unsigned int stream_idx, - const switch_codec_implementation_t **codec_imp ) + const switch_codec_implementation_t **codec, + const switch_codec_implementation_t **imp ) { const pjmedia_sdp_attr *attr; const pjmedia_sdp_media *local_m; @@ -93,7 +97,8 @@ assert( pool != NULL ); assert( local != NULL ); assert( remote != NULL ); - assert( codec_imp != NULL ); + assert( codec != NULL ); + assert( imp != NULL ); assert( stream_idx < local->media_count ); assert( stream_idx < remote->media_count ); @@ -134,14 +139,14 @@ /* Build codec format info: */ if (has_rtpmap) { - status = find_codec( pvt, pt, rtpmap->clock_rate, codec_imp ); + status = find_codec( pvt, pt, rtpmap->clock_rate, codec, imp ); if( status != PJ_SUCCESS ) return PJ_ENOTFOUND; } else { /* * No rtpmap, use default clock_rate (8000 Hz) */ - status = find_codec( pvt, pt, 8000, codec_imp ); + status = find_codec( pvt, pt, 8000, codec, imp ); if( status != PJ_SUCCESS ) return PJ_ENOTFOUND; }

1 0