February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11686 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: gmaruzz Date: Sun Feb 8 06:38:59 2009 New Revision: 11686 Log: skypiax: cleaning skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Sun Feb 8 06:38:59 2009 @@ -7,7 +7,7 @@ extern char *skypiax_console_active; #else /* FREESWITCH */ #define skypiax_sleep switch_sleep -#define skypiax_file_write switch_file_write +//#define skypiax_file_write switch_file_write #define skypiax_file_read switch_file_read extern switch_memory_pool_t *skypiax_module_pool; extern switch_endpoint_interface_t *skypiax_endpoint_interface; @@ -23,6 +23,18 @@ #endif /* WIN32 */ /*************************************/ +#if defined(WIN32) && !defined(__CYGWIN__) +int skypiax_file_write(switch_file_t *pipe, short *buf, int howmany){ + switch_file_write(pipe, buf, &howmany); + return howmany; +} +#else /* WIN32 */ +int skypiax_file_write(int pipe, short *buf, int howmany){ + howmany = write(pipe, buf, howmany); + return howmany; +} +#endif /* WIN32 */ + void * skypiax_do_tcp_srv_thread_func(void *obj) { private_t *tech_pvt = obj; @@ -127,11 +139,7 @@ howmany = len; -#if defined(WIN32) && !defined(__CYGWIN__) - skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); -#else /* WIN32 */ - howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); -#endif /* WIN32 */ + howmany = skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, howmany); tech_pvt->audiobuf_is_loaded = 0; } @@ -161,11 +169,7 @@ i++; } -#if defined(WIN32) && !defined(__CYGWIN__) - skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); -#else /* WIN32 */ - howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); -#endif /* WIN32 */ + howmany = skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, howmany); tech_pvt->audiobuf_is_loaded = 0; } } else if (len == 0) {

1 0

[commit] r11685 - in freeswitch/branches/gmaruzz/mod_skypiax: . asterisk
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: gmaruzz Date: Sun Feb 8 05:43:41 2009 New Revision: 11685 Log: skypiax: cleaning skypiax_protocol.c, will compile on win32? Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile Sun Feb 8 05:43:41 2009 @@ -49,7 +49,7 @@ CFLAGS+=-fPIC endif -SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n .)"' +SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n ..)"' CFLAGS += $(SVNDEF) Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Sun Feb 8 05:43:41 2009 @@ -4,15 +4,13 @@ #define skypiax_sleep usleep #define tech_pvt p extern int skypiax_debug; -//#define skypiax_file_write switch_file_write -//#define skypiax_file_read switch_file_read extern char *skypiax_console_active; #else /* FREESWITCH */ #define skypiax_sleep switch_sleep -extern switch_memory_pool_t *skypiax_module_pool; -extern switch_endpoint_interface_t *skypiax_endpoint_interface; #define skypiax_file_write switch_file_write #define skypiax_file_read switch_file_read +extern switch_memory_pool_t *skypiax_module_pool; +extern switch_endpoint_interface_t *skypiax_endpoint_interface; #endif /* ASTERISK */ extern int option_debug; @@ -29,23 +27,13 @@ { private_t *tech_pvt = obj; int s; -#ifdef WIN32 unsigned int len; unsigned int i; unsigned int a; - int sin_size; - unsigned int fd; - short srv_in[SAMPLES_PER_FRAME]; - short srv_out[SAMPLES_PER_FRAME / 2]; -#else - int len; - int i; - int a; unsigned int sin_size; - int fd; + unsigned int fd; short srv_in[SAMPLES_PER_FRAME]; short srv_out[SAMPLES_PER_FRAME / 2]; -#endif /* WIN32 */ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; int exit = 0; @@ -89,12 +77,7 @@ && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) { -#ifdef WIN32 unsigned int fdselect; -#else - int received = 0; - int fdselect; -#endif /* WIN32 */ int rt; fd_set fs; struct timeval to; @@ -112,24 +95,11 @@ rt = select(fdselect + 1, &fs, NULL, NULL, &to); if (rt > 0) { -#ifdef WIN32 len = recv(fd, (char *) srv_in, 320, 0); //seems that Skype only sends 320 bytes at time -#else /* WIN32 */ - while (received < SAMPLES_PER_FRAME * sizeof(short)) { - len = recv(fd, srv_in + (received / sizeof(short)), (SAMPLES_PER_FRAME * sizeof(short)) - received, 0); //seems that Skype only sends 320 bytes at time - received += len; - if (len == 0) - break; - } - if (len) - len = received; -#endif /* WIN32 */ - if ((SAMPLERATE_SKYPIAX - 8000) == 0) { + if (SAMPLERATE_SKYPIAX == 8000) { - //ERRORA("tech_pvt->audiopipe[0] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[0]); - //ERRORA("tech_pvt->audiopipe[1] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[1]); - if (len > 0) { + if (len == 320) { a = 0; for (i = 0; i < len / sizeof(short); i++) { srv_out[a] = srv_in[i]; @@ -175,19 +145,7 @@ } } else if (SAMPLERATE_SKYPIAX == 16000) { - //ERRORA("tech_pvt->audiopipe[0] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[0]); - //ERRORA("tech_pvt->audiopipe[1] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[1]); - if (len > 0) { - if (len == SAMPLES_PER_FRAME * sizeof(short)) { -#if defined(WIN32) && !defined(__CYGWIN__) - unsigned int howmany; - - howmany = len; - skypiax_file_write(tech_pvt->audiopipe[1], srv_in, &howmany); -#else /* WIN32 */ - len = write(tech_pvt->audiopipe[1], srv_in, len); -#endif /* WIN32 */ - } else if (len == SAMPLES_PER_FRAME * sizeof(short) / 2) { + if (len == 320) { if (!tech_pvt->audiobuf_is_loaded) { for (i = 0; i < (len / sizeof(short)); i++) { tech_pvt->audiobuf[i] = srv_in[i]; @@ -210,11 +168,6 @@ #endif /* WIN32 */ tech_pvt->audiobuf_is_loaded = 0; } - - } else { - ERRORA("SRV len=%d\n", SKYPIAX_P_LOG, len); - } - } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); skypiax_sleep(1000);

1 0

[commit] r11684 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: moy Date: Sun Feb 8 00:33:22 2009 New Revision: 11684 Log: fixed calculation of numchannels for decoders and transcoders for mod_dahdi_codec Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Sun Feb 8 00:33:22 2009 @@ -364,11 +364,11 @@ for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found dahdi transcoder name: %s\n", info.name); if ((info.srcfmts & DAHDI_FORMAT_ULAW) && (info.dstfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { - total_encoders += info.numchannels/2; + total_encoders += info.numchannels; continue; } if ((info.dstfmts & DAHDI_FORMAT_ULAW) && (info.srcfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { - total_decoders += info.numchannels/2; + total_decoders += info.numchannels; continue; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,

1 0

[commit] r11683 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Feb '09

08 Feb '09

Author: mrene Date: Sat Feb 7 18:38:48 2009 New Revision: 11683 Log: MODENDP-183 Add disable-srv and disable-naptr params to sip profiles (default false) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Sat Feb 7 18:38:48 2009 @@ -441,6 +441,8 @@ uint32_t force_subscription_expires; switch_rtp_bug_flag_t auto_rtp_bugs; char manage_shared_appearance; /* pflags was all full up - MTK */ + char disable_srv; + char disable_naptr; }; struct private_object { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Sat Feb 7 18:38:48 2009 @@ -728,6 +728,8 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), + TAG_IF(profile->disable_srv, NTATAG_USE_SRV(0)), + TAG_IF(profile->disable_naptr, NTATAG_USE_NAPTR(0)), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ @@ -1798,6 +1800,9 @@ profile->pflags |= PFLAG_STUN_ENABLED; profile->pflags |= PFLAG_DISABLE_100REL; profile->auto_restart = 1; + profile->manage_shared_appearance = 0; /* Initialize default */ + profile->disable_srv = 0; + profile->disable_naptr = 0; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -2016,6 +2021,14 @@ profile->manage_shared_appearance = 1; profile->sla_contact = switch_core_sprintf(profile->pool, "sip:sla-agent@%s", profile->sipip); } + } else if (!strcasecmp(var, "disable-srv")) { + if (switch_true(val)) { + profile->disable_srv = 1; + } + } else if (!strcasecmp(var, "disable-naptr")) { + if (switch_true(val)) { + profile->disable_naptr = 1; + } } else if (!strcasecmp(var, "unregister-on-options-fail")) { if (switch_true(val)) { profile->pflags |= PFLAG_UNREG_OPTIONS_FAIL;

1 0

[commit] r11682 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: anthm Date: Sat Feb 7 15:22:12 2009 New Revision: 11682 Log: lisdexic Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Feb 7 15:22:12 2009 @@ -421,7 +421,7 @@ } vval = switch_channel_get_variable(channel, "enable_file_write_buffering"); - if (!vval || !switch_true(vval)) { + if (!vval || switch_true(vval)) { fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; }

1 0

[commit] r11681 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: moy Date: Sat Feb 7 13:14:03 2009 New Revision: 11681 Log: mod_dahdi_codec now works with Zaptel too, no need for DAHDI or Zaptel headers. Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Sat Feb 7 13:14:03 2009 @@ -32,16 +32,11 @@ #include <switch.h> #include <g711.h> -#include <dahdi/user.h> +#include <linux/types.h> /* __u32 */ #include <sys/ioctl.h> /*#define DEBUG_DAHDI_CODEC 1*/ -#define DAHDI_FORMAT_G723_1 (1 << 0) -#define DAHDI_FORMAT_ULAW (1 << 2) -#define DAHDI_FORMAT_SLINEAR (1 << 6) -#define DAHDI_FORMAT_G729A (1 << 8) - #define CODEC_G729_IANA_CODE 18 #define CODEC_G723_IANA_CODE 4 @@ -50,8 +45,40 @@ static uint32_t total_encoders_usage = 0; static uint32_t total_decoders = 0; static uint32_t total_decoders_usage = 0; -static const char transcoding_device[] = "/dev/dahdi/transcode"; -static const char transcoder_name[] = "DAHDI"; + +/* + Zaptel/DAHDI definitions to not require the headers installed + Zaptel and DAHDI are binary compatible (at least in the transcoder interface) + */ + +#define DAHDI_TC_CODE 'T' +#define DAHDI_TC_ALLOCATE _IOW(DAHDI_TC_CODE, 1, struct dahdi_transcoder_formats) +#define DAHDI_TC_GETINFO _IOWR(DAHDI_TC_CODE, 2, struct dahdi_transcoder_info) + +#define DAHDI_FORMAT_G723_1 (1 << 0) +#define DAHDI_FORMAT_ULAW (1 << 2) +#define DAHDI_FORMAT_SLINEAR (1 << 6) +#define DAHDI_FORMAT_G729A (1 << 8) + +struct dahdi_transcoder_formats { + __u32 srcfmt; + __u32 dstfmt; +}; + +struct dahdi_transcoder_info { + __u32 tcnum; + char name[80]; + __u32 numchannels; + __u32 dstfmts; + __u32 srcfmts; +}; + +static const char transcoding_device_dahdi[] = "/dev/dahdi/transcode"; +static const char transcoder_name_dahdi[] = "DAHDI"; +static const char transcoding_device_zap[] = "/dev/zap/transcode"; +static const char transcoder_name_zap[] = "Zap"; +static const char *transcoding_device = NULL; +static const char *transcoder_name = NULL; SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load); SWITCH_MODULE_DEFINITION(mod_dahdi_codec, mod_dahdi_codec_load, NULL, NULL); @@ -305,6 +332,7 @@ { switch_api_interface_t *api_interface; switch_codec_interface_t *codec_interface; + struct stat statbuf; struct dahdi_transcoder_info info = { 0 }; int32_t fd, res; @@ -313,6 +341,20 @@ total_decoders = 0; total_decoders_usage = 0; + /* Let's check if DAHDI or Zaptel device should be used */ + if (!stat(transcoding_device_dahdi, &statbuf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DAHDI transcoding device found.\n"); + transcoding_device = transcoding_device_dahdi; + transcoder_name = transcoder_name_zap; + } else if (!stat(transcoding_device_zap, &statbuf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Zap transcoding device found.\n"); + transcoding_device = transcoding_device_zap; + transcoder_name = transcoder_name_zap; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No DAHDI or Zap transcoder device was found in /dev/.\n"); + return SWITCH_STATUS_FALSE; + } + fd = open(transcoding_device, O_RDWR); if (fd < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device.\n", transcoder_name);

1 0

[commit] r11680 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: anthm Date: Sat Feb 7 10:44:46 2009 New Revision: 11680 Log: add extra checking for race cond in bgapi Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sat Feb 7 10:44:46 2009 @@ -1199,7 +1199,8 @@ char *arg; listener_t *listener; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - uint8_t bg; + int bg; + int ack; switch_memory_pool_t *pool; }; @@ -1210,18 +1211,21 @@ switch_stream_handle_t stream = { 0 }; char *reply, *freply = NULL; switch_status_t status; - + if (!acs) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Internal error.\n"); return NULL; } - if (!acs->listener || !acs->listener->rwlock || switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { + if (!acs->listener || !switch_test_flag(acs->listener, LFLAG_RUNNING) || + !acs->listener->rwlock || switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! cannot get read lock.\n"); + acs->ack = -1; goto done; } - - + + acs->ack = 1; + SWITCH_STANDARD_STREAM(stream); if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { @@ -1270,12 +1274,23 @@ } done: + if (acs->bg) { switch_memory_pool_t *pool = acs->pool; + if (acs->ack == -1) { + int sanity = 2000; + while(acs->ack == -1) { + switch_cond_next(); + if (--sanity <= 0) break; + } + } + acs = NULL; switch_core_destroy_memory_pool(&pool); pool = NULL; + } + return NULL; } @@ -1539,6 +1554,7 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_uuid_t uuid; + int sanity; strip_cr(api_cmd); @@ -1571,6 +1587,14 @@ } switch_snprintf(reply, reply_len, "~Reply-Text: +OK Job-UUID: %s\nJob-UUID: %s\n\n", acs->uuid_str, acs->uuid_str); switch_thread_create(&thread, thd_attr, api_exec, acs, acs->pool); + sanity = 2000; + while(!acs->ack) { + switch_cond_next(); + if (--sanity <= 0) break; + } + if (acs->ack == -1) { + acs->ack--; + } status = SWITCH_STATUS_SUCCESS; goto done_noreply; @@ -1942,7 +1966,7 @@ if (revent) { switch_event_destroy(&revent); } - + remove_listener(listener); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");

1 0

[commit] r11679 - in freeswitch/branches/gmaruzz/mod_skypiax: . asterisk
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: gmaruzz Date: Sat Feb 7 08:09:40 2009 New Revision: 11679 Log: skypiax: * compile and works on Cygwin Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Sat Feb 7 08:09:40 2009 @@ -1285,6 +1285,7 @@ M_UINT("tcp_srv_port", tmp->tcp_srv_port) M_F("playback_boost", skypiax_store_boost(v->value, &tmp->playback_boost)) M_F("capture_boost", skypiax_store_boost(v->value, &tmp->capture_boost)) + M_STR("skype_user", tmp->skype_user) M_UINT("skypiax_dir_entry_extension_prefix", tmp->skypiax_dir_entry_extension_prefix) M_END(;); @@ -1404,6 +1405,7 @@ free(tmp); return NULL; } + /* res = pipe(tmp->SkypiaxHandles.fdesc); if (res) { ast_log(LOG_ERROR, "Unable to create skype pipe\n"); @@ -1415,6 +1417,7 @@ } fcntl(tmp->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK); fcntl(tmp->SkypiaxHandles.fdesc[1], F_SETFL, O_NONBLOCK); + */ tmp->skype_thread = AST_PTHREADT_NULL; if (tmp->skype) { @@ -1424,7 +1427,7 @@ (unsigned long) AST_PTHREADT_NULL); #ifdef __CYGWIN__ if (ast_pthread_create - (&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->SkypiaxHandles) < 0) { + (&tmp->skype_thread, NULL, do_skypeapi_thread, tmp) < 0) { ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf Sat Feb 7 08:09:40 2009 @@ -53,6 +53,7 @@ X11_display=:101 tcp_cli_port=11234 tcp_srv_port=11235 +skype_user=gmaruzz2 ;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;; ; audio boost settings, valid for all platforms, to compensate for different input/output audio signal levels @@ -63,57 +64,58 @@ playback_boost=0 ; capture_boost=0 ; -[skypeclient2] -;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;; -; general settings, valid on all platforms -; -; -; Default language -; -language=en -; -; Default context (in extensions.conf, can be overridden with @context syntax) -; -context=default -; -; Default extension (in extensions.conf) where incoming calls land -; -extension=s -; -;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;; -; Debugging settings, valid globally for all interfaces on all platforms -; -; the debug values are global for all the interfaces. -; -; default is no skypiax debugging output, you **have** to activate debugging here to obtain debugging from skypiax -; -; To see the debugging output you have to "set debug 100" from the Asterisk CLI or launch -; Asterisk with -ddddddddddd option, and have the logger.conf file activating debug info for console and messages -; -; You can activate each of the following separately, but you can't disactivate. Eg: debug_at=no does not subtract debug_at from debug_all -; debug_all activate all possible debugging info -; -;debug_all=yes -debug_skype=yes -debug_pbx=yes -;debug_sound=yes -;debug_locks=yes -;debug_monitorlocks=yes - -skype=yes ; legacy setting, leave it to yes -X11_display=:102 -tcp_cli_port=11236 -tcp_srv_port=11237 -;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;; -; audio boost settings, valid for all platforms, to compensate for different input/output audio signal levels -; tweak it if you get horrible (or not hearable) sound -; -;boost can be positive or negative (-40 to +40) in db -;experiment to find which values are best for your computer -playback_boost=0 ; -capture_boost=0 ; - - +;;;[skypeclient2] +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;; general settings, valid on all platforms +;;;; +;;;; +;;;; Default language +;;;; +;;;language=en +;;;; +;;;; Default context (in extensions.conf, can be overridden with @context syntax) +;;;; +;;;context=default +;;;; +;;;; Default extension (in extensions.conf) where incoming calls land +;;;; +;;;extension=s +;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;; Debugging settings, valid globally for all interfaces on all platforms +;;;; +;;;; the debug values are global for all the interfaces. +;;;; +;;;; default is no skypiax debugging output, you **have** to activate debugging here to obtain debugging from skypiax +;;;; +;;;; To see the debugging output you have to "set debug 100" from the Asterisk CLI or launch +;;;; Asterisk with -ddddddddddd option, and have the logger.conf file activating debug info for console and messages +;;;; +;;;; You can activate each of the following separately, but you can't disactivate. Eg: debug_at=no does not subtract debug_at from debug_all +;;;; debug_all activate all possible debugging info +;;;; +;;;;debug_all=yes +;;;debug_skype=yes +;;;debug_pbx=yes +;;;;debug_sound=yes +;;;;debug_locks=yes +;;;;debug_monitorlocks=yes +;;; +;;;skype=yes ; legacy setting, leave it to yes +;;;X11_display=:102 +;;;tcp_cli_port=11236 +;;;tcp_srv_port=11237 +;;;skype_user=gmaruzz3 +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;; audio boost settings, valid for all platforms, to compensate for different input/output audio signal levels +;;;; tweak it if you get horrible (or not hearable) sound +;;;; +;;;;boost can be positive or negative (-40 to +40) in db +;;;;experiment to find which values are best for your computer +;;;playback_boost=0 ; +;;;capture_boost=0 ; +;;; +;;; Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h Sat Feb 7 08:09:40 2009 @@ -230,7 +230,7 @@ UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; int api_connected; - switch_file_t *fdesc[2]; + int fdesc[2]; }; #endif //WIN32 @@ -329,10 +329,11 @@ void skypiax_skype_clean_disp(void *data); #endif /* WANT_SKYPE_X11 */ #ifdef __CYGWIN__ -int win32_Initialize_CreateWindowClass(void); -void win32_DeInitialize_DestroyWindowClass(void); -int win32_Initialize_CreateMainWindow(void); -void win32_DeInitialize_DestroyMainWindow(void); + +int win32_Initialize_CreateWindowClass(private_t * tech_pvt); +void win32_DeInitialize_DestroyWindowClass(private_t * tech_pvt); +int win32_Initialize_CreateMainWindow(private_t * tech_pvt); +void win32_DeInitialize_DestroyMainWindow(private_t * tech_pvt); #endif /* __CYGWIN__ */ /* CHAN_SKYPIAX.C */ Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Sat Feb 7 08:09:40 2009 @@ -4,8 +4,8 @@ #define skypiax_sleep usleep #define tech_pvt p extern int skypiax_debug; -#define skypiax_file_write switch_file_write -#define skypiax_file_read switch_file_read +//#define skypiax_file_write switch_file_write +//#define skypiax_file_read switch_file_read extern char *skypiax_console_active; #else /* FREESWITCH */ #define skypiax_sleep switch_sleep @@ -157,7 +157,7 @@ howmany = len; -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); #else /* WIN32 */ howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); @@ -179,7 +179,7 @@ //ERRORA("tech_pvt->audiopipe[1] = %d\n", SKYPIAX_P_LOG, tech_pvt->audiopipe[1]); if (len > 0) { if (len == SAMPLES_PER_FRAME * sizeof(short)) { -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) unsigned int howmany; howmany = len; @@ -203,7 +203,7 @@ i++; } -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); #else /* WIN32 */ howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); @@ -233,7 +233,7 @@ skypiax_sleep(10000); } } -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); skypiax_file_write(tech_pvt->audiopipe[1], kill_cli_buff, &kill_cli_size); kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); @@ -255,20 +255,20 @@ len = write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size); #endif /* WIN32 */ DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32 - close(fd); -#else +#if defined(WIN32) && !defined(__CYGWIN__) closesocket(fd); +#else + close(fd); #endif if (exit) break; } DEBUGA_SKYPE("server (I am it) GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32 - close(s); -#else +#if defined(WIN32) && !defined(__CYGWIN__) closesocket(s); +#else + close(s); #endif if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); @@ -321,10 +321,10 @@ if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } -#ifndef WIN32 - close(s); +#if defined(WIN32) && !defined(__CYGWIN__) + closesocket(s); #else - closesocket(s); + close(s); #endif return NULL; } @@ -369,7 +369,7 @@ if (rt > 0) { if ((SAMPLERATE_SKYPIAX - 8000) == 0) { got = SAMPLES_PER_FRAME * sizeof(short); -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); #else /* WIN32 */ got = read(tech_pvt->audioskypepipe[0], cli_in, got); @@ -399,7 +399,7 @@ } } else if (SAMPLERATE_SKYPIAX == 16000) { got = SAMPLES_PER_FRAME * sizeof(short); -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); #else /* WIN32 */ got = read(tech_pvt->audioskypepipe[0], cli_in, got); @@ -436,19 +436,19 @@ } DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32 - close(fd); +#if defined(WIN32) && !defined(__CYGWIN__) + closesocket(s); #else - closesocket(fd); + close(fd); #endif break; } DEBUGA_SKYPE("client (I am it) GONE\n", SKYPIAX_P_LOG); -#ifndef WIN32 - close(s); -#else +#if defined(WIN32) && !defined(__CYGWIN__) closesocket(s); +#else + close(s); #endif if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); @@ -459,7 +459,7 @@ int skypiax_skypeaudio_init(private_t * tech_pvt) { -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) switch_status_t rv; rv = switch_file_pipe_create(&tech_pvt->audiopipe[0], &tech_pvt->audiopipe[1], @@ -510,7 +510,7 @@ #endif /* WIN32 */ if (rt > 0) { samples = SAMPLES_PER_FRAME * sizeof(short); -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_read(tech_pvt->audiopipe[0], tech_pvt->read_frame.data, &samples); #else /* WIN32 */ samples = read(tech_pvt->audiopipe[0], tech_pvt->read_frame.data, samples); @@ -612,8 +612,13 @@ sizeof(msg_from_skype) - 2); howmany = strlen(msg_from_skype) + 1; +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_write(tech_pvt->SkypiaxHandles.fdesc[1], msg_from_skype, &howmany); - //NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, (const char *) poCopyData->lpData); + //NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, msg_from_skype); +#else + howmany = write(tech_pvt->SkypiaxHandles.fdesc[1], msg_from_skype, howmany); + //NOTICA("From Skype API: %s\n", SKYPIAX_P_LOG, msg_from_skype); +#endif lReturnCode = 1; } break; @@ -758,9 +763,22 @@ /* destroy window class */ private_t *tech_pvt = obj; +#if defined(WIN32) && !defined(__CYGWIN__) + switch_status_t rv; switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], skypiax_module_pool); + rv = + switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], &tech_pvt->SkypiaxHandles.fdesc[1], + skypiax_module_pool); +#else /* WIN32 */ + if (pipe(tech_pvt->SkypiaxHandles.fdesc)) { + fcntl(tech_pvt->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK); + fcntl(tech_pvt->SkypiaxHandles.fdesc[1], F_SETFL, O_NONBLOCK); + } +#endif /* WIN32 */ + + tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach = RegisterWindowMessage("SkypeControlAPIAttach"); tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = @@ -1156,7 +1174,7 @@ if (rt > 0) { if (tech_pvt->SkypiaxHandles.fdesc[0]) { howmany = sizeof(read_from_pipe); -#ifdef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) skypiax_file_read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, &howmany); #else /* WIN32 */ howmany = @@ -1256,7 +1274,7 @@ if (!strcasecmp(id, tech_pvt->skype_user)) { tech_pvt->SkypiaxHandles.api_connected = 1; - //DEBUGA_SKYPE ("Skype MSG: messaggio: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, tech_pvt->skype_user); + DEBUGA_SKYPE ("Skype MSG: messaggio: %s, currentuserhandle: %s, cuh: %s, skype_user: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, tech_pvt->skype_user); } }

1 0

[commit] r11678 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 17:49:22 2009 New Revision: 11678 Log: fix windows build Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 6 17:49:22 2009 @@ -46,7 +46,7 @@ int16_t peak = 0; int16_t *data; switch_frame_t *read_frame = NULL; - int i; + uint32_t i; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_SUCCESS; int64_t global_total = 0, global_sum = 0, period_sum = 0; @@ -88,7 +88,7 @@ peak = 0; avg = 0; for (i = 0; i < read_frame->samples; i++) { - const int16_t s = abs(data[i]); + const int16_t s = (int16_t)abs(data[i]); if (s > peak) { peak = s; } @@ -103,13 +103,13 @@ global_total++; period_total++; - period_avg = period_sum / period_total; + period_avg = (int)(period_sum / period_total); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\npacket_avg=%d packet_peak=%d period_avg=%d global_avg=%d\n\n", avg, peak, period_avg, global_avg); if (period_total >= period_len) { - global_avg = global_sum / global_total; + global_avg = (int)(global_sum / global_total); period_total = 0; period_sum = 0; }

1 0

[commit] r11677 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: anthm Date: Fri Feb 6 14:44:53 2009 New Revision: 11677 Log: add enable_file_write_buffering variable Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Feb 6 14:44:53 2009 @@ -420,7 +420,10 @@ } } - fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; + vval = switch_channel_get_variable(channel, "enable_file_write_buffering"); + if (!vval || !switch_true(vval)) { + fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; + } if (switch_core_file_open(fh, file,

1 0