- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r4212 - in freeswitch/trunk/src: . include mod/formats/mod_native_file
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: anthm Date: Mon Feb 12 17:56:08 2007 New Revision: 4212 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c freeswitch/trunk/src/switch_ivr.c Log: fix mod_native_file extension thingy 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 17:56:08 2007 @@ -682,6 +682,7 @@ SWITCH_FILE_DATA_DOUBLE = (1 << 6) - Read data in doubles SWITCH_FILE_DATA_RAW = (1 << 7) - Read data as is SWITCH_FILE_PAUSE = (1 << 8) - Pause +SWITCH_FILE_NATIVE = (1 << 8) - File is in native format (no transcoding) </pre> */ typedef enum { @@ -693,7 +694,8 @@ SWITCH_FILE_DATA_FLOAT = (1 << 5), SWITCH_FILE_DATA_DOUBLE = (1 << 6), SWITCH_FILE_DATA_RAW = (1 << 7), - SWITCH_FILE_PAUSE = (1 << 8) + SWITCH_FILE_PAUSE = (1 << 8), + SWITCH_FILE_NATIVE = (1 << 9) } switch_file_flag_t; typedef enum { Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c Mon Feb 12 17:56:08 2007 @@ -78,6 +78,7 @@ handle->seekable = 1; handle->speed = 0; handle->private_info = context; + handle->flags |= SWITCH_FILE_NATIVE; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s] %dhz\n", path, handle->samplerate); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 12 17:56:08 2007 @@ -1142,6 +1142,9 @@ switch_core_session_reset(session); return SWITCH_STATUS_NOTFOUND; } + if (switch_test_flag(fh, SWITCH_FILE_NATIVE)) { + asis = 1; + } write_frame.data = abuf;

1 0

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

12 Feb '07

Author: anthm Date: Mon Feb 12 17:42:22 2007 New Revision: 4211 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: sndfile tweaks (add ul and al files and more record formats) 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 17:42:22 2007 @@ -34,6 +34,18 @@ static const char modname[] = "mod_sndfile"; +static switch_memory_pool_t *module_pool = NULL; + +static struct { + switch_hash_t *format_hash; +} globals; + +struct format_map { + char *ext; + char *uext; + uint32_t format; +}; + struct sndfile_context { SF_INFO sfinfo; SNDFILE *handle; @@ -46,8 +58,9 @@ sndfile_context *context; int mode = 0; char *ext; - int ready = 1; - + int ready = 0; + struct format_map *map = NULL; + if ((ext = strrchr(path, '.')) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n"); return SWITCH_STATUS_GENERR; @@ -72,9 +85,11 @@ return SWITCH_STATUS_MEMERR; } + map = switch_core_hash_find(globals.format_hash, ext); + if (mode & SFM_WRITE) { sf_count_t frames = 0 ; - + context->sfinfo.channels = handle->channels; context->sfinfo.samplerate = handle->samplerate; if (handle->samplerate == 8000 || handle->samplerate == 16000) { @@ -85,20 +100,19 @@ context->sfinfo.format |= SF_FORMAT_PCM_32; } - sf_command (context->handle, SFC_FILE_TRUNCATE, &frames, sizeof (frames)) ; + sf_command (context->handle, SFC_FILE_TRUNCATE, &frames, sizeof (frames)); - /* Could add more else if() but i am too lazy atm.. */ - if (!strcasecmp(ext, "wav")) { - context->sfinfo.format |= SF_FORMAT_WAV; - } else { - ready = 0; + if (map) { + context->sfinfo.format |= map->format; + ready = 1; } - } else { - ready = 0; + } else if (map) { + ready = 1; } if (!ready) { + ready = 1; if (!strcmp(ext, "r8") || !strcmp(ext, "raw")) { context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; context->sfinfo.channels = 1; @@ -119,16 +133,29 @@ context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_GSM610; context->sfinfo.channels = 1; context->sfinfo.samplerate = 8000; + } else if (!strcmp(ext, "ul")) { + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_ULAW; + context->sfinfo.channels = 1; + context->sfinfo.samplerate = 8000; + } else if (!strcmp(ext, "al")) { + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_ALAW; + context->sfinfo.channels = 1; + context->sfinfo.samplerate = 8000; + } else { + ready = 0; } } - + if (!ready) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path); + return SWITCH_STATUS_GENERR; + } + if ((mode & SFM_WRITE) && sf_format_check (&context->sfinfo) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error : file format is invalid (0x%08X).\n", context->sfinfo.format); return SWITCH_STATUS_GENERR; }; - - + if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle)); @@ -272,7 +299,7 @@ char buffer[128]; int format, major_count, subtype_count, m, s; int len, x, skip; - char *extras[] = { "r8", "r16", "r24", "r32", "gsm", NULL }; + char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", NULL }; int exlen = (sizeof(extras) / sizeof(extras[0])); buffer[0] = 0; @@ -306,11 +333,28 @@ } } if (!skip) { + char *p; + struct format_map *map = switch_core_permanent_alloc(sizeof(*map)); + if (!map) { + abort(); + } + + map->ext = switch_core_permanent_strdup(info.extension); + map->uext = switch_core_permanent_strdup(info.extension); + map->format = info.format; + for(p = map->ext; *p; p++) { + *p = tolower(*p); + } + for(p = map->uext; *p; p++) { + *p = toupper(*p); + } + switch_core_hash_insert(globals.format_hash, map->ext, map); + switch_core_hash_insert(globals.format_hash, map->uext, map); supported_formats[len++] = (char *) info.extension; } format = info.format; - for (s = 0; s < subtype_count; s++) { + for (s = 0; s < subtype_count; s++) { info.format = s; sf_command(NULL, SFC_GET_FORMAT_SUBTYPE, &info, sizeof(info)); format = (format & SF_FORMAT_TYPEMASK) | info.format; @@ -338,7 +382,13 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return SWITCH_STATUS_TERM; + } + switch_core_hash_init(&globals.format_hash, module_pool); + if (setup_formats() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; }

1 0

[commit] r4210 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: anthm Date: Mon Feb 12 16:08:57 2007 New Revision: 4210 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: simplify wanpipe write method 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 Mon Feb 12 16:08:57 2007 @@ -119,6 +119,7 @@ switch_codec_t read_codec; switch_codec_t write_codec; unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + unsigned char auxbuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; struct sangoma_pri *spri; sangoma_api_hdr_t hdrframe; switch_caller_profile_t *caller_profile; @@ -554,14 +555,14 @@ teletone_dtmf_detect (&tech_pvt->dtmf_detect, tech_pvt->read_frame.data, tech_pvt->read_frame.samples); teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str)); - + if(digit_str[0]) { switch_channel_queue_dtmf(channel, digit_str); if (globals.debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str); } if (globals.supress_dtmf_tone) { - memset(tech_pvt->read_frame.data, 0, tech_pvt->read_frame.datalen); + tech_pvt->skip_read_frames = 20; } } @@ -582,110 +583,43 @@ switch_io_flag_t flags, int stream_id) { private_object_t *tech_pvt; - switch_channel_t *channel = NULL; - uint32_t result = 0; - uint32_t bytes = frame->datalen; - uint8_t *bp = frame->data; - unsigned char dtmf[1024]; - uint32_t bwrote = 0; - size_t bread; - switch_status_t status = SWITCH_STATUS_SUCCESS; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); + uint32_t dtmf_blen; + void *data = frame->data; + int result = 0; tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - - while (tech_pvt->dtmf_buffer && bwrote < frame->datalen && bytes > 0 && switch_buffer_inuse(tech_pvt->dtmf_buffer) > 0) { - if (switch_test_flag(tech_pvt, TFLAG_BYE) || tech_pvt->wpsock->fd < 0) { - return SWITCH_STATUS_GENERR; - } - - if ((bread = switch_buffer_read(tech_pvt->dtmf_buffer, dtmf, tech_pvt->frame_size)) < tech_pvt->frame_size) { - while (bread < tech_pvt->frame_size) { - dtmf[bread++] = 0; - } - } - - if (sangoma_socket_waitfor(tech_pvt->wpsock->fd, 1000, POLLOUT | POLLERR | POLLHUP) <= 0) { - return SWITCH_STATUS_GENERR; - } - -#ifdef DOTRACE - write(tech_pvt->fd, dtmf, (int) bread); -#endif - result = sangoma_sendmsg_socket(tech_pvt->wpsock->fd, - &tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), dtmf, (unsigned short)bread, 0); - if (result < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "Bad Write %d bytes returned %d (%s)!\n", bread, - result, strerror(errno)); - if (errno == EBUSY) { - continue; - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Write Failed!\n"); - status = SWITCH_STATUS_GENERR; - break; - } else { - bytes -= result; - bwrote += result; - bp += result; - result = 0; - } - } - if (switch_test_flag(tech_pvt, TFLAG_BYE) || tech_pvt->wpsock->fd < 0) { return SWITCH_STATUS_GENERR; } + if (tech_pvt->dtmf_buffer && (dtmf_blen = switch_buffer_inuse(tech_pvt->dtmf_buffer))) { + uint32_t len = dtmf_blen > frame->datalen ? frame->datalen : dtmf_blen; + + switch_buffer_read(tech_pvt->dtmf_buffer, tech_pvt->auxbuf, len); + if (len < frame->datalen) { + memcpy(frame->data + len, tech_pvt->auxbuf + len, frame->datalen - len); + } + data= tech_pvt->auxbuf; + } + if (tech_pvt->skip_write_frames) { tech_pvt->skip_write_frames--; return SWITCH_STATUS_SUCCESS; } - while (bytes > 0) { - uint32_t towrite; - -#if 1 - if (sangoma_socket_waitfor(tech_pvt->wpsock->fd, 1000, POLLOUT | POLLERR | POLLHUP) <= 0) { - return SWITCH_STATUS_GENERR; - } -#endif - -#ifdef DOTRACE - write(tech_pvt->fd, bp, (int) tech_pvt->frame_size); +#ifdef DOTRACE + write(tech_pvt->fd, data, frame->datalen); #endif - towrite = bytes >= tech_pvt->frame_size ? tech_pvt->frame_size : bytes; - if (towrite < tech_pvt->frame_size) { - int diff = tech_pvt->frame_size - towrite; - memset(bp + towrite, 0, diff); - towrite = tech_pvt->frame_size; - } - - result = sangoma_sendmsg_socket(tech_pvt->wpsock->fd, - &tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), bp, (unsigned short)towrite, 0); - if (result < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "Bad Write frame len %u write %d bytes returned %d (%s)!\n", towrite, - tech_pvt->frame_size, result, strerror(errno)); - if (errno == EBUSY) { - continue; - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Write Failed!\n"); - status = SWITCH_STATUS_GENERR; - break; - } else { - bytes -= result; - bp += result; - result = 0; - } - } + result = sangoma_sendmsg_socket(tech_pvt->wpsock->fd, &tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), data, frame->datalen, 0); - //printf("write %d %d\n", frame->datalen, status); - return status; + if (result < 0 && errno != EBUSY) { + return SWITCH_STATUS_GENERR; + } + + return SWITCH_STATUS_SUCCESS; } static switch_status_t wanpipe_send_dtmf(switch_core_session_t *session, char *digits)

1 0