- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4222 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Mon Feb 12 21:48:50 2007 New Revision: 4222 Modified: freeswitch/trunk/src/switch_core.c Log: indirection misdirection? Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Feb 12 21:48:50 2007 @@ -4272,7 +4272,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { *err = "Cannot load modules"; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", *err); return SWITCH_STATUS_GENERR; }

1 0

[commit] r4221 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Mon Feb 12 21:32:10 2007 New Revision: 4221 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: add ring ready flag to core Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Feb 12 21:32:10 2007 @@ -331,6 +331,13 @@ #define switch_channel_pre_answer(channel) switch_channel_perform_pre_answer(channel, __FILE__, __SWITCH_FUNC__, __LINE__) /*! + \brief Indicate a channel is ready to provide ringback + \param channel channel + \return SWITCH_STATUS_SUCCESS +*/ +#define switch_channel_mark_ring_ready(channel) switch_channel_perform_mark_ring_ready(channel, __FILE__, __SWITCH_FUNC__, __LINE__) + +/*! \brief add a state handler table to a given channel \param channel channel on which to add the state handler table \param state_handler table of state handler functions Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 12 21:32:10 2007 @@ -487,6 +487,7 @@ CF_EVENT_PARSE = (1 << 15) - Suspend control events CF_NO_INDICATE = (1 << 16) - Disable Indications CF_REPEAT_STATE = (1 << 17) - Tell the state machine to repeat a state +CF_RING_READY = (1 << 18) - Channel is ready to send ringback </pre> */ @@ -508,7 +509,8 @@ CF_SUSPEND = (1 << 14), CF_EVENT_PARSE = (1 << 15), CF_NO_INDICATE = (1 << 16), - CF_REPEAT_STATE = (1 << 17) + CF_REPEAT_STATE = (1 << 17), + CF_RING_READY = (1 << 18) } switch_channel_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 Mon Feb 12 21:32:10 2007 @@ -2811,6 +2811,7 @@ case nua_callstate_proceeding: if (channel) { if (status == 180 && !(switch_channel_test_flag(channel, CF_NO_INDICATE))) { + switch_channel_mark_ring_ready(channel); if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_message_t msg; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Feb 12 21:32:10 2007 @@ -978,13 +978,32 @@ return channel->state; } + +SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_channel_t *channel, + const char *file, + const char *func, + int line) +{ + if (!switch_channel_test_flag(channel, CF_RING_READY)) { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); + switch_channel_set_flag(channel, CF_RING_READY); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + + SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_channel_t *channel, - const char *file, - const char *func, - int line) + const char *file, + const char *func, + int line) { switch_event_t *event; + switch_channel_mark_ring_ready(channel); + if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { char *uuid; switch_core_session_t *other_session; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 12 21:32:10 2007 @@ -2789,7 +2789,7 @@ write_frame.datalen = read_codec->implementation->bytes_per_frame; write_frame.samples = write_frame.datalen / 2; memset(write_frame.data, 255, write_frame.datalen); - + if (ringback_data) { char *tmp_data = NULL; @@ -2882,7 +2882,8 @@ break; } - if (read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) && read_frame->datalen > 1) { + if (switch_channel_test_flag(caller_channel, CF_RING_READY) && + read_frame && !pass && !switch_test_flag(read_frame, SFF_CNG) && read_frame->datalen > 1) { if (ringback.fh) { uint8_t abuf[1024]; switch_size_t mlen, olen;

1 0

[commit] r4220 - in freeswitch/trunk/src: . include
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Mon Feb 12 21:31:26 2007 New Revision: 4220 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: use const for switch_core_permanent_strdup var. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Feb 12 21:31:26 2007 @@ -375,7 +375,7 @@ \param todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup); +SWITCH_DECLARE(char *) switch_core_permanent_strdup(const char *todup); /*! \brief Copy a string using memory allocation from a session's pool Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Feb 12 21:31:26 2007 @@ -1443,7 +1443,7 @@ return ptr; } -SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup) +SWITCH_DECLARE(char *) switch_core_permanent_strdup(const char *todup) { char *duped = NULL; switch_size_t len;

1 0

[commit] r4219 - freeswitch/trunk/src/mod/formats/mod_sndfile
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Mon Feb 12 21:31:17 2007 New Revision: 4219 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: doh Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Mon Feb 12 21:31:17 2007 @@ -106,11 +106,10 @@ context->sfinfo.format |= map->format; ready = 1; } - } else if (map) { - ready = 1; + } else { + ready = 0; } - if (!ready) { ready = 1; if (!strcmp(ext, "r8") || !strcmp(ext, "raw")) {

1 0

[commit] r4218 - freeswitch/trunk/src/mod/formats/mod_sndfile
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Mon Feb 12 21:26:39 2007 New Revision: 4218 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: char cast on tolower & toupper Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Mon Feb 12 21:26:39 2007 @@ -343,10 +343,10 @@ map->uext = switch_core_permanent_strdup(info.extension); map->format = info.format; for(p = map->ext; *p; p++) { - *p = tolower(*p); + *p = (char)tolower(*p); } for(p = map->uext; *p; p++) { - *p = toupper(*p); + *p = (char)toupper(*p); } switch_core_hash_insert(globals.format_hash, map->ext, map); switch_core_hash_insert(globals.format_hash, map->uext, map);

1 0

[commit] r4217 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Mon Feb 12 20:58:39 2007 New Revision: 4217 Modified: freeswitch/trunk/src/switch_console.c Log: mmkay Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Feb 12 20:58:39 2007 @@ -192,7 +192,7 @@ { char hostname[256]; char cmd[2048]; - uint32_t activity = 1, running = 1; + int32_t activity = 1, running = 1; switch_size_t x = 0; gethostname(hostname, sizeof(hostname));

1 0

[commit] r4216 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: anthm Date: Mon Feb 12 20:22:17 2007 New Revision: 4216 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: Sofia Behaviour Modification (please document) 1) This commit adds the ability to override the To: header so you can place an outbound SIP call to a paticular destination. For instance, if you have a user registered to your machine as 'gateway' and you want to call another extension at that machine 'foo' you can now call: sofia/mydomain.com/gateway:foo@anydomain.com or if you just want to call some SIP url and put an alternate To: so you can do forwarding: sofia/mydomain.com/1000@somwhere.com:12122551234@realdest.com 2) You can add headers to outbound SIP calls by prefixing the string 'SIP_h_' to any channel variable: <action application="set" data="SIP_h_X-Answer=42"/> <action application="bridge" data="sofia/mydomain.com/1000@somehost.com"/> 3) All inbound SIP calls will install any X- headers into local variables this means in conjunction with item 2, all X- headers will pass across bridged calls auto-magicly. 4) The switch_ivr_transfer_variable function in switch_ivr.c has been modified so if the last arguement 'var' starts with a ~ it will copy anything that is prefixed with that string rather than an exact match. *NOTE* you are not required to put an X- prefix in the SIP_h_ vars but it is reccommended because most SIP devices will ignore any unknown headers that don'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 Mon Feb 12 20:22:17 2007 @@ -65,6 +65,8 @@ #define SOFIA_REPLACES_HEADER "_sofia_replaces_" #define SOFIA_USER_AGENT "FreeSWITCH(mod_sofia)" #define SOFIA_CHAT_PROTO "sip" +#define SOFIA_SIP_HEADER_PREFIX "sip_h_" +#define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_" #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> @@ -301,6 +303,7 @@ char *remote_sdp_str; char *local_sdp_str; char *dest; + char *dest_to; char *key; char *xferto; char *kick; @@ -963,6 +966,11 @@ char *cid_name, *cid_num; char *e_dest = NULL; char *holdstr = ""; + switch_stream_handle_t stream = {0}; + switch_hash_index_t *hi; + void *vval; + char *extra_headers; + const void *vvar; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1023,7 +1031,8 @@ if (!tech_pvt->nh) { tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, - SIPTAG_TO_STR(tech_pvt->dest), + NUTAG_URL(tech_pvt->dest), + SIPTAG_TO_STR(tech_pvt->dest_to), SIPTAG_FROM_STR(tech_pvt->from_str), SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); @@ -1056,9 +1065,29 @@ holdstr = switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) ? "*" : ""; + + SWITCH_STANDARD_STREAM(stream); + for (hi = switch_channel_variable_first(channel, switch_core_session_get_pool(tech_pvt->session)); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + char *name = (char *) vvar; + char *value = (char *) vval; + + if (!strncasecmp(name, SOFIA_SIP_HEADER_PREFIX, strlen(SOFIA_SIP_HEADER_PREFIX))) { + char *hname = name + strlen(SOFIA_SIP_HEADER_PREFIX); + stream.write_function(&stream, "%s: %s\r\n", hname, value); + } + } + } + + if (stream.data) { + extra_headers = stream.data; + } + nua_invite(tech_pvt->nh, TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), + TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards),SIPTAG_MAX_FORWARDS_STR(max_forwards)), //SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), @@ -1067,7 +1096,8 @@ TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END()); - + + switch_safe_free(stream.data); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } @@ -2197,7 +2227,7 @@ switch_caller_profile_t *caller_profile = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *nchannel; - char *host; + char *host, *dest_to; *new_session = NULL; @@ -2231,6 +2261,12 @@ goto done; } + if ((dest_to = strchr(dest, ':'))) { + *dest_to++ = '\0'; + tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); + snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to); + } + if ((host = strchr(dest, '%'))) { char buf[128]; *host = '@'; @@ -2260,8 +2296,11 @@ snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); } - attach_private(nsession, profile, tech_pvt, dest); + if (!tech_pvt->dest_to) { + tech_pvt->dest_to = tech_pvt->dest; + } + attach_private(nsession, profile, tech_pvt, dest); nchannel = switch_core_session_get_channel(nsession); caller_profile = switch_caller_profile_clone(nsession, outbound_profile); @@ -2275,6 +2314,8 @@ //char *val; //switch_channel_t *channel = switch_core_session_get_channel(session); switch_ivr_transfer_variable(session, nsession, SOFIA_REPLACES_HEADER); + switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_HEADER_PREFIX_T); + } done: @@ -4457,8 +4498,15 @@ free(mydata); } } - break; - } + } else if (!strncasecmp(un->un_name, "X-", 2)) { + if (!switch_strlen_zero(un->un_value)) { + char *new_name; + if ((new_name = switch_mprintf("%s%s", SOFIA_SIP_HEADER_PREFIX, (char *)un->un_name))) { + switch_channel_set_variable(channel, new_name, (char *)un->un_value); + free(new_name); + } + } + } } switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 12 20:22:17 2007 @@ -3693,8 +3693,15 @@ switch_channel_t *chana = switch_core_session_get_channel(sessa); switch_channel_t *chanb = switch_core_session_get_channel(sessb); char *val = NULL; + uint8_t prefix = 0; - if (var) { + if (var && *var == '~') { + var++; + prefix = 1; + } + + + if (var && !prefix) { if ((val = switch_channel_get_variable(chana, var))) { switch_channel_set_variable(chanb, var, val); } @@ -3705,7 +3712,7 @@ for (hi = switch_channel_variable_first(chana, switch_core_session_get_pool(sessa)); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &vvar, NULL, &vval); - if (vvar && vval) { + if (vvar && vval && (!prefix || (var && !strncmp((char *)vvar, var, strlen(var))))) { switch_channel_set_variable(chanb, (char *) vvar, (char *) vval); } }

1 0

[commit] r4215 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: brian Date: Mon Feb 12 18:32:29 2007 New Revision: 4215 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: woops 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 Mon Feb 12 18:32:29 2007 @@ -264,7 +264,7 @@ static const switch_codec_interface_t g729_codec_interface = { /*.interface_name */ "g729", - /*.implementations */ &g729a_8k_implementation, + /*.implementations */ &g729_8k_implementation, /*.next */ NULL };

1 0

[commit] r4214 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: brian Date: Mon Feb 12 18:32:00 2007 New Revision: 4214 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: We should only advertise one code per IANA number. 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 Mon Feb 12 18:32:00 2007 @@ -262,48 +262,6 @@ &g729_10ms_8k_implementation }; -static const switch_codec_implementation_t g729a_10ms_8k_implementation = { - /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 18, - /*.iananame */ "G729a", - /*.fmtp */ NULL, - /*.samples_per_second */ 8000, - /*.bits_per_second */ 32000, - /*.microseconds_per_frame */ 10000, - /*.samples_per_frame */ 80, - /*.bytes_per_frame */ 160, - /*.encoded_bytes_per_frame */ 10, - /*.number_of_channels */ 1, - /*.pref_frames_per_packet */ 1, - /*.max_frames_per_packet */ 1, - /*.init */ switch_g729_init, - /*.encode */ switch_g729_encode, - /*.decode */ switch_g729_decode, - /*.destroy */ switch_g729_destroy, - &g729_8k_implementation -}; - -static const switch_codec_implementation_t g729a_8k_implementation = { - /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 18, - /*.iananame */ "G729a", - /*.fmtp */ NULL, - /*.samples_per_second */ 8000, - /*.bits_per_second */ 64000, - /*.microseconds_per_frame */ 20000, - /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 320, - /*.encoded_bytes_per_frame */ 20, - /*.number_of_channels */ 1, - /*.pref_frames_per_packet */ 1, - /*.max_frames_per_packet */ 1, - /*.init */ switch_g729_init, - /*.encode */ switch_g729_encode, - /*.decode */ switch_g729_decode, - /*.destroy */ switch_g729_destroy, - &g729a_10ms_8k_implementation -}; - static const switch_codec_interface_t g729_codec_interface = { /*.interface_name */ "g729", /*.implementations */ &g729a_8k_implementation,

1 0

[commit] r4213 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 18:14:36 2007 New Revision: 4213 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: ignore CANCEL of incoming requests after we send a final response. Patch by me and Kai Vehmanen. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Mon Feb 12 18:14:36 2007 @@ -2210,16 +2210,15 @@ nua_session_usage_t *ss = nua_dialog_usage_private(sr->sr_usage); msg_t *cancel = nta_incoming_getrequest_ackcancel(irq); - assert(nta_incoming_status(irq) < 200); - assert(nua_server_request_is_pending(sr)); - assert(ss); assert(ss == nua_session_usage_get(nh->nh_ds)); (void)ss; + if (nta_incoming_status(irq) < 200 && nua_server_request_is_pending(sr) && + ss && (ss == nua_session_usage_get(nh->nh_ds))) { + nua_stack_event(nh->nh_nua, nh, cancel, nua_i_cancel, SIP_200_OK, NULL); - nua_stack_event(nh->nh_nua, nh, cancel, nua_i_cancel, SIP_200_OK, NULL); + SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); - SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); - - nua_server_respond(sr, NULL); - nua_server_report(sr); + nua_server_respond(sr, NULL); + nua_server_report(sr); + } return 0; }

1 0