- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3008 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Oct '06

09 Oct '06

Author: anthm Date: Mon Oct 9 10:47:36 2006 New Revision: 3008 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: bug pointed out by stkn, thanks\! 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 Mon Oct 9 10:47:36 2006 @@ -2944,7 +2944,7 @@ switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); nua_respond(nh, SIP_401_UNAUTHORIZED, TAG_END()); - return; + goto done; } } @@ -3066,6 +3066,8 @@ break; } + + done: if (session) { switch_core_session_rwunlock(session);

1 0

[commit] r3006 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_rss mod/codecs/mod_g711 mod/codecs/mod_g722 mod/codecs/mod_g723_1 mod/codecs/mod_g726 mod/codecs/mod_g729 mod/codecs/mod_gsm mod/codecs/mod_ilbc mod/codecs/mod_l16 mod/codecs/mod_lpc10 mod/codecs/mod_speex mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/endpoints/mod_woomera mod/languages/mod_spidermonk
by Freeswitch SVN 09 Oct '06

09 Oct '06

Author: anthm Date: Sun Oct 8 22:24:43 2006 New Revision: 3006 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_rtp.c Log: refine code Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun Oct 8 22:24:43 2006 @@ -832,13 +832,14 @@ \return SWITCH_STATUS_SUCCESS if the handle is allocated */ SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, - char *codec_name, - uint32_t rate, - int ms, - int channels, - uint32_t flags, - const switch_codec_settings_t *codec_settings, - switch_memory_pool_t *pool); + char *codec_name, + char *fmtp, + uint32_t rate, + int ms, + int channels, + uint32_t flags, + const switch_codec_settings_t *codec_settings, + switch_memory_pool_t *pool); /*! \brief Encode data using a codec handle 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 Sun Oct 8 22:24:43 2006 @@ -442,6 +442,10 @@ const switch_codec_interface_t *codec_interface; /*! the specific implementation of the above codec */ const switch_codec_implementation_t *implementation; + /*! fmtp line from remote sdp */ + char *fmtp_in; + /*! fmtp line for local sdp */ + char *fmtp_out; /*! codec settings for this handle */ switch_codec_settings_t codec_settings; /*! flags to modify behaviour */ @@ -460,6 +464,8 @@ switch_payload_t ianacode; /*! the IANA code name */ char *iananame; + /*! default fmtp to send (can be overridden by the init function) */ + char *fmtp; /*! samples transferred per second */ uint32_t samples_per_second; /*! bits transferred per second */ 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 Sun Oct 8 22:24:43 2006 @@ -2343,6 +2343,7 @@ /* Setup a Signed Linear codec for reading audio. */ if (switch_core_codec_init(&member.read_codec, "L16", + NULL, //conference->rate, read_codec->implementation->samples_per_second, //conference->interval, @@ -2380,6 +2381,7 @@ /* Setup a Signed Linear codec for writing audio. */ if (switch_core_codec_init(&member.write_codec, "L16", + NULL, conference->rate, //read_codec->implementation->samples_per_second, conference->interval, Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Sun Oct 8 22:24:43 2006 @@ -255,6 +255,7 @@ if (switch_core_codec_init(&speech_codec, "L16", + NULL, (int)rate, interval, 1, Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Sun Oct 8 22:24:43 2006 @@ -193,6 +193,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 19200, /*.microseconds_per_frame */ 60000, @@ -213,6 +214,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 96000, /*.microseconds_per_frame */ 30000, @@ -233,6 +235,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", + /*.fmtp */ NULL, /*.samples_per_second */ 16000, /*.bits_per_second */ 128000, /*.microseconds_per_frame */ 20000, @@ -254,6 +257,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, @@ -276,6 +280,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 8, /*.iananame */ "PCMA", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Sun Oct 8 22:24:43 2006 @@ -125,6 +125,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 9, /*.iananame */ "G722", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, @@ -144,6 +145,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 9, /*.iananame */ "G722", + /*.fmtp */ NULL, /*.samples_per_second */ 16000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Sun Oct 8 22:24:43 2006 @@ -183,6 +183,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 4, /*.iananame */ "G723", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 6300, /*.microseconds_per_frame */ 30000, Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Sun Oct 8 22:24:43 2006 @@ -219,6 +219,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 127, /*.iananame */ "G726-16", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 16000, /*.microseconds_per_frame */ 20000, @@ -239,6 +240,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 126, /*.iananame */ "G726-24", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 24000, /*.microseconds_per_frame */ 20000, @@ -258,6 +260,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 2, /*.iananame */ "G726-32", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 20000, @@ -277,6 +280,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 125, /*.iananame */ "G726-40", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 40000, /*.microseconds_per_frame */ 20000, @@ -298,6 +302,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 124, /*.iananame */ "AAL2-G726-16", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 16000, /*.microseconds_per_frame */ 20000, @@ -318,6 +323,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 123, /*.iananame */ "AAL2-G726-24", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 24000, /*.microseconds_per_frame */ 20000, @@ -337,6 +343,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 2, /*.iananame */ "AAL2-G726-32", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 20000, @@ -356,6 +363,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 122, /*.iananame */ "AAL2-G726-40", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 40000, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Sun Oct 8 22:24:43 2006 @@ -222,6 +222,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 18, /*.iananame */ "G729", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 10000, @@ -241,6 +242,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 18, /*.iananame */ "G729", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c Sun Oct 8 22:24:43 2006 @@ -136,6 +136,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 3, /*.iananame */ "gsm", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 13200, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Sun Oct 8 22:24:43 2006 @@ -189,6 +189,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 97, /*.iananame */ "iLBC", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_30MS*8*8000/BLOCKL_30MS, /*.microseconds_per_frame */ 30000, @@ -208,6 +209,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 97, /*.iananame */ "iLBC", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS*8*8000/BLOCKL_20MS, /*.microseconds_per_frame */ 20000, @@ -230,6 +232,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 102, /*.iananame */ "iLBC", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_30MS*8*8000/BLOCKL_30MS, /*.microseconds_per_frame */ 30000, @@ -249,6 +252,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 102, /*.iananame */ "iLBC102", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS*8*8000/BLOCKL_20MS, /*.microseconds_per_frame */ 20000, @@ -270,6 +274,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 97, /*.iananame */ "iLBC20ms", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS*8*8000/BLOCKL_20MS, /*.microseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Sun Oct 8 22:24:43 2006 @@ -93,6 +93,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second = */ 32000, /*.bits_per_second = */ 512000, /*.microseconds_per_frame = */ 20000, @@ -112,6 +113,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second = */ 22050, /*.bits_per_second = */ 352800, /*.microseconds_per_frame = */ 20000, @@ -132,6 +134,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second = */ 16000, /*.bits_per_second = */ 256000, /*.microseconds_per_frame = */ 20000, @@ -152,6 +155,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second = */ 8000, /*.bits_per_second = */ 128000, /*.microseconds_per_frame = */ 20000, @@ -173,6 +177,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 128000, /*.microseconds_per_frame */ 30000, @@ -194,6 +199,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 60000, @@ -214,6 +220,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 512000, /*.microseconds_per_frame */ 120000, Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Sun Oct 8 22:24:43 2006 @@ -171,6 +171,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 7, /*.iananame */ "LPC", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 240, /*.microseconds_per_frame */ 22500, Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Sun Oct 8 22:24:43 2006 @@ -271,6 +271,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 102, /*.iananame */ "speex", + /*.fmtp */ NULL, /*.samples_per_second */ 32000, /*.bits_per_second */ 256000, /*.nanoseconds_per_frame */ 20000, @@ -290,6 +291,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 99, /*.iananame */ "speex", + /*.fmtp */ NULL, /*.samples_per_second */ 16000, /*.bits_per_second */ 22000, /*.nanoseconds_per_frame */ 20000, @@ -310,6 +312,7 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 98, /*.iananame */ "speex", + /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 20000, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Oct 8 22:24:43 2006 @@ -304,6 +304,7 @@ if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->codec_name, + NULL, tech_pvt->codec_rate, ms, 1, @@ -321,6 +322,7 @@ if (switch_core_codec_init(&tech_pvt->write_codec, tech_pvt->codec_name, + NULL, tech_pvt->codec_rate, ms, 1, @@ -1735,7 +1737,7 @@ name = "ilbc"; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d to %s %d\n", payloads[x].name, payloads[x].id, name, tech_pvt->codecs[y]->ianacode); - if (tech_pvt->codecs[y]->ianacode > 96) { + if (tech_pvt->codecs[y]->ianacode > 95) { match = strcasecmp(name, payloads[x].name) ? 0 : 1; } else { match = (payloads[x].id == tech_pvt->codecs[y]->ianacode) ? 1 : 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Sun Oct 8 22:24:43 2006 @@ -373,6 +373,7 @@ } if (switch_core_codec_init(&tech_pvt->read_codec, dname, + NULL, srate, interval, 1, @@ -383,6 +384,7 @@ } else { if (switch_core_codec_init(&tech_pvt->write_codec, dname, + NULL, srate, interval, 1, Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sun Oct 8 22:24:43 2006 @@ -768,6 +768,7 @@ if (switch_core_codec_init(&tech_pvt->read_codec, "L16", + NULL, sample_rate, codec_ms, 1, @@ -778,6 +779,7 @@ } else { if (switch_core_codec_init(&tech_pvt->write_codec, "L16", + NULL, sample_rate, codec_ms, 1, 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 Sun Oct 8 22:24:43 2006 @@ -250,6 +250,8 @@ char *contact_url; char *from_str; char *rm_encoding; + char *rm_fmtp; + char *fmtp_out; char *remote_sdp_str; char *local_sdp_str; char *dest; @@ -632,7 +634,7 @@ } } - if (tech_pvt->te > 96) { + if (tech_pvt->te > 95) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te); } @@ -640,16 +642,26 @@ if (tech_pvt->rm_encoding) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->pt, tech_pvt->rm_encoding, tech_pvt->rm_rate); + if (tech_pvt->fmtp_out) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); + } + if (tech_pvt->read_codec.implementation) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); + } + } else if (tech_pvt->num_codecs) { int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); + if (imp->fmtp) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", imp->microseconds_per_frame / 1000); } } - if (tech_pvt->te > 96) { + if (tech_pvt->te > 95) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } @@ -1126,6 +1138,7 @@ if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->rm_encoding, + tech_pvt->rm_fmtp, tech_pvt->rm_rate, tech_pvt->codec_ms, 1, @@ -1138,6 +1151,7 @@ } else { if (switch_core_codec_init(&tech_pvt->write_codec, tech_pvt->rm_encoding, + tech_pvt->rm_fmtp, tech_pvt->rm_rate, tech_pvt->codec_ms, 1, @@ -1158,6 +1172,7 @@ switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out); } } return SWITCH_STATUS_SUCCESS; @@ -1771,8 +1786,9 @@ for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; - - if (map->rm_pt < 97) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Compare [%s:%d]/[%s:%d]\n", + map->rm_encoding, map->rm_pt, imp->iananame, imp->ianacode); + if (map->rm_pt < 96) { match = (map->rm_pt == imp->ianacode) ? 1 : 0; } else { match = strcasecmp(map->rm_encoding, imp->iananame) ? 0 : 1; @@ -1784,6 +1800,7 @@ tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = imp->microseconds_per_frame / 1000; tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); + tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; break; } else { @@ -1872,6 +1889,9 @@ private_object_t *tech_pvt = NULL; switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; const char *replaces_str; + char *uuid; + switch_core_session_t *other_session = NULL; + switch_channel_t *other_channel = NULL; tl_gets(tags, NUTAG_CALLSTATE_REF(ss_state), @@ -1917,6 +1937,12 @@ if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); + switch_channel_set_flag(channel, CF_EARLY_MEDIA); + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + other_channel = switch_core_session_get_channel(other_session); + switch_channel_pre_answer(other_channel); + switch_core_session_rwunlock(other_session); + } return; } else { sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); @@ -1933,12 +1959,12 @@ sdp_parser_free(parser); } - if (match) { tech_choose_port(tech_pvt); activate_rtp(tech_pvt); switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); + switch_channel_set_flag(channel, CF_EARLY_MEDIA); return; } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); @@ -1983,7 +2009,7 @@ switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); - + if (replaces_str && (replaces = sip_replaces_make(tech_pvt->home, replaces_str)) && (bnh = nua_handle_by_replaces(nua, replaces))) { sofia_private_t *b_private; @@ -2068,6 +2094,11 @@ if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_set_flag(channel, CF_ANSWERED); + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + other_channel = switch_core_session_get_channel(other_session); + switch_channel_answer(other_channel); + switch_core_session_rwunlock(other_session); + } return; } else { sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Sun Oct 8 22:24:43 2006 @@ -346,7 +346,7 @@ } if (switch_core_codec_init - (&tech_pvt->read_codec, "L16", rate, 20, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + (&tech_pvt->read_codec, "L16", NULL, rate, 20, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Cannot set read codec\n", switch_channel_get_name(channel)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -354,7 +354,7 @@ } if (switch_core_codec_init - (&tech_pvt->write_codec, "L16", rate, 20, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + (&tech_pvt->write_codec, "L16", NULL, rate, 20, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Cannot set read codec\n", switch_channel_get_name(channel)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Sun Oct 8 22:24:43 2006 @@ -211,7 +211,7 @@ tech_pvt->frame.data = tech_pvt->databuf; if (switch_core_codec_init - (&tech_pvt->read_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + (&tech_pvt->read_codec, "L16", NULL, rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Cannot set read codec\n", switch_channel_get_name(channel)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -219,7 +219,7 @@ } if (switch_core_codec_init - (&tech_pvt->write_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + (&tech_pvt->write_codec, "L16", NULL, rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Cannot set read codec\n", switch_channel_get_name(channel)); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Oct 8 22:24:43 2006 @@ -1985,6 +1985,7 @@ if (switch_core_codec_init(&tto->codec, "L16", + NULL, read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, read_codec->implementation->number_of_channels, Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Oct 8 22:24:43 2006 @@ -652,7 +652,7 @@ return session->write_codec; } -SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, uint32_t rate, int ms, +SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, char *fmtp, uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool) @@ -684,7 +684,7 @@ codec->codec_interface = codec_interface; codec->implementation = implementation; codec->flags = flags; - + if (pool) { codec->memory_pool = pool; } else { @@ -692,6 +692,10 @@ return status; } switch_set_flag(codec, SWITCH_CODEC_FLAG_FREE_POOL); + } + + if (fmtp) { + codec->fmtp_in = switch_core_strdup(codec->memory_pool, fmtp); } implementation->init(codec, flags, codec_settings); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Oct 8 22:24:43 2006 @@ -378,6 +378,7 @@ codec_name = "L16"; if (switch_core_codec_init(&codec, codec_name, + NULL, read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, read_codec->implementation->number_of_channels, @@ -710,6 +711,7 @@ if (switch_core_codec_init(&codec, codec_name, + NULL, fh->samplerate, interval, fh->channels, @@ -1177,6 +1179,7 @@ if (switch_core_codec_init(&codec, codec_name, + NULL, (int)rate, interval, 1, @@ -1239,7 +1242,7 @@ { switch_core_thread_session_t *his_thread, *data = obj; int *stream_id_p; - int stream_id = 0, ans_a = 0, ans_b = 0; + int stream_id = 0, pre_b = 0, ans_a = 0, ans_b = 0, originator = 0; switch_input_callback_function_t input_callback; switch_core_session_message_t msg = {0}; void *user_data; @@ -1265,10 +1268,13 @@ chan_a = switch_core_session_get_channel(session_a); chan_b = switch_core_session_get_channel(session_b); - ans_a = switch_channel_test_flag(chan_a, CF_ANSWERED); - ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED); + if ((originator = switch_channel_test_flag(chan_a, CF_ORIGINATOR))) { + pre_b = switch_channel_test_flag(chan_a, CF_EARLY_MEDIA); + ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED); + } + switch_channel_set_flag(chan_a, CF_BRIDGED); while (switch_channel_ready(chan_a) && data->running > 0 && his_thread->running > 0) { @@ -1292,21 +1298,19 @@ } if (!switch_channel_test_flag(chan_a, CF_HOLD)) { - /* If this call is running on early media and it answers for real, pass it along... */ - if (!ans_b && switch_channel_test_flag(chan_a, CF_ANSWERED)) { - if (!switch_channel_test_flag(chan_b, CF_ANSWERED)) { - switch_channel_answer(chan_b); - } - ans_b++; - } - - if (!ans_a && switch_channel_test_flag(chan_b, CF_ANSWERED)) { - if (!switch_channel_test_flag(chan_a, CF_ANSWERED)) { + + if (!ans_a && originator) { + if (!ans_b && switch_channel_test_flag(chan_b, CF_ANSWERED)) { switch_channel_answer(chan_a); + ans_a++; + } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { + switch_channel_pre_answer(chan_a); + pre_b++; } - ans_a++; + switch_yield(10000); + continue; } - + if (switch_core_session_dequeue_private_event(session_a, &event) == SWITCH_STATUS_SUCCESS) { switch_channel_set_flag(chan_b, CF_HOLD); switch_ivr_parse_event(session_a, event); @@ -1931,17 +1935,16 @@ } endfor1: - + if (session && !switch_channel_test_flag(caller_channel, CF_NOMEDIA)) { switch_codec_t *read_codec = NULL; - switch_channel_pre_answer(caller_channel); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); if (!(pass = (uint8_t)switch_test_flag(read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH))) { if (switch_core_codec_init(&write_codec, "L16", + NULL, read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, @@ -1965,6 +1968,7 @@ while ((!caller_channel || switch_channel_ready(caller_channel)) && check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key) && ((time(NULL) - start) < (time_t)timelimit_sec)) { + /* read from the channel while we wait if the audio is up on it */ if (session && !switch_channel_test_flag(caller_channel, CF_NOMEDIA) && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { @@ -2007,13 +2011,17 @@ goto done; } - if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + if (caller_channel) { char *val; - if (switch_channel_test_flag(peer_channel, CF_NOMEDIA) && (val = switch_channel_get_variable(peer_channel, SWITCH_R_SDP_VARIABLE))) { switch_channel_set_variable(caller_channel, SWITCH_L_SDP_VARIABLE, val); } - switch_channel_answer(caller_channel); + + if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + switch_channel_answer(caller_channel); + } else if (switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { + switch_channel_pre_answer(caller_channel); + } } if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Oct 8 22:24:43 2006 @@ -1317,6 +1317,7 @@ if (switch_core_codec_init(&rtp_session->vad_data.vad_codec, codec->implementation->iananame, + NULL, codec->implementation->samples_per_second, codec->implementation->microseconds_per_frame / 1000, codec->implementation->number_of_channels,

1 0

[commit] r3004 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: anthm Date: Sun Oct 8 11:51:10 2006 New Revision: 3004 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c Log: fix goofy 183 madness 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 Sun Oct 8 11:51:10 2006 @@ -1916,7 +1916,7 @@ if (channel) { if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { - switch_channel_pre_answer(channel); + switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); return; } else { sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); @@ -1938,7 +1938,7 @@ tech_choose_port(tech_pvt); activate_rtp(tech_pvt); switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); - switch_channel_pre_answer(channel); + switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); return; } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); @@ -2067,7 +2067,7 @@ if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); - switch_channel_answer(channel); + switch_channel_set_flag(channel, CF_ANSWERED); return; } else { sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); @@ -2090,7 +2090,7 @@ switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); tech_choose_port(tech_pvt); activate_rtp(tech_pvt); - switch_channel_answer(channel); + switch_channel_set_flag(channel, CF_ANSWERED); return; } @@ -2100,7 +2100,7 @@ } else if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); - switch_channel_answer(channel); + switch_channel_set_flag(channel, CF_ANSWERED); return; } //else probably an ack } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Oct 8 11:51:10 2006 @@ -950,6 +950,10 @@ return SWITCH_STATUS_SUCCESS; } + if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { + return SWITCH_STATUS_SUCCESS; + } + msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; status = switch_core_session_message_send(uuid, &msg);

1 0

[commit] r3003 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 04:35:27 2006 New Revision: 3003 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_loadable_module.c Log: add description and syntax to interface database, add description and syntax headers to events for interface add for api and application interface, add appropriate output to show and help commands. 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 Sun Oct 8 04:35:27 2006 @@ -448,10 +448,12 @@ if (!cmd) { sprintf (sql, "select * from interfaces"); } - else if ( !strcmp(cmd,"codec") || !strcmp(cmd,"application") || - !strcmp(cmd,"api") || !strcmp(cmd,"dialplan") || + else if ( !strcmp(cmd,"codec") || !strcmp(cmd,"dialplan") || !strcmp(cmd,"file") || !strcmp(cmd,"timer") ) { + sprintf (sql, "select type, name from interfaces where type = '%s'", cmd); + } + else if (!strcmp(cmd,"application") || !strcmp(cmd,"api")) { sprintf (sql, "select * from interfaces where type = '%s'", cmd); } else if ( !strcmp(cmd,"calls")) { @@ -466,9 +468,9 @@ holder.print_title = 0; if ((cmdname = strchr(cmd, ' ')) != 0) { *cmdname++ = '\0'; - sprintf (sql, "select name from interfaces where type = 'api' and name = '%s'", cmdname); + sprintf (sql, "select name, description, syntax from interfaces where type = 'api' and name = '%s'", cmdname); } else { - sprintf (sql, "select name from interfaces where type = 'api'"); + sprintf (sql, "select name, description, syntax from interfaces where type = 'api'"); } } else { @@ -519,7 +521,7 @@ stream->write_function(stream, "\nValid Commands:\n\n"); show_function(showcmd, session, stream); if (all) - stream->write_function(stream, "version\n" "help - umm yeah..\n" "shutdown - stop the program\n\n"); + stream->write_function(stream, "version\n" "shutdown - stop the program\n"); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Oct 8 04:35:27 2006 @@ -3414,9 +3414,11 @@ case SWITCH_EVENT_LOG: return; case SWITCH_EVENT_MODULE_LOAD: - sql = switch_core_db_mprintf("insert into interfaces (type,name) values('%q','%q')", + sql = switch_core_db_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", switch_event_get_header(event, "type"), - switch_event_get_header(event, "name") + switch_event_get_header(event, "name"), + switch_event_get_header(event, "description"), + switch_event_get_header(event, "syntax") ); break; default: @@ -3661,7 +3663,9 @@ char create_interfaces_sql[] = "CREATE TABLE interfaces (\n" " type VARCHAR(255),\n" - " name VARCHAR(255)\n" + " name VARCHAR(255),\n" + " description VARCHAR(255),\n" + " syntax VARCHAR(255)\n" ");\n"; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening DB\n"); Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sun Oct 8 04:35:27 2006 @@ -161,6 +161,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "application"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->interface_name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "description", "%s", ptr->short_desc); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "syntax", "%s", ptr->syntax); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.application_hash, @@ -176,6 +178,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "api"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->interface_name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "description", "%s", ptr->desc); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "syntax", "%s", ptr->syntax); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.api_hash, (char *) ptr->interface_name, (void *) ptr);

1 0

[commit] r3002 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 04:09:57 2006 New Revision: 3002 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_console.c Log: make help an api command, still need to add syntax and descriptions to the db so we can output those as well. 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 Sun Oct 8 04:09:57 2006 @@ -384,6 +384,7 @@ switch_stream_handle_t *stream; char *http; uint32_t count; + int print_title; }; static int show_callback(void *pArg, int argc, char **argv, char **columnNames){ @@ -391,7 +392,7 @@ int x; - if (holder->count == 0) { + if (holder->print_title && holder->count == 0) { if (holder->http) { holder->stream->write_function(holder->stream, "\n<tr>"); } @@ -432,6 +433,7 @@ char *errmsg; switch_core_db_t *db = switch_core_db_handle(); struct holder holder = {0}; + int help = 0; if (session) { return SWITCH_STATUS_FALSE; @@ -441,6 +443,8 @@ holder.http = switch_event_get_header(stream->event, "http-host"); } + holder.print_title = 1; + if (!cmd) { sprintf (sql, "select * from interfaces"); } @@ -456,6 +460,17 @@ else if ( !strcmp(cmd,"channels")) { sprintf (sql, "select * from channels"); } + else if (!strncasecmp(cmd, "help", 4)) { + char *cmdname = NULL; + help = 1; + holder.print_title = 0; + if ((cmdname = strchr(cmd, ' ')) != 0) { + *cmdname++ = '\0'; + sprintf (sql, "select name from interfaces where type = 'api' and name = '%s'", cmdname); + } else { + sprintf (sql, "select name from interfaces where type = 'api'"); + } + } else { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); return SWITCH_STATUS_SUCCESS; @@ -474,11 +489,13 @@ holder.stream->write_function(holder.stream, "</table>"); } - if (errmsg) { stream->write_function(stream, "SQL ERR [%s]\n",errmsg); switch_core_db_free(errmsg); errmsg = NULL; + } else if (help) { + if (holder.count == 0) + stream->write_function(stream, "No such command.\n"); } else { stream->write_function(stream, "\n%u total.\n", holder.count); } @@ -487,14 +504,39 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + char showcmd[1024]; + int all = 0; + if (switch_strlen_zero(cmd)) { + sprintf (showcmd, "help"); + all = 1; + } else { + sprintf (showcmd, "help %s", cmd); + } + if (all) + stream->write_function(stream, "\nValid Commands:\n\n"); + show_function(showcmd, session, stream); + if (all) + stream->write_function(stream, "version\n" "help - umm yeah..\n" "shutdown - stop the program\n\n"); + return SWITCH_STATUS_SUCCESS; +} +static switch_api_interface_t help_api_interface = { + /*.interface_name */ "help", + /*.desc */ "Show help for all the api commands", + /*.function */ help_function, + /*.syntax */ "help", + /*.next */ NULL +}; + static switch_api_interface_t ctl_api_interface = { /*.interface_name */ "fsctl", /*.desc */ "control messages", /*.function */ ctl_function, /*.syntax */ "fsctl [hupall|pause|resume|shutdown]", - /*.next */ + /*.next */ &help_api_interface }; static switch_api_interface_t uuid_bridge_api_interface = { Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Sun Oct 8 04:09:57 2006 @@ -112,14 +112,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); return 1; } - if (!strcmp(cmd, "help")) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, - "\n" - "Valid Commands:\n\n" - "version\n" "help - umm yeah..\n" "shutdown - stop the program\n\n"); - return 1; - } - if ((arg = strchr(cmd, '\r')) != 0 || (arg = strchr(cmd, '\n')) != 0 ) { *arg = '\0'; arg = NULL;

1 0

[commit] r3001 - in freeswitch/trunk/src/mod: applications/mod_commands applications/mod_conference applications/mod_dptools endpoints/mod_dingaling endpoints/mod_portaudio languages/mod_spidermonkey
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 03:11:42 2006 New Revision: 3001 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add syntax to api structures, use them for usage returns, do more checking on valid usage and cleanup some output of api commands. 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 Sun Oct 8 03:11:42 2006 @@ -34,6 +34,16 @@ #include <switch.h> static const char modname[] = "mod_commands"; +static switch_api_interface_t ctl_api_interface; +static switch_api_interface_t uuid_bridge_api_interface; +static switch_api_interface_t status_api_interface; +static switch_api_interface_t show_api_interface; +static switch_api_interface_t pause_api_interface; +static switch_api_interface_t transfer_api_interface; +static switch_api_interface_t load_api_interface; +static switch_api_interface_t reload_api_interface; +static switch_api_interface_t kill_api_interface; +static switch_api_interface_t originate_api_interface; static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { @@ -94,7 +104,7 @@ uint32_t arg = 0; if (switch_strlen_zero(data)) { - stream->write_function(stream, "USAGE: fsctl [hupall|pause|resume|shutdown]\n"); + stream->write_function(stream, "USAGE: %s\n", ctl_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -137,7 +147,7 @@ return SWITCH_STATUS_FALSE; } if (switch_strlen_zero(mod)) { - stream->write_function(stream, "USAGE: load <mod_name>\n"); + stream->write_function(stream, "USAGE: %s\n", load_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); @@ -172,7 +182,7 @@ } if (!dest) { - stream->write_function(stream, "USAGE: killchan <uuid>\n"); + stream->write_function(stream, "USAGE: %s\n", kill_api_interface.syntax); } else if ((session = switch_core_session_locate(dest))) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); @@ -199,7 +209,7 @@ argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 2 || argc > 4) { - stream->write_function(stream, "USAGE: transfer <uuid> <dest-exten> [<dialplan>] [<context>]\n"); + stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); } else { char *uuid = argv[0]; char *dest = argv[1]; @@ -238,7 +248,7 @@ argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc != 2) { - stream->write_function(stream, "Invalid Parameters\nUSAGE: uuid_bridge <uuid> <other_uuid>\n"); + stream->write_function(stream, "USAGE: %s\n", uuid_bridge_api_interface.syntax); } else { if (switch_ivr_uuid_bridge(argv[0], argv[1]) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "Invalid uuid\n"); @@ -263,7 +273,7 @@ argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 2) { - stream->write_function(stream, "USAGE: pause <uuid> <on|off>\n"); + stream->write_function(stream, "USAGE: %s\n", pause_api_interface.syntax); } else { char *uuid = argv[0]; char *dest = argv[1]; @@ -301,13 +311,13 @@ return SWITCH_STATUS_SUCCESS; } + argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (switch_strlen_zero(cmd) || argc < 2 || argc > 7) { - stream->write_function(stream, "USAGE: originate <call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]\n"); + stream->write_function(stream, "USAGE: %s\n", originate_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - for(x = 0; x < argc; x++) { if (!strcasecmp(argv[x], "undef")) { argv[x] = NULL; @@ -333,11 +343,6 @@ timeout = atoi(argv[6]); } - if (!aleg || !exten) { - stream->write_function(stream, "Invalid Arguements\n"); - return SWITCH_STATUS_SUCCESS; - } - if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "Cannot Create Outgoing Channel! [%s]\n", aleg); return SWITCH_STATUS_SUCCESS; @@ -347,7 +352,6 @@ assert(caller_channel != NULL); switch_channel_clear_state_handler(caller_channel, NULL); - if (*exten == '&') { switch_caller_extension_t *extension = NULL; char *app_name = switch_core_session_strdup(caller_session, (exten + 1)); @@ -453,9 +457,7 @@ sprintf (sql, "select * from channels"); } else { - stream->write_function(stream, "Invalid interfaces type!\n"); - stream->write_function(stream, "USAGE:\n"); - stream->write_function(stream, "show <blank>|codec|application|api|dialplan|file|timer|calls|channels\n"); + stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -491,7 +493,7 @@ /*.interface_name */ "fsctl", /*.desc */ "control messages", /*.function */ ctl_function, - /*.syntax */ NULL, + /*.syntax */ "fsctl [hupall|pause|resume|shutdown]", /*.next */ }; @@ -499,7 +501,7 @@ /*.interface_name */ "uuid_bridge", /*.desc */ "uuid_bridge", /*.function */ uuid_bridge_function, - /*.syntax */ NULL, + /*.syntax */ "uuid_bridge <uuid> <other_uuid>", /*.next */ &ctl_api_interface }; @@ -507,7 +509,7 @@ /*.interface_name */ "status", /*.desc */ "status", /*.function */ status_function, - /*.syntax */ NULL, + /*.syntax */ "status", /*.next */ &uuid_bridge_api_interface }; @@ -515,7 +517,7 @@ /*.interface_name */ "show", /*.desc */ "Show", /*.function */ show_function, - /*.syntax */ NULL, + /*.syntax */ "show <blank>|codec|application|api|dialplan|file|timer|calls|channels", /*.next */ &status_api_interface }; @@ -523,7 +525,7 @@ /*.interface_name */ "pause", /*.desc */ "Pause", /*.function */ pause_function, - /*.syntax */ NULL, + /*.syntax */ "pause <uuid> <on|off>", /*.next */ &show_api_interface }; @@ -531,7 +533,7 @@ /*.interface_name */ "transfer", /*.desc */ "Transfer", /*.function */ transfer_function, - /*.syntax */ NULL, + /*.syntax */ "transfer <uuid> <dest-exten> [<dialplan>] [<context>]", /*.next */ &pause_api_interface }; @@ -539,7 +541,7 @@ /*.interface_name */ "load", /*.desc */ "Load Module", /*.function */ load_function, - /*.syntax */ NULL, + /*.syntax */ "load <mod_name>", /*.next */ &transfer_api_interface }; @@ -547,16 +549,16 @@ /*.interface_name */ "reloadxml", /*.desc */ "Reload XML", /*.function */ reload_function, - /*.syntax */ NULL, + /*.syntax */ "reloadxml", /*.next */ &load_api_interface, }; -static switch_api_interface_t commands_api_interface = { +static switch_api_interface_t kill_api_interface = { /*.interface_name */ "killchan", /*.desc */ "Kill Channel", /*.function */ kill_function, - /*.syntax */ NULL, + /*.syntax */ "killchan <uuid>", /*.next */ &reload_api_interface }; @@ -564,8 +566,8 @@ /*.interface_name */ "originate", /*.desc */ "Originate a Call", /*.function */ originate_function, - /*.syntax */ NULL, - /*.next */ &commands_api_interface + /*.syntax */ "originate <call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]", + /*.next */ &kill_api_interface }; 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 Sun Oct 8 03:11:42 2006 @@ -34,6 +34,7 @@ static const char modname[] = "mod_conference"; static const char global_app_name[] = "conference"; static char *global_cf_name = "conference.conf"; +static switch_api_interface_t conf_api_interface; /* Size to allocate for audio buffers */ #define CONF_BUFFER_SIZE 1024 * 128 @@ -1317,29 +1318,6 @@ char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; char *http = NULL; - char *topusage = "Available Commands:\n" - "--------------------------------------------------------------------------------\n" - "conference commands\n" - "conference list [delim <string>]\n" - "conference <confname> list [delim <string>]\n" - "conference <confname> energy <member_id> [<newval>]\n" - "conference <confname> volume_in <member_id> [<newval>]\n" - "conference <confname> volume_out <member_id> [<newval>]\n" - "conference <confname> play <file_path> [<member_id>]\n" - "conference <confname> say <text>\n" - "conference <confname> saymember <member_id><text>\n" - "conference <confname> stop <[current|all]> [<member_id>]\n" - "conference <confname> kick <member_id>\n" - "conference <confname> mute <member_id>\n" - "conference <confname> unmute <member_id>\n" - "conference <confname> deaf <member_id>\n" - "conference <confname> undef <member_id>\n" - "conference <confname> relate <member_id> <other_member_id> [nospeak|nohear]\n" - "conference <confname> lock\n" - "conference <confname> unlock\n" - "conference <confname> dial <endpoint_module_name>/<destination>\n" - "conference <confname> transfer <member_id> <conference_name>\n" - ; if (session) { return SWITCH_STATUS_FALSE; @@ -1355,7 +1333,7 @@ } if (!buf) { - stream->write_function(stream, topusage); + stream->write_function(stream, "%s", conf_api_interface.syntax); return status; } @@ -1370,7 +1348,7 @@ /* Figure out what conference */ if (argc) { if (!strcasecmp(argv[0], "commands")) { - stream->write_function(stream, topusage); + stream->write_function(stream, "%s", conf_api_interface.syntax); goto done; } else if (!strcasecmp(argv[0], "list")) { switch_hash_index_t *hi; @@ -2020,7 +1998,7 @@ goto done; } } else { - stream->write_function(stream, topusage); + stream->write_function(stream, "USAGE: %s\n", conf_api_interface.syntax); } } else { stream->write_function(stream, "Memory Error!\n"); @@ -2666,7 +2644,27 @@ /*.interface_name */ "conference", /*.desc */ "Conference", /*.function */ conf_function, - /*.syntax */ NULL, + /*.syntax */ + "conference commands\n" + "conference list [delim <string>]\n" + "conference <confname> list [delim <string>]\n" + "conference <confname> energy <member_id> [<newval>]\n" + "conference <confname> volume_in <member_id> [<newval>]\n" + "conference <confname> volume_out <member_id> [<newval>]\n" + "conference <confname> play <file_path> [<member_id>]\n" + "conference <confname> say <text>\n" + "conference <confname> saymember <member_id><text>\n" + "conference <confname> stop <[current|all]> [<member_id>]\n" + "conference <confname> kick <member_id>\n" + "conference <confname> mute <member_id>\n" + "conference <confname> unmute <member_id>\n" + "conference <confname> deaf <member_id>\n" + "conference <confname> undef <member_id>\n" + "conference <confname> relate <member_id> <other_member_id> [nospeak|nohear]\n" + "conference <confname> lock\n" + "conference <confname> unlock\n" + "conference <confname> dial <endpoint_module_name>/<destination>\n" + "conference <confname> transfer <member_id> <conference_name>\n", /*.next */ }; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sun Oct 8 03:11:42 2006 @@ -33,7 +33,6 @@ static const char modname[] = "mod_dptools"; - static void transfer_function(switch_core_session_t *session, char *data) { int argc; @@ -133,7 +132,7 @@ /*.interface_name */ "strftime", /*.desc */ "strftime", /*.function */ strftime_api_function, - /*.syntax */ NULL, + /*.syntax */ "strftime <format_string>", /*.next */ NULL }; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Oct 8 03:11:42 2006 @@ -1071,7 +1071,7 @@ /*.interface_name */ "dl_logout", /*.desc */ "DingaLing Logout", /*.function */ dl_logout, - /*.syntax */ NULL, + /*.syntax */ "dl_logout <profile_name>", /*.next */ NULL }; @@ -1079,7 +1079,7 @@ /*.interface_name */ "dl_login", /*.desc */ "DingaLing Login", /*.function */ dl_login, - /*.syntax */ NULL, + /*.syntax */ "dl_login <profile_name>", /*.next */ &logout_api_interface }; @@ -1400,7 +1400,7 @@ } if (!profile_name) { - stream->write_function(stream, "NO PROFILE NAME SPECIFIED\n"); + stream->write_function(stream, "USAGE: %s\n", logout_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -1426,14 +1426,14 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(arg)) { - stream->write_function(stream, "FAIL\n"); - return SWITCH_STATUS_SUCCESS; - } - myarg = strdup(arg); argc = switch_separate_string(myarg, ';', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (switch_strlen_zero(arg) || argc != 1) { + stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); + return SWITCH_STATUS_SUCCESS; + } if (!strncasecmp(argv[0], "profile=", 8)) { char *profile_name = argv[0] + 8; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sun Oct 8 03:11:42 2006 @@ -440,7 +440,7 @@ /*.interface_name */ "padtmf", /*.desc */ "PortAudio Dial DTMF", /*.function */ send_dtmf, - /*.syntax */ NULL, + /*.syntax */ "padtmf <callid> <dtmf_digits>", /*.next */ NULL }; @@ -448,7 +448,7 @@ /*.interface_name */ "paoffhook", /*.desc */ "PortAudio Answer Call", /*.function */ answer_call, - /*.syntax */ NULL, + /*.syntax */ "paoffhook", /*.next */ &send_dtmf_interface }; @@ -456,7 +456,7 @@ /*.interface_name */ "painfo", /*.desc */ "PortAudio Call Info", /*.function */ call_info, - /*.syntax */ NULL, + /*.syntax */ "painfo", /*.next */ &answer_call_interface }; @@ -464,7 +464,7 @@ /*.interface_name */ "pahup", /*.desc */ "PortAudio Hangup Call", /*.function */ hup_call, - /*.syntax */ NULL, + /*.syntax */ "pahup [call_number]", /*.next */ &channel_info_interface }; @@ -472,7 +472,7 @@ /*.interface_name */ "pacall", /*.desc */ "PortAudio Call", /*.function */ place_call, - /*.syntax */ NULL, + /*.syntax */ "pacall <exten>", /*.next */ &channel_hup_interface }; @@ -837,11 +837,9 @@ } if (!dest) { - stream->write_function(stream, "Usage: pacall <exten>"); + stream->write_function(stream, "Usage: %s\n", channel_api_interface.syntax); return SWITCH_STATUS_FALSE; } - - stream->write_function(stream, "FAIL"); if ((session = switch_core_session_request(&channel_endpoint_interface, NULL)) != 0) { struct private_object *tech_pvt; @@ -878,6 +876,8 @@ switch_channel_set_state(channel, CS_INIT); switch_core_session_thread_launch(tech_pvt->session); stream->write_function(stream, "SUCCESS:%s:%s", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } else { + stream->write_function(stream, "FAIL\n"); } } return status; @@ -936,16 +936,17 @@ { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; - char *dtmf; + char *dtmf = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if ((dtmf = strchr(callid, ' ')) != 0) { - *dtmf++ = '\0'; + if (switch_strlen_zero(callid) || (dtmf = strchr(callid, ' ')) == 0) { + stream->write_function(stream, "USAGE: %s\n", send_dtmf_interface.syntax); + return SWITCH_STATUS_SUCCESS; } else { - dtmf = ""; + *dtmf++ = '\0'; } if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid)) != 0) { Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Oct 8 03:11:42 2006 @@ -69,6 +69,7 @@ static int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval); static void session_destroy(JSContext *cx, JSObject *obj); static JSBool session_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); +static switch_api_interface_t js_run_interface; static struct { size_t gStackChunkSize; @@ -2675,12 +2676,12 @@ { if (switch_strlen_zero(text)) { - stream->write_function(stream, "INVALID"); + stream->write_function(stream, "USAGE: %s\n", js_run_interface.syntax); return SWITCH_STATUS_SUCCESS; } js_thread_launch(text); - stream->write_function(stream, "OK"); + stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; } @@ -2696,7 +2697,7 @@ /*.interface_name */ "jsrun", /*.desc */ "run a script", /*.function */ launch_async, - /*.syntax */ NULL, + /*.syntax */ "jsrun <script>", /*.next */ NULL };

1 0

[commit] r3000 - in freeswitch/trunk/src: dotnet dotnet/Marshaling/Types dotnet/Modules include mod/applications/mod_commands mod/applications/mod_conference mod/applications/mod_dptools mod/endpoints/mod_dingaling mod/endpoints/mod_portaudio mod/languages/mod_spidermonkey
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 01:04:34 2006 New Revision: 3000 Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs freeswitch/trunk/src/dotnet/Module.cs freeswitch/trunk/src/dotnet/Modules/Api.cs freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add syntax field to the api interface struct. Modified: freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs (original) +++ freeswitch/trunk/src/dotnet/Marshaling/Types/ApiInterfaceMarshal.cs Sun Oct 8 01:04:34 2006 @@ -42,7 +42,8 @@ internal IntPtr interface_name; //[MarshalAs(UnmanagedType.LPStr)] internal IntPtr desc; - internal ApiFunction function; + internal ApiFunction function; + internal IntPtr syntax; internal IntPtr next; } } Modified: freeswitch/trunk/src/dotnet/Module.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Module.cs (original) +++ freeswitch/trunk/src/dotnet/Module.cs Sun Oct 8 01:04:34 2006 @@ -130,6 +130,7 @@ /* Allocate umanaged mem to to interface fields so GC doesn't disturb them */ apiInterfaceMarshal.interface_name = Marshal.StringToHGlobalAnsi(apiInterface.Name); apiInterfaceMarshal.desc = Marshal.StringToHGlobalAnsi(apiInterface.Description); + apiInterfaceMarshal.syntax = Marshal.StringToHGlobalAnsi(apiInterface.Syntax); apiInterfaceMarshal.function = new ApiFunction(apiInterface.ApiFunction); /* Set the handle of the managed object */ Modified: freeswitch/trunk/src/dotnet/Modules/Api.cs ============================================================================== --- freeswitch/trunk/src/dotnet/Modules/Api.cs (original) +++ freeswitch/trunk/src/dotnet/Modules/Api.cs Sun Oct 8 01:04:34 2006 @@ -41,6 +41,7 @@ { private string name; private string description; + private string syntax; private ApiFunction apiFunction; public HandleRef handle; @@ -54,6 +55,12 @@ { set { description = value; } get { return description; } + } + + public string Syntax + { + set { syntax = value; } + get { return syntax; } } public ApiFunction ApiFunction 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 Sun Oct 8 01:04:34 2006 @@ -537,6 +537,8 @@ const char *desc; /*! function the api call uses */ switch_api_function_t function; + /*! an example of the application syntax */ + const char *syntax; const struct switch_api_interface *next; }; 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 Sun Oct 8 01:04:34 2006 @@ -491,6 +491,7 @@ /*.interface_name */ "fsctl", /*.desc */ "control messages", /*.function */ ctl_function, + /*.syntax */ NULL, /*.next */ }; @@ -498,6 +499,7 @@ /*.interface_name */ "uuid_bridge", /*.desc */ "uuid_bridge", /*.function */ uuid_bridge_function, + /*.syntax */ NULL, /*.next */ &ctl_api_interface }; @@ -505,6 +507,7 @@ /*.interface_name */ "status", /*.desc */ "status", /*.function */ status_function, + /*.syntax */ NULL, /*.next */ &uuid_bridge_api_interface }; @@ -512,6 +515,7 @@ /*.interface_name */ "show", /*.desc */ "Show", /*.function */ show_function, + /*.syntax */ NULL, /*.next */ &status_api_interface }; @@ -519,6 +523,7 @@ /*.interface_name */ "pause", /*.desc */ "Pause", /*.function */ pause_function, + /*.syntax */ NULL, /*.next */ &show_api_interface }; @@ -526,6 +531,7 @@ /*.interface_name */ "transfer", /*.desc */ "Transfer", /*.function */ transfer_function, + /*.syntax */ NULL, /*.next */ &pause_api_interface }; @@ -533,6 +539,7 @@ /*.interface_name */ "load", /*.desc */ "Load Module", /*.function */ load_function, + /*.syntax */ NULL, /*.next */ &transfer_api_interface }; @@ -540,6 +547,7 @@ /*.interface_name */ "reloadxml", /*.desc */ "Reload XML", /*.function */ reload_function, + /*.syntax */ NULL, /*.next */ &load_api_interface, }; @@ -548,6 +556,7 @@ /*.interface_name */ "killchan", /*.desc */ "Kill Channel", /*.function */ kill_function, + /*.syntax */ NULL, /*.next */ &reload_api_interface }; @@ -555,6 +564,7 @@ /*.interface_name */ "originate", /*.desc */ "Originate a Call", /*.function */ originate_function, + /*.syntax */ NULL, /*.next */ &commands_api_interface }; 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 Sun Oct 8 01:04:34 2006 @@ -2665,7 +2665,8 @@ static switch_api_interface_t conf_api_interface = { /*.interface_name */ "conference", /*.desc */ "Conference", - /*.function */ conf_function + /*.function */ conf_function, + /*.syntax */ NULL, /*.next */ }; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sun Oct 8 01:04:34 2006 @@ -133,6 +133,7 @@ /*.interface_name */ "strftime", /*.desc */ "strftime", /*.function */ strftime_api_function, + /*.syntax */ NULL, /*.next */ NULL }; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Oct 8 01:04:34 2006 @@ -1071,6 +1071,7 @@ /*.interface_name */ "dl_logout", /*.desc */ "DingaLing Logout", /*.function */ dl_logout, + /*.syntax */ NULL, /*.next */ NULL }; @@ -1078,6 +1079,7 @@ /*.interface_name */ "dl_login", /*.desc */ "DingaLing Login", /*.function */ dl_login, + /*.syntax */ NULL, /*.next */ &logout_api_interface }; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sun Oct 8 01:04:34 2006 @@ -440,6 +440,7 @@ /*.interface_name */ "padtmf", /*.desc */ "PortAudio Dial DTMF", /*.function */ send_dtmf, + /*.syntax */ NULL, /*.next */ NULL }; @@ -447,6 +448,7 @@ /*.interface_name */ "paoffhook", /*.desc */ "PortAudio Answer Call", /*.function */ answer_call, + /*.syntax */ NULL, /*.next */ &send_dtmf_interface }; @@ -454,6 +456,7 @@ /*.interface_name */ "painfo", /*.desc */ "PortAudio Call Info", /*.function */ call_info, + /*.syntax */ NULL, /*.next */ &answer_call_interface }; @@ -461,6 +464,7 @@ /*.interface_name */ "pahup", /*.desc */ "PortAudio Hangup Call", /*.function */ hup_call, + /*.syntax */ NULL, /*.next */ &channel_info_interface }; @@ -468,6 +472,7 @@ /*.interface_name */ "pacall", /*.desc */ "PortAudio Call", /*.function */ place_call, + /*.syntax */ NULL, /*.next */ &channel_hup_interface }; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Oct 8 01:04:34 2006 @@ -2696,6 +2696,7 @@ /*.interface_name */ "jsrun", /*.desc */ "run a script", /*.function */ launch_async, + /*.syntax */ NULL, /*.next */ NULL };

1 0

[commit] r2999 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 00:40:15 2006 New Revision: 2999 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add more usage checking and return usage information on invalid usage of api commands. 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 Sun Oct 8 00:40:15 2006 @@ -114,7 +114,7 @@ arg = 0; switch_core_session_ctl(SCSC_SHUTDOWN, &arg); } else { - stream->write_function(stream, "INVALID COMMAND [%s]\n", argv[0]); + stream->write_function(stream, "INVALID COMMAND [%s]\nUSAGE: fsctl [hupall|pause|resume|shutdown]\n", argv[0]); goto end; } @@ -136,6 +136,10 @@ if (session) { return SWITCH_STATUS_FALSE; } + if (switch_strlen_zero(mod)) { + stream->write_function(stream, "USAGE: load <mod_name>\n"); + return SWITCH_STATUS_SUCCESS; + } switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; @@ -167,7 +171,9 @@ return SWITCH_STATUS_FALSE; } - if (dest && (session = switch_core_session_locate(dest))) { + if (!dest) { + stream->write_function(stream, "USAGE: killchan <uuid>\n"); + } else if ((session = switch_core_session_locate(dest))) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); switch_core_session_rwunlock(session); @@ -232,9 +238,11 @@ argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc != 2) { - stream->write_function(stream, "Invalid Parameters\nUsage: uuid_bridge <uuid> <other_uuid>\n"); + stream->write_function(stream, "Invalid Parameters\nUSAGE: uuid_bridge <uuid> <other_uuid>\n"); } else { - switch_ivr_uuid_bridge(argv[0], argv[1]); + if (switch_ivr_uuid_bridge(argv[0], argv[1]) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "Invalid uuid\n"); + } } return SWITCH_STATUS_SUCCESS; @@ -293,8 +301,8 @@ return SWITCH_STATUS_SUCCESS; } - if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "Usage: originate <call url> <exten> [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]\n"); + if (switch_strlen_zero(cmd) || argc < 2 || argc > 7) { + stream->write_function(stream, "USAGE: originate <call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]\n"); return SWITCH_STATUS_SUCCESS; } @@ -446,7 +454,7 @@ } else { stream->write_function(stream, "Invalid interfaces type!\n"); - stream->write_function(stream, "Example:\n"); + stream->write_function(stream, "USAGE:\n"); stream->write_function(stream, "show <blank>|codec|application|api|dialplan|file|timer|calls|channels\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2998 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 00:39:21 2006 New Revision: 2998 Modified: freeswitch/trunk/src/switch_ivr.c Log: switch_ivr_uuid_bridge make return SWITCH_STATUS_SUCESS on success. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Oct 8 00:39:21 2006 @@ -2343,10 +2343,13 @@ switch_channel_set_state(originator_channel, CS_TRANSMIT); switch_channel_set_state(originatee_channel, CS_TRANSMIT); + status = SWITCH_STATUS_SUCCESS; } else { switch_core_session_rwunlock(originator_session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "no channel for uuid %s\n", originatee_uuid); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "no channel for originatee uuid %s\n", originatee_uuid); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "no channel for originator uuid %s\n", originator_uuid); } return status;

1 0

[commit] r2997 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '06

08 Oct '06

Author: mikej Date: Sun Oct 8 00:37:03 2006 New Revision: 2997 Modified: freeswitch/trunk/src/switch_channel.c Log: type tweaks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Oct 8 00:37:03 2006 @@ -1004,7 +1004,7 @@ { char *p, *c; char *data, *indup; - int sp = 0, len = 0, olen = 0, vtype = 0, br = 0, vnamepos, vvalpos, cpos, ppos, block = 128; + size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, vnamepos, vvalpos, cpos, ppos, block = 128; char *sub_val = NULL, *func_val = NULL; if (!strchr(in, '$') && !strchr(in, '&')) { @@ -1029,7 +1029,7 @@ if (vtype) { char *s = p, *e, *vname, *vval = NULL; - int nlen; + size_t nlen; s++; if (*s == '{') { br = 1;

1 0