- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4074 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: brian Date: Sun Jan 28 16:43:00 2007 New Revision: 4074 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: update to allow args to enum dialplan for lookups. Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sun Jan 28 16:43:00 2007 @@ -521,6 +521,7 @@ enum_record_t *results, *rp; switch_channel_t *channel = switch_core_session_get_channel(session); enum_route_t *rtp; + char *dp = (char *) arg; assert(channel != NULL); @@ -528,7 +529,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ENUM Lookup on %s\n", caller_profile->destination_number); - if (enum_lookup(globals.root, caller_profile->destination_number, &results) == SWITCH_STATUS_SUCCESS) { + if (enum_lookup(switch_strlen_zero(dp) ? globals.root : dp, caller_profile->destination_number, &results) == SWITCH_STATUS_SUCCESS) { if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); free_results(&results);

1 0

[commit] r4073 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sun Jan 28 12:37:51 2007 New Revision: 4073 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: CODEC TWEAK mod_sofia will now examine a variable in the channel to see what the channel's originator was using for a codec and try to put that to the top of the list in the sdp. if this new sofia profile param is set: <param name="disable-transcoding" value="true"/> All outbound calls will use *only* the codec that thier originator is using to ensure no transcoding. (of course that could lead to a failed call where there is no way to do this, so use sparingly) Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sun Jan 28 12:37:51 2007 @@ -38,7 +38,9 @@  <param name="nonce-ttl" value="60"/> - +  +     Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sun Jan 28 12:37:51 2007 @@ -82,6 +82,7 @@ #define SWITCH_BRIDGE_VARIABLE "_bridge_to_" #define SWITCH_SIGNAL_BRIDGE_VARIABLE "_signal_bridge_to_" #define SWITCH_ORIGINATOR_VARIABLE "_originator_" +#define SWITCH_ORIGINATOR_CODEC_VARIABLE "_originator_codec_" #define SWITCH_LOCAL_MEDIA_IP_VARIABLE "_local_media_ip_" #define SWITCH_LOCAL_MEDIA_PORT_VARIABLE "_local_media_port_" #define SWITCH_REMOTE_MEDIA_IP_VARIABLE "_remote_media_ip_" Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sun Jan 28 12:37:51 2007 @@ -62,6 +62,11 @@ apr_size_t *len); +#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uk@%ui", \ + codec->implementation->iananame, \ + codec->implementation->samples_per_second, \ + codec->implementation->microseconds_per_frame / 1000) + #ifdef WIN32 #define switch_is_file_path(file) (*(file +1) == ':' || *file == '/') #else 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 Jan 28 12:37:51 2007 @@ -142,7 +142,8 @@ PFLAG_AUTH_ALL = (1 << 2), PFLAG_FULL_ID = (1 << 3), PFLAG_PRESENCE = (1 << 4), - PFLAG_PASS_RFC2833 = (1 << 5) + PFLAG_PASS_RFC2833 = (1 << 5), + PFLAG_DISABLE_TRANSCODING = (1 << 6) } PFLAGS; typedef enum { @@ -772,6 +773,8 @@ { switch_channel_t *channel; char *codec_string = NULL; + char *csdyn = NULL; + char *ocodec = NULL; if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -786,11 +789,25 @@ channel = switch_core_session_get_channel(tech_pvt->session); assert (channel != NULL); + if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { codec_string = tech_pvt->profile->codec_string; } + if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { + if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { + codec_string = ocodec; + } else { + if ((csdyn = switch_mprintf("%s,%s", ocodec, codec_string))) { + codec_string = csdyn; + } else { + codec_string = ocodec; + } + } + } + if (codec_string) { + tech_pvt->profile->codec_order_last = switch_separate_string(codec_string, ',', tech_pvt->profile->codec_order, SWITCH_MAX_CODECS); tech_pvt->num_codecs = switch_loadable_module_get_codecs_sorted(tech_pvt->codecs, SWITCH_MAX_CODECS, tech_pvt->profile->codec_order, @@ -800,6 +817,8 @@ tech_pvt->num_codecs = switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), tech_pvt->codecs, sizeof(tech_pvt->codecs) / sizeof(tech_pvt->codecs[0])); } + + switch_safe_free(csdyn); } @@ -829,9 +848,10 @@ switch_core_session_set_private(session, tech_pvt); - tech_set_codecs(tech_pvt); + snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame); switch_channel_set_name(channel, name); + //tech_set_codecs(tech_pvt); } @@ -939,7 +959,8 @@ cid_name = (char *) caller_profile->caller_id_name; cid_num = (char *) caller_profile->caller_id_number; - + tech_set_codecs(tech_pvt); + if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", cid_name, cid_num, @@ -1433,7 +1454,7 @@ flags |= SWITCH_RTP_FLAG_BUGGY_2833; } - if (tech_pvt->profile->flags & PFLAG_PASS_RFC2833 || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { + if ((tech_pvt->profile->pflags & PFLAG_PASS_RFC2833) || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { flags |= SWITCH_RTP_FLAG_PASS_RFC2833; } @@ -2205,6 +2226,7 @@ attach_private(nsession, profile, tech_pvt, dest); + nchannel = switch_core_session_get_channel(nsession); caller_profile = switch_caller_profile_clone(nsession, outbound_profile); switch_channel_set_caller_profile(nchannel, caller_profile); @@ -4164,7 +4186,7 @@ } attach_private(session, profile, tech_pvt, username); - + tech_set_codecs(tech_pvt); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); @@ -4993,6 +5015,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PASS_RFC2833; } + } else if (!strcasecmp(var, "disable-transcoding")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_DISABLE_TRANSCODING; + } } else if (!strcasecmp(var, "auth-calls")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_CALLS; @@ -5035,7 +5061,6 @@ profile->max_calls = atoi(val); } else if (!strcasecmp(var, "codec-prefs")) { profile->codec_string = switch_core_strdup(profile->pool, val); - profile->codec_order_last = switch_separate_string(profile->codec_string, ',', profile->codec_order, SWITCH_MAX_CODECS); } else if (!strcasecmp(var, "codec-ms")) { profile->codec_ms = atoi(val); } else if (!strcasecmp(var, "dtmf-duration")) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Jan 28 12:37:51 2007 @@ -1577,10 +1577,17 @@ if (channel && peer_channel) { char *export_vars, *val; + switch_codec_t *read_codec = switch_core_session_get_read_codec(session); - switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_VARIABLE, switch_core_session_get_uuid(session)); - - /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ + if (read_codec) { + char tmp[80]; + switch_codec2str(read_codec, tmp, sizeof(tmp)); + switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_CODEC_VARIABLE, tmp); + } + + switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_VARIABLE, switch_core_session_get_uuid(session)); + + /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ if ((export_vars = switch_channel_get_variable(channel, "export_vars"))) { char *cptmp = switch_core_session_strdup(session, export_vars); int argc;

1 0

[commit] r4072 - freeswitch/trunk/src
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 22:17:12 2007 New Revision: 4072 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix sleep to work right on unanswered channels Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Jan 27 22:17:12 2007 @@ -71,7 +71,8 @@ break; } - if (switch_channel_test_flag(channel, CF_SERVICE)) { + if (switch_channel_test_flag(channel, CF_SERVICE) || + (!switch_channel_test_flag(channel, CF_ANSWERED) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA))) { switch_yield(1000); } else { status = switch_core_session_read_frame(session, &read_frame, left, 0);

1 0

[commit] r4071 - freeswitch/trunk/conf
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 22:05:20 2007 New Revision: 4071 Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/sofia.conf.xml Log: tweak default conf for better first experience Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Sat Jan 27 22:05:20 2007 @@ -29,7 +29,7 @@    -  +    @@ -45,7 +45,7 @@  <action application="set" data="ringback=${us-ring}"/>  - <action application="bridge" data="sofia/test/1234(a)conference.freeswitch.org"/> + <action application="bridge" data="sofia/$${domain}/1234(a)conference.freeswitch.org"/> </condition> </extension> @@ -59,7 +59,7 @@  <extension name="2000"> <condition field="destination_number" expression="^2000$"> - <action application="conference" data="bridge:mydynaconf:sofia/test/1234@conference.freeswitch.org"/> + <action application="conference" data="bridge:mydynaconf:sofia/$${domain}/1234@conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/conf/enum.conf.xml ============================================================================== --- freeswitch/trunk/conf/enum.conf.xml (original) +++ freeswitch/trunk/conf/enum.conf.xml Sat Jan 27 22:05:20 2007 @@ -4,8 +4,8 @@ </settings> <routes> - <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/test/$1"/> + <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/$${domain}/$1"/> <route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/> - <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/jingle/$1"/> + <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/$${domain}/$1"/> </routes> </configuration> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sat Jan 27 22:05:20 2007 @@ -17,7 +17,7 @@ <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> - <param name="dialplan" value="XML"/> + <param name="dialplan" value="enum,XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${default_codecs}"/> <param name="codec-ms" value="20"/>

1 0

[commit] r4070 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 21:38:52 2007 New Revision: 4070 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: add stupid 2833 crap Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Jan 27 21:38:52 2007 @@ -240,6 +240,7 @@ SWITCH_RTP_FLAG_MINI - Use mini RTP when possible SWITCH_RTP_FLAG_DATAWAIT - Do not return from reads unless there is data even when non blocking SWITCH_RTP_FLAG_BUGGY_2833 - Emulate the bug in cisco equipment to allow interop + SWITCH_RTP_FLAG_PASS_RFC2833 - Pass 2833 (ignore it) </pre> */ typedef enum { @@ -255,7 +256,8 @@ SWITCH_RTP_FLAG_BREAK = ( 1 << 9), SWITCH_RTP_FLAG_MINI = ( 1 << 10), SWITCH_RTP_FLAG_DATAWAIT = (1 << 11), - SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12) + SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12), + SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 13) } switch_rtp_flag_t; /*! 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 Sat Jan 27 21:38:52 2007 @@ -141,7 +141,8 @@ PFLAG_BLIND_REG = (1 << 1), PFLAG_AUTH_ALL = (1 << 2), PFLAG_FULL_ID = (1 << 3), - PFLAG_PRESENCE = (1 << 4) + PFLAG_PRESENCE = (1 << 4), + PFLAG_PASS_RFC2833 = (1 << 5) } PFLAGS; typedef enum { @@ -1402,6 +1403,7 @@ int bw, ms; switch_channel_t *channel; const char *err = NULL; + char *val = NULL; switch_rtp_flag_t flags; switch_status_t status; char tmp[50]; @@ -1431,6 +1433,10 @@ flags |= SWITCH_RTP_FLAG_BUGGY_2833; } + if (tech_pvt->profile->flags & PFLAG_PASS_RFC2833 || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { + flags |= SWITCH_RTP_FLAG_PASS_RFC2833; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, @@ -4983,6 +4989,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "pass-rfc2833")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_PASS_RFC2833; + } } else if (!strcasecmp(var, "auth-calls")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_CALLS; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Jan 27 21:38:52 2007 @@ -840,7 +840,7 @@ } /* RFC2833 ... TBD try harder to honor the duration etc.*/ - if (rtp_session->recv_msg.header.pt == rtp_session->te) { + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; int end = packet[1]&0x80; int duration = (packet[2]<<8) + packet[3];

1 0

[commit] r4069 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: anthm Date: Sat Jan 27 13:26:17 2007 New Revision: 4069 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix (part2) 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 Sat Jan 27 13:26:17 2007 @@ -2301,15 +2301,15 @@ } if (mimp) { - if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)mimp->rm_encoding))) { + if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)map->rm_encoding))) { char tmp[50]; - tech_pvt->pt = (switch_payload_t)mimp->rm_pt; - tech_pvt->rm_rate = mimp->rm_rate; + tech_pvt->pt = (switch_payload_t)map->rm_pt; + tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = mimp->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 *)mimp->rm_fmtp); + 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; - tech_pvt->agreed_pt = (switch_payload_t)mimp->rm_pt; + tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp);

1 0

[commit] r4068 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: anthm Date: Sat Jan 27 13:23:30 2007 New Revision: 4068 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix 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 Sat Jan 27 13:23:30 2007 @@ -2301,20 +2301,23 @@ } if (mimp) { - char tmp[50]; - tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)map->rm_encoding); - tech_pvt->pt = (switch_payload_t)map->rm_pt; - tech_pvt->rm_rate = map->rm_rate; - tech_pvt->codec_ms = mimp->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; - tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); - switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); - switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); + if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)mimp->rm_encoding))) { + char tmp[50]; + tech_pvt->pt = (switch_payload_t)mimp->rm_pt; + tech_pvt->rm_rate = mimp->rm_rate; + tech_pvt->codec_ms = mimp->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 *)mimp->rm_fmtp); + tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; + tech_pvt->agreed_pt = (switch_payload_t)mimp->rm_pt; + snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); + switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); + } else { + match = 0; + } } - + if (match) { if (tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) { match = 0;

1 0

[commit] r4067 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: anthm Date: Sat Jan 27 11:37:10 2007 New Revision: 4067 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix mute 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 Sat Jan 27 11:37:10 2007 @@ -911,6 +911,9 @@ conf_api_sub_mute(member, NULL, NULL); } else { conf_api_sub_unmute(member, NULL, NULL); + if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_undeaf(member, NULL, NULL); + } } } } @@ -920,10 +923,14 @@ if (member != NULL) { if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { conf_api_sub_mute(member, NULL, NULL); - conf_api_sub_deaf(member, NULL, NULL); + if (switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_deaf(member, NULL, NULL); + } } else { conf_api_sub_unmute(member, NULL, NULL); - conf_api_sub_undeaf(member, NULL, NULL); + if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_undeaf(member, NULL, NULL); + } } } }

1 0

[commit] r4066 - in freeswitch/trunk: conf src src/include src/mod/applications/mod_enum src/mod/dialplans/mod_dialplan_directory src/mod/dialplans/mod_dialplan_xml src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: anthm Date: Sat Jan 27 11:23:33 2007 New Revision: 4066 Modified: freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_xml.c Log: A few changes: 1) The xml_curl now has a more enterprise config where it can have more than 1 url configured so you could have failover. (*note the syntax change*) 2) dialplan modules now take an extra arguement making it possible to pass runtime params to them. This is now used in mod_dialplan_xml to allow an alternate file path to be specified. dialplans were already stackable meaning you can configure a sofia profile, for example, to use enum followed by the default XML dialplan. e.g. <param name="dialplan" value="enum,XML"/> From now on, you can also specify :param after each dialplan name to allow param to be passed to the module. mod_dialplan_xml uses this param as a way to override where it looks for the dialplan making it possible to stack mutiple calls to the XML dialplan. e.g. <param name="dialplan" value="XML:/some/xml/file.xml,XML"/> With this you can search the local file file.xml first and if there is still no match the hunt will move on to the standard XML using the onboard XML registry and or the external gateways. *NOTE* this alternate path does not use the external bindings but it does parse the #includes etc. Modified: freeswitch/trunk/conf/xml_curl.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_curl.conf.xml (original) +++ freeswitch/trunk/conf/xml_curl.conf.xml Sat Jan 27 11:23:33 2007 @@ -1,11 +1,13 @@ <configuration name="xml_curl.conf" description="cURL XML Gateway"> - <settings> -  -  -  -  -  - </settings> + <bindings> + <binding name="example"> +  +  + <param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/> +  +  + </binding> + </bindings> </configuration> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Jan 27 11:23:33 2007 @@ -900,7 +900,7 @@ typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); typedef void (*switch_application_function_t)(switch_core_session_t *, char *); typedef void (*switch_event_callback_t)(switch_event_t *); -typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t)(switch_core_session_t *); +typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t)(switch_core_session_t *, void *); typedef switch_status_t (*switch_state_handler_t)(switch_core_session_t *); typedef switch_status_t (*switch_outgoing_channel_hook_t)(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t *); typedef switch_status_t (*switch_answer_channel_hook_t)(switch_core_session_t *); @@ -945,7 +945,8 @@ char *tag_name, char *key_name, char *key_value, - char *params); + char *params, + void *user_data); /* things we don't deserve to know about */ /*! \brief A channel */ Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sat Jan 27 11:23:33 2007 @@ -182,7 +182,7 @@ \param s the string to test \return true value if the string is NULL or zero length */ -#define switch_strlen_zero(s) (s && *s != '\0') ? 0 : 1 +#define switch_strlen_zero(s) (!s || *s == '\0') /*! \brief Wait a desired number of microseconds and yield the CPU Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Sat Jan 27 11:23:33 2007 @@ -324,9 +324,10 @@ ///\brief bind a search function to an external gateway ///\param function the search function to bind ///\param sections a bitmask of sections you wil service +///\param user_data a pointer to private data to be used during the callback ///\return SWITCH_STATUS_SUCCESS if successful ///\note gateway functions will be executed in the order they were binded until a success is found else the root registry will be used -SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections); +SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data); ///\brief parse a string for a list of sections ///\param str a | delimited list of section names Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sat Jan 27 11:23:33 2007 @@ -514,7 +514,7 @@ } -static switch_caller_extension_t *enum_dialplan_hunt(switch_core_session_t *session) +static switch_caller_extension_t *enum_dialplan_hunt(switch_core_session_t *session, void *arg) { switch_caller_extension_t *extension = NULL; switch_caller_profile_t *caller_profile; Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Sat Jan 27 11:23:33 2007 @@ -83,7 +83,7 @@ switch_xml_free(xml); } -static switch_caller_extension_t *directory_dialplan_hunt(switch_core_session_t *session) +static switch_caller_extension_t *directory_dialplan_hunt(switch_core_session_t *session, void *arg) { switch_caller_profile_t *caller_profile; switch_caller_extension_t *extension = NULL; Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Sat Jan 27 11:23:33 2007 @@ -193,12 +193,12 @@ return proceed; } -static switch_caller_extension_t *dialplan_hunt(switch_core_session_t *session) +static switch_caller_extension_t *dialplan_hunt(switch_core_session_t *session, void *arg) { switch_caller_profile_t *caller_profile; switch_caller_extension_t *extension = NULL; switch_channel_t *channel; - switch_xml_t cfg, xml, xcontext, xexten; + switch_xml_t alt_root = NULL, cfg, xml, xcontext, xexten; char *context = NULL; switch_stream_handle_t stream = {0}; switch_size_t encode_len = 1024, new_len = 0; @@ -206,6 +206,7 @@ char *prof[11] = {0}, *prof_names[11] = {0}, *e = NULL; switch_hash_index_t *hi; uint32_t x = 0; + char *alt_path = (char *) arg; channel = switch_core_session_get_channel(session); if ((caller_profile = switch_channel_get_caller_profile(channel))) { @@ -296,11 +297,28 @@ if (e && *e == '&') { *e = '\0'; } + + if (!switch_strlen_zero(alt_path)) { + switch_xml_t conf = NULL, tag = NULL; + if (!(alt_root = switch_xml_parse_file(alt_path))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of [%s] failed\n", alt_path); + return NULL; + } - if (switch_xml_locate("dialplan", NULL, NULL, NULL, &xml, &cfg, stream.data) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of dialplan failed\n"); - return NULL; - } + if ((conf = switch_xml_find_child(alt_root, "section", "name", "dialplan")) && + (tag = switch_xml_find_child(conf, "dialplan", NULL, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Getting dialplan from alternate path: %s\n", alt_path); + xml = alt_root; + cfg = tag; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of dialplan failed\n"); + return NULL; + } + } else if (switch_xml_locate("dialplan", NULL, NULL, NULL, &xml, &cfg, stream.data) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of dialplan failed\n"); + return NULL; + } + switch_safe_free(stream.data); switch_safe_free(encode_buf); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sat Jan 27 11:23:33 2007 @@ -33,15 +33,13 @@ static const char modname[] = "mod_xml_curl"; -static struct { +struct xml_binding { char *url; char *bindings; char *cred; -} globals; +}; -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_url, globals.url); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cred, globals.cred); +typedef struct xml_binding xml_binding_t; struct config_data { char *name; @@ -62,7 +60,8 @@ char *tag_name, char *key_name, char *key_value, - char *params) + char *params, + void *user_data) { char filename[512] = ""; CURL *curl_handle = NULL; @@ -71,6 +70,22 @@ char *data = NULL; switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + xml_binding_t *binding = (xml_binding_t *) user_data; + char *file_url; + + if (!binding) { + return NULL; + } + + if (file_url = strstr(binding->url, "file:")) { + file_url += 5; + + if (!(xml = switch_xml_parse_file(file_url))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + + return xml; + } if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", section, @@ -88,20 +103,20 @@ snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); curl_handle = curl_easy_init(); - if (!strncasecmp(globals.url, "https", 5)) { + if (!strncasecmp(binding->url, "https", 5)) { curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } config_data.name = filename; if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { - if (!switch_strlen_zero(globals.cred)) { + if (!switch_strlen_zero(binding->cred)) { curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); - curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + curl_easy_setopt(curl_handle, CURLOPT_USERPWD, binding->cred); } curl_easy_setopt(curl_handle, CURLOPT_POST, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); - curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); + curl_easy_setopt(curl_handle, CURLOPT_URL, binding->url); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); @@ -140,31 +155,71 @@ static switch_status_t do_config(void) { char *cf = "xml_curl.conf"; - switch_xml_t cfg, xml, settings, param; + switch_xml_t cfg, xml, bindings_tag, binding_tag, param; + xml_binding_t *binding = NULL; + int x = 0; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return SWITCH_STATUS_TERM; } - if ((settings = switch_xml_child(cfg, "settings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { + if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <bindings> tag!\n"); + return SWITCH_STATUS_FALSE; + } + + for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) { + char *bname = (char *) switch_xml_attr_soft(binding_tag, "name"); + char *url = NULL; + char *bind_cred = NULL; + char *bind_mask = NULL; + + for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "gateway-url")) { - char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); - set_global_bindings(bindings); - set_global_url(val); + bind_mask = (char *) switch_xml_attr_soft(param, "bindings"); + if (val) { + url = val; + } } else if (!strcasecmp(var, "gateway-credentials")) { - set_global_cred(val); + bind_cred = var; } } + + if (!url) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Binding has no url!\n"); + continue; + } + + if (!(binding = malloc(sizeof(*binding)))) { + return SWITCH_STATUS_FALSE; + } + memset(binding, 0, sizeof(*binding)); + + binding->url = strdup(url); + + if (bind_mask) { + binding->bindings = strdup(bind_mask); + } + + if (bind_cred) { + binding->cred = strdup(bind_cred); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", + switch_strlen_zero(bname) ? "N/A" : bname, + binding->url, + binding->bindings ? binding->bindings : "all"); + switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding); + x++; + binding = NULL; } switch_xml_free(xml); - return globals.url ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + return x ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } @@ -175,10 +230,7 @@ if (do_config() == SWITCH_STATUS_SUCCESS) { curl_global_init(CURL_GLOBAL_ALL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s] [%s]\n", - globals.url, globals.bindings ? globals.bindings : "all"); - switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(globals.bindings)); - } else { + } else { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Jan 27 11:23:33 2007 @@ -2701,13 +2701,21 @@ if ((dpstr = switch_core_session_strdup(session, caller_profile->dialplan))) { argc = switch_separate_string(dpstr, ',', dp, (sizeof(dp) / sizeof(dp[0]))); for (x = 0; x < argc; x++) { - if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dp[x]))) { + char *dpname = dp[x]; + char *dparg = NULL; + + if (dpname) { + if ((dparg = strchr(dpname, ':'))) { + *dparg++ = '\0'; + } + } + if (!(dialplan_interface = switch_loadable_module_get_dialplan_interface(dpname))) { continue; } count++; - if ((extension = dialplan_interface->hunt_function(session)) != 0) { + if ((extension = dialplan_interface->hunt_function(session, dparg)) != 0) { switch_channel_set_caller_extension(session->channel, extension); return; } Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sat Jan 27 11:23:33 2007 @@ -93,6 +93,7 @@ struct switch_xml_binding { switch_xml_search_function_t function; switch_xml_section_t sections; + void *user_data; struct switch_xml_binding *next; }; @@ -141,7 +142,7 @@ return sections; } -SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections) +SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data) { switch_xml_binding_t *binding = NULL, *ptr = NULL; assert(function != NULL); @@ -152,6 +153,7 @@ binding->function = function; binding->sections = sections; + binding->user_data = user_data; switch_mutex_lock(XML_LOCK); for (ptr = BINDINGS; ptr && ptr->next; ptr = ptr->next); @@ -1020,7 +1022,7 @@ continue; } - if ((xml = binding->function(section, tag_name, key_name, key_value, params))) { + if ((xml = binding->function(section, tag_name, key_name, key_value, params, binding->user_data))) { const char *err = NULL; err = switch_xml_error(xml);

1 0

[commit] r4065 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: mikej Date: Fri Jan 26 23:45:54 2007 New Revision: 4065 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fail the call when the best match is a codec with no name. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 26 23:45:54 2007 @@ -1348,6 +1348,12 @@ channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); + if (!tech_pvt->rm_encoding) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec with no name?\n"); + terminate_session(&tech_pvt->session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); + return SWITCH_STATUS_FALSE; + } + if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->rm_encoding, tech_pvt->rm_fmtp,

1 0