- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10683 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: anthm Date: Tue Dec 9 13:52:16 2008 New Revision: 10683 Log: cleanup code from yesterday Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Dec 9 13:52:16 2008 @@ -356,7 +356,7 @@ int sval = atoi(var); if (sval) { - ringback_data = switch_core_session_sprintf(session, "ringback:%d", sval); + ringback_data = switch_core_session_sprintf(session, "silence:%d", sval); } } } @@ -386,9 +386,6 @@ if (ringback_data) { char *tmp_data = NULL; - switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); - switch_buffer_set_loops(ringback.audio_buffer, -1); - if (switch_is_file_path(ringback_data)) { char *ext; @@ -429,6 +426,9 @@ ringback.silence = 400; } } else { + switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); + switch_buffer_set_loops(ringback.audio_buffer, -1); + teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback); ringback.ts.rate = read_codec->implementation->actual_samples_per_second; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data); @@ -800,7 +800,7 @@ int sval = atoi(vvar); if (sval) { - ringback_data = switch_core_session_sprintf(session, "ringback:%d", sval); + ringback_data = switch_core_session_sprintf(session, "silence:%d", sval); } } @@ -1296,9 +1296,7 @@ if (ringback_data) { char *tmp_data = NULL; - switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); - switch_buffer_set_loops(ringback.audio_buffer, -1); - + if (switch_is_file_path(ringback_data)) { char *ext; @@ -1339,6 +1337,9 @@ ringback.silence = 400; } } else { + switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); + switch_buffer_set_loops(ringback.audio_buffer, -1); + teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback); ringback.ts.rate = read_codec->implementation->actual_samples_per_second; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data); @@ -1436,6 +1437,7 @@ || (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)))) { switch_status_t tstatus = SWITCH_STATUS_SUCCESS; + int silence = 0; if (switch_channel_media_ready(caller_channel)) { tstatus = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); @@ -1482,17 +1484,23 @@ break; } } else if (ringback.silence) { - write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet; - switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, ringback.silence); + silence = ringback.silence; } - - if ((ringback.fh || ringback.silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) { - if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) { - break; - } + } else { + silence = 400; + } + + if (silence) { + write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet; + switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, silence); + } + + if ((ringback.fh || silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) { + if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) { + break; } } - + } else { switch_yield(100000); }

1 0

[commit] r10682 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: gmaruzz Date: Tue Dec 9 12:10:41 2008 New Revision: 10682 Log: skypiax: no more crashes on unloading on linux Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 9 12:10:41 2008 @@ -29,8 +29,8 @@ int option_debug = 100; switch_endpoint_interface_t *skypiax_endpoint_interface; switch_memory_pool_t *skypiax_module_pool = NULL; -static int running = 1; -static skypiax_interface_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES]; +int running = 1; +skypiax_interface_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES]; switch_core_session_t *global_session = NULL; /*************************************************/ /*************************************************/ @@ -443,7 +443,7 @@ int skypiax_skype_call(struct skypiax_interface *p, char *idest, int timeout, switch_core_session_t * session) { - char rdest[80]; + char *rdest; char msg_to_skype[1024]; if (option_debug > 10) { @@ -451,10 +451,12 @@ } switch_sleep(5000); - //FIXME strncpy(rdest, idest, sizeof(rdest) - 1); - strncpy(rdest, "echo123", sizeof(rdest) - 1); + rdest = strchr(idest, '/'); + *rdest++ = '\0'; + if (option_debug) DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); + NOTICA("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); skypiax_skype_write(p, "SET AGC OFF"); switch_sleep(10000); skypiax_skype_write(p, "SET AEC OFF"); @@ -516,7 +518,7 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - skypiax_skype_call(tech_pvt->p, outbound_profile->destination_number, 30, + skypiax_skype_call(tech_pvt->p, caller_profile->destination_number, 30, *new_session); switch_channel_set_flag(channel, CF_OUTBOUND); @@ -546,25 +548,33 @@ (void *) p); while (forever) { + if(!running) + break; switch_sleep(1000); res = skypiax_skype_read(p); //if (res == CALLFLOW_INCOMING_HANGUP && p->interface_state != SKYPIAX_STATE_DOWN) - if (res == CALLFLOW_INCOMING_HANGUP) { - switch_core_session_t *session = NULL; - private_t *tech_pvt; - switch_channel_t *channel; - - DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); - - tech_pvt = p->tech_pvt; - session = tech_pvt->session; - - channel = switch_core_session_get_channel(session); - DEBUGA_SKYPE("before channel_on_hangup\n", SKYPIAX_P_LOG); - - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); - } + if (res == CALLFLOW_INCOMING_HANGUP) { + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + + DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); + + tech_pvt = p->tech_pvt; + if(tech_pvt){ + session = tech_pvt->session; + + if(session){ + channel = switch_core_session_get_channel(session); + DEBUGA_SKYPE("before channel_on_hangup\n", SKYPIAX_P_LOG); + + if(channel) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); + } + } + } + } } //if (option_debug > 10) { @@ -833,13 +843,13 @@ memset(&globals, '\0', sizeof(globals)); memset(SKYPIAX_INTERFACES, '\0', sizeof(SKYPIAX_INTERFACES)); -#ifndef WIN32 //FIXME +#ifndef WIN32 if (!XInitThreads()) { ERRORA("Not initialized XInitThreads!\n", SKYPIAX_P_LOG); } else { DEBUGA_SKYPE("Initialized XInitThreads!\n", SKYPIAX_P_LOG); } - switch_sleep(10000); //FIXME + switch_sleep(100); #endif /* _WINDOWS_ */ load_config(); @@ -865,16 +875,16 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown) { - int x = 0; + int x = 100; + struct skypiax_interface *p = NULL; - running = -1; + running = 0; - while (running) { - if (x++ > 100) { - break; - } + while (x) { + x--; switch_yield(20000); } + NOTICA("EXITING FUNC!\n", SKYPIAX_P_LOG); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 9 12:10:41 2008 @@ -4,6 +4,8 @@ extern int option_debug; extern switch_core_session_t *global_session; extern switch_endpoint_interface_t *skypiax_endpoint_interface; +extern int running; +extern skypiax_interface_t SKYPIAX_INTERFACES; #define SKYPE_AUDIO #ifdef SKYPE_AUDIO @@ -68,6 +70,8 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); + if(!running) + break; while (p->interface_state != SKYPIAX_STATE_DOWN && (p->skype_callflow == CALLFLOW_STATUS_INPROGRESS || p->skype_callflow == SKYPIAX_STATE_UP)) { @@ -81,6 +85,8 @@ fd_set fs; struct timeval to; + if(!running) + break; exit = 1; fdselect = fd; @@ -232,6 +238,8 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); + if(!running) + break; while (p->interface_state != SKYPIAX_STATE_DOWN && (p->skype_callflow == CALLFLOW_STATUS_INPROGRESS || p->skype_callflow == SKYPIAX_STATE_UP)) { @@ -244,6 +252,8 @@ fd_set fs; struct timeval to; + if(!running) + break; fdselect = 1; FD_ZERO(&fs); FD_SET(fdselect, &fs); @@ -567,6 +577,7 @@ switch_file_pipe_create_ex(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], 2, skypiax_module_pool); + switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100000); win32_AsteriskHandlesSkype = &p->AsteriskHandlesAst; @@ -588,8 +599,12 @@ win32_hInit_MainWindowHandle; while (1) { MSG oMessage; + if(!running) + break; while (GetMessage(&oMessage, 0, 0, 0) != FALSE) { + if(!running) + break; TranslateMessage(&oMessage); DispatchMessage(&oMessage); } @@ -754,6 +769,7 @@ switch_file_pipe_create_ex(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], 2, skypiax_module_pool); + switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100000); AsteriskHandlesAst = &p->AsteriskHandlesAst; //disp = XOpenDisplay(getenv("DISPLAY")); disp = XOpenDisplay(p->X11_display); @@ -819,6 +835,8 @@ while (1) { XNextEvent(disp, &an_event); + if(!running) + break; switch (an_event.type) { case ClientMessage: @@ -859,7 +877,7 @@ SKYPIAX_P_LOG); return NULL; } - //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); return NULL; }

1 0

[commit] r10681 - freeswitch/trunk/build
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: mikej Date: Tue Dec 9 12:01:14 2008 New Revision: 10681 Log: formating Modified: freeswitch/trunk/build/Makefile Modified: freeswitch/trunk/build/Makefile ============================================================================== --- freeswitch/trunk/build/Makefile (original) +++ freeswitch/trunk/build/Makefile Tue Dec 9 12:01:14 2008 @@ -1,52 +1,51 @@ all: - @echo " +-------- FreeSWITCH Build Complete -----------+" - @echo " + FreeSWITCH has been successfully built. +" - @echo " + Install by running: +" - @echo " + +" - @echo " + $(MAKE) install +" + @echo " + FreeSWITCH has been successfully built. +" + @echo " + Install by running: +" + @echo " + +" + @echo " + $(MAKE) install +" @echo " +----------------------------------------------+" install: - @echo " +-------- FreeSWITCH install Complete ---------+" - @echo " + FreeSWITCH has been successfully installed. +" - @echo " + +" - @echo " + Install sounds: +" - @echo " + (uhd-sounds includes hd-sounds, sounds) +" - @echo " + (hd-sounds includes sounds) +" - @echo " + ------------------------------------ +" - @echo " + $(MAKE) uhd-sounds-install +" - @echo " + $(MAKE) uhd-moh-install +" - @echo " + +" - @echo " + $(MAKE) hd-sounds-install +" - @echo " + $(MAKE) hd-moh-install +" - @echo " + +" - @echo " + $(MAKE) sounds-install +" - @echo " + $(MAKE) moh-install +" - @echo " + +" - @echo " + Upgrade to latest: +" - @echo " + ---------------------------------- +" - @echo " + $(MAKE) current +" - @echo " + +" - @echo " + Rebuild all: +" - @echo " + ---------------------------------- +" - @echo " + $(MAKE) sure +" - @echo " + +" - @echo " + Install/Re-install default config: +" - @echo " + ---------------------------------- +" - @echo " + $(MAKE) samples +" - @echo " + +" - @echo " + +" - @echo " + Additional resources: +" - @echo " + ---------------------------------- +" - @echo " + http://www.freeswitch.org +" - @echo " + http://wiki.freeswitch.org +" - @echo " + http://jira.freeswitch.org +" - @echo " + http://lists.freeswitch.org +" - @echo " + +" - @echo " + irc.freenode.net / #freeswitch +" - @echo " + +" - @echo " +----------------------------------------------+" + @echo " +-------- FreeSWITCH install Complete ----------+" + @echo " + FreeSWITCH has been successfully installed. +" + @echo " + +" + @echo " + Install sounds: +" + @echo " + (uhd-sounds includes hd-sounds, sounds) +" + @echo " + (hd-sounds includes sounds) +" + @echo " + ------------------------------------ +" + @echo " + $(MAKE) uhd-sounds-install +" + @echo " + $(MAKE) uhd-moh-install +" + @echo " + +" + @echo " + $(MAKE) hd-sounds-install +" + @echo " + $(MAKE) hd-moh-install +" + @echo " + +" + @echo " + $(MAKE) sounds-install +" + @echo " + $(MAKE) moh-install +" + @echo " + +" + @echo " + Upgrade to latest: +" + @echo " + ---------------------------------- +" + @echo " + $(MAKE) current +" + @echo " + +" + @echo " + Rebuild all: +" + @echo " + ---------------------------------- +" + @echo " + $(MAKE) sure +" + @echo " + +" + @echo " + Install/Re-install default config: +" + @echo " + ---------------------------------- +" + @echo " + $(MAKE) samples +" + @echo " + +" + @echo " + +" + @echo " + Additional resources: +" + @echo " + ---------------------------------- +" + @echo " + http://www.freeswitch.org +" + @echo " + http://wiki.freeswitch.org +" + @echo " + http://jira.freeswitch.org +" + @echo " + http://lists.freeswitch.org +" + @echo " + +" + @echo " + irc.freenode.net / #freeswitch +" + @echo " + +" + @echo " +-----------------------------------------------+"

1 0

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

09 Dec '08

Author: mikej Date: Tue Dec 9 11:39:56 2008 New Revision: 10680 Log: C&P fail Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Tue Dec 9 11:39:56 2008 @@ -3498,7 +3498,7 @@ int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - if (*strlen && strlen(signal_ptr) == 1 && is_dtmf(*signal_ptr)) { + if (*signal_ptr && strlen(signal_ptr) == 1 && is_dtmf(*signal_ptr)) { dtmf.digit = *signal_ptr; } else { tmp = atoi(signal_ptr);

1 0

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

09 Dec '08

Author: mikej Date: Tue Dec 9 11:19:04 2008 New Revision: 10679 Log: FSCORE-247 DTMF digit # is being interpreted as 1 when received in info DTMF Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Tue Dec 9 11:19:04 2008 @@ -3498,7 +3498,7 @@ int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - if (is_dtmf(*signal_ptr)) { + if (*strlen && strlen(signal_ptr) == 1 && is_dtmf(*signal_ptr)) { dtmf.digit = *signal_ptr; } else { tmp = atoi(signal_ptr);

1 0

[commit] r10678 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: mikej Date: Tue Dec 9 10:59:07 2008 New Revision: 10678 Log: fix download filename Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Tue Dec 9 10:59:07 2008 @@ -17,7 +17,7 @@ include $(switch_srcdir)/build/modmake.rules $(LDAP_DIR): - $(GETLIB) $(LDAP).tgz + $(GETLIB) $(LDAP).tar.gz cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS) $(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)

1 0

[commit] r10677 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: gmaruzz Date: Tue Dec 9 09:35:38 2008 New Revision: 10677 Log: skypiax: indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 9 09:35:38 2008 @@ -36,7 +36,6 @@ /*************************************************/ /*************************************************/ - SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, @@ -63,7 +62,6 @@ int stream_id); static switch_status_t channel_kill_channel(switch_core_session_t * session, int sig); - static switch_status_t skypiax_codec(private_t * tech_pvt, int sample_rate, int codec_ms) { if (switch_core_codec_init @@ -93,7 +91,8 @@ } -void skypiax_tech_init(private_t * tech_pvt, switch_core_session_t * session, skypiax_interface_t * p) +void skypiax_tech_init(private_t * tech_pvt, switch_core_session_t * session, + skypiax_interface_t * p) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -539,7 +538,7 @@ { struct skypiax_interface *p = obj; int res; - int forever=1; + int forever = 1; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -575,7 +574,6 @@ } - static switch_status_t load_config(void) { char *cf = "skypiax.conf"; @@ -733,10 +731,10 @@ } if (interface_id && interface_id < SKYPIAX_MAX_INTERFACES) { struct skypiax_interface newconf; - switch_thread_t *do_skype_thread_thread; - switch_threadattr_t *do_skype_thd_attr = NULL; - switch_thread_t *skypiax_do_controldev_thread_thread; - switch_threadattr_t *skypiax_do_controldev_thread_thd_attr = NULL; + switch_thread_t *do_skype_thread_thread; + switch_threadattr_t *do_skype_thd_attr = NULL; + switch_thread_t *skypiax_do_controldev_thread_thread; + switch_threadattr_t *skypiax_do_controldev_thread_thd_attr = NULL; memset(&newconf, '\0', sizeof(newconf)); SKYPIAX_INTERFACES[interface_id] = newconf; @@ -766,20 +764,23 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "STARTING interface_id=%d\n", interface_id); - - switch_threadattr_create(&do_skype_thd_attr, skypiax_module_pool); - switch_threadattr_detach_set(do_skype_thd_attr, 1); - switch_threadattr_stacksize_set(do_skype_thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&do_skype_thread_thread, do_skype_thd_attr, do_skype_thread, - &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); + switch_threadattr_create(&do_skype_thd_attr, skypiax_module_pool); + switch_threadattr_detach_set(do_skype_thd_attr, 1); + switch_threadattr_stacksize_set(do_skype_thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&do_skype_thread_thread, do_skype_thd_attr, do_skype_thread, + &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); switch_sleep(100000); - switch_threadattr_create(&skypiax_do_controldev_thread_thd_attr, skypiax_module_pool); - switch_threadattr_detach_set(skypiax_do_controldev_thread_thd_attr, 1); - switch_threadattr_stacksize_set(skypiax_do_controldev_thread_thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&skypiax_do_controldev_thread_thread, skypiax_do_controldev_thread_thd_attr, skypiax_do_controldev_thread, - &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); + switch_threadattr_create(&skypiax_do_controldev_thread_thd_attr, + skypiax_module_pool); + switch_threadattr_detach_set(skypiax_do_controldev_thread_thd_attr, 1); + switch_threadattr_stacksize_set(skypiax_do_controldev_thread_thd_attr, + SWITCH_THREAD_STACKSIZE); + switch_thread_create(&skypiax_do_controldev_thread_thread, + skypiax_do_controldev_thread_thd_attr, + skypiax_do_controldev_thread, + &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); switch_sleep(1000000); @@ -832,7 +833,7 @@ memset(&globals, '\0', sizeof(globals)); memset(SKYPIAX_INTERFACES, '\0', sizeof(SKYPIAX_INTERFACES)); -#ifndef WIN32 //FIXME +#ifndef WIN32 //FIXME if (!XInitThreads()) { ERRORA("Not initialized XInitThreads!\n", SKYPIAX_P_LOG); } else { @@ -850,7 +851,7 @@ skypiax_endpoint_interface->io_routines = &skypiax_io_routines; skypiax_endpoint_interface->state_handler = &skypiax_state_handlers; - DEBUGA_SKYPE("EXITING FUNC!\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("EXITING FUNC!\n", SKYPIAX_P_LOG); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -934,4 +935,3 @@ * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: */ - Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Tue Dec 9 09:35:38 2008 @@ -44,7 +44,6 @@ //FIXME include? #endif //WIN32 - #define SKYPIAX_SVN_VERSION "SVN 123456" typedef enum { @@ -63,7 +62,6 @@ GFLAG_MY_CODEC_PREFS = (1 << 0) } GFLAGS; - #define DEBUGA_SKYPE(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SKYPE %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); #define DEBUGA_CALL(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_CALL %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); #define DEBUGA_PBX(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_PBX %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); @@ -209,9 +207,9 @@ typedef struct private_object private_t; - void *SWITCH_THREAD_FUNC do_skype_thread(switch_thread_t * thread, void *obj); -void skypiax_tech_init(private_t * tech_pvt, switch_core_session_t * session, skypiax_interface_t * p); +void skypiax_tech_init(private_t * tech_pvt, switch_core_session_t * session, + skypiax_interface_t * p); switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt); int skypiax_skypeaudio_init(struct skypiax_interface *p); int skypiax_skype_write(struct skypiax_interface *p, char *msg_to_skype); Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 9 09:35:38 2008 @@ -303,7 +303,9 @@ switch_status_t rv; - rv = switch_file_pipe_create_ex(&p->audiopipe[0], &p->audiopipe[1], 2, skypiax_module_pool); + rv = + switch_file_pipe_create_ex(&p->audiopipe[0], &p->audiopipe[1], 2, + skypiax_module_pool); rv = switch_file_pipe_timeout_set(p->audiopipe[0], 100000); /* the pipe is our audio fd for pbx to poll on */ @@ -318,6 +320,7 @@ } return 0; } + switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt) { struct skypiax_interface *p; @@ -862,7 +865,6 @@ } #endif // WIN32 - int skypiax_skype_write(struct skypiax_interface *p, char *msg_to_skype) { #ifdef WIN32 @@ -963,8 +965,8 @@ if (read_from_pipe[i] == '\0') { //if (option_debug > 101) - DEBUGA_SKYPE("read_skype: howmany=%d, i=%d, a=%d, |||%s||| \n", SKYPIAX_P_LOG, - howmany, i, a, messaggio); + DEBUGA_SKYPE("read_skype: howmany=%d, i=%d, a=%d, |||%s||| \n", SKYPIAX_P_LOG, + howmany, i, a, messaggio); if (!strncasecmp(messaggio, "ERROR 92 CALL", 12)) { ERRORA("Skype got ERROR: |||%s|||, the number we called was not recognized\n", @@ -1092,8 +1094,8 @@ if (channel) { switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) }; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", - dtmf.digit, switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", + dtmf.digit, switch_channel_get_name(channel)); switch_mutex_lock(tech_pvt->flag_mutex); switch_channel_queue_dtmf(channel, &dtmf); switch_set_flag(tech_pvt, TFLAG_DTMF); @@ -1123,7 +1125,7 @@ if (p->interface_state != SKYPIAX_STATE_DIALING) { /* we are not calling out */ - if (1) { //FIXME + if (1) { //FIXME /* we are not inside an active call */ p->skype_callflow = CALLFLOW_STATUS_RINGING; p->interface_state = SKYPIAX_STATE_RING; @@ -1260,10 +1262,10 @@ DEBUGA_SKYPE("skype_call: %s SKYPIAX_CONTROL_ANSWER sent\n", SKYPIAX_P_LOG, id); - if (1) { //FIXME + if (1) { //FIXME char msg_to_skype[1024]; - if (1) { //FIXME + if (1) { //FIXME switch_threadattr_t *thd_attr = NULL; switch_threadattr_create(&thd_attr, skypiax_module_pool); @@ -1380,5 +1382,3 @@ //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); return 0; } - -

1 0

[commit] r10676 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: gmaruzz Date: Tue Dec 9 09:33:55 2008 New Revision: 10676 Log: skypiax: less warnings on windows Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 9 09:33:55 2008 @@ -1,6 +1,5 @@ #include "skypiax.h" - extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; extern switch_core_session_t *global_session; @@ -16,21 +15,26 @@ void *obj) { struct skypiax_interface *p = obj; - short in[GG]; short out[GG / 2]; - int s, len; + int s; #ifdef WIN32 + unsigned int len; + unsigned int i; + unsigned int a; + char in[GG]; int sin_size; unsigned int fd; #else + int len; + int i; + int a; + short in[GG]; unsigned int sin_size; int fd; #endif /* WIN32 */ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; int exit = 0; - int a; - int i; unsigned int kill_cli_size; short kill_cli_buff[320]; @@ -171,15 +175,27 @@ //void *skypiax_do_tcp_cli_thread(void *data) { struct skypiax_interface *p = obj; - int s, fd, len; - short in[NN / 2]; - short out[NN]; - unsigned int sin_size; + int s; struct sockaddr_in my_addr; struct sockaddr_in remote_addr; - int a; - int i; unsigned int got; +#ifdef WIN32 + unsigned int len; + unsigned int i; + unsigned int a; + char in[NN / 2]; + char out[NN]; + int sin_size; + unsigned int fd; +#else + int len; + int i; + int a; + short in[NN / 2]; + short out[NN]; + unsigned int sin_size; + int fd; +#endif /* WIN32 */ if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -219,7 +235,11 @@ while (p->interface_state != SKYPIAX_STATE_DOWN && (p->skype_callflow == CALLFLOW_STATUS_INPROGRESS || p->skype_callflow == SKYPIAX_STATE_UP)) { +#ifdef WIN32 + unsigned int fdselect; +#else int fdselect; +#endif /* WIN32 */ int rt; fd_set fs; struct timeval to; @@ -918,8 +938,9 @@ int rt; //fd_set fs; //struct timeval to; - int i, a; + int a; unsigned int howmany; + unsigned int i; if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG);

1 0

[commit] r10675 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: gmaruzz Date: Tue Dec 9 06:41:55 2008 New Revision: 10675 Log: skypiax: works on linux Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 9 06:41:55 2008 @@ -825,14 +825,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { - //struct skypiax_interface *p = NULL; + struct skypiax_interface *p = NULL; skypiax_module_pool = pool; memset(&globals, '\0', sizeof(globals)); memset(SKYPIAX_INTERFACES, '\0', sizeof(SKYPIAX_INTERFACES)); -#ifndef _WINDOWS_ //FIXME +#ifndef WIN32 //FIXME if (!XInitThreads()) { ERRORA("Not initialized XInitThreads!\n", SKYPIAX_P_LOG); } else { @@ -850,6 +850,7 @@ skypiax_endpoint_interface->io_routines = &skypiax_io_routines; skypiax_endpoint_interface->state_handler = &skypiax_state_handlers; + DEBUGA_SKYPE("EXITING FUNC!\n", SKYPIAX_P_LOG); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10674 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 09 Dec '08

09 Dec '08

Author: gmaruzz Date: Tue Dec 9 06:39:00 2008 New Revision: 10674 Log: skypiax: less warnings on windows Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 9 06:39:00 2008 @@ -1,6 +1,5 @@ #include "skypiax.h" - SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown); //SWITCH_MODULE_RUNTIME_FUNCTION(mod_skypiax_runtime); @@ -540,16 +539,16 @@ { struct skypiax_interface *p = obj; int res; + int forever=1; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); DEBUGA_SKYPE("In skypiax_do_controldev_thread: started, p=%p\n", SKYPIAX_P_LOG, (void *) p); - while (1) { + while (forever) { switch_sleep(1000); res = skypiax_skype_read(p); -#if 1 //if (res == CALLFLOW_INCOMING_HANGUP && p->interface_state != SKYPIAX_STATE_DOWN) if (res == CALLFLOW_INCOMING_HANGUP) { switch_core_session_t *session = NULL; @@ -566,10 +565,7 @@ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); - - //DEBUGA_SKYPE("set state to CS_HANGUP\n", SKYPIAX_P_LOG); } -#endif } //if (option_debug > 10) { @@ -737,6 +733,11 @@ } if (interface_id && interface_id < SKYPIAX_MAX_INTERFACES) { struct skypiax_interface newconf; + switch_thread_t *do_skype_thread_thread; + switch_threadattr_t *do_skype_thd_attr = NULL; + switch_thread_t *skypiax_do_controldev_thread_thread; + switch_threadattr_t *skypiax_do_controldev_thread_thd_attr = NULL; + memset(&newconf, '\0', sizeof(newconf)); SKYPIAX_INTERFACES[interface_id] = newconf; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, @@ -765,28 +766,20 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "STARTING interface_id=%d\n", interface_id); - if (1) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - switch_threadattr_create(&thd_attr, skypiax_module_pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, do_skype_thread, + + switch_threadattr_create(&do_skype_thd_attr, skypiax_module_pool); + switch_threadattr_detach_set(do_skype_thd_attr, 1); + switch_threadattr_stacksize_set(do_skype_thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&do_skype_thread_thread, do_skype_thd_attr, do_skype_thread, &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); - } switch_sleep(100000); - if (1) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - switch_threadattr_create(&thd_attr, skypiax_module_pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, skypiax_do_controldev_thread, + + switch_threadattr_create(&skypiax_do_controldev_thread_thd_attr, skypiax_module_pool); + switch_threadattr_detach_set(skypiax_do_controldev_thread_thd_attr, 1); + switch_threadattr_stacksize_set(skypiax_do_controldev_thread_thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&skypiax_do_controldev_thread_thread, skypiax_do_controldev_thread_thd_attr, skypiax_do_controldev_thread, &SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); - } switch_sleep(1000000); @@ -832,7 +825,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { - struct skypiax_interface *p = NULL; + //struct skypiax_interface *p = NULL; skypiax_module_pool = pool; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 9 06:39:00 2008 @@ -1,4 +1,6 @@ #include "skypiax.h" + + extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; extern switch_core_session_t *global_session; @@ -16,8 +18,14 @@ struct skypiax_interface *p = obj; short in[GG]; short out[GG / 2]; - int s, fd, len; + int s, len; +#ifdef WIN32 + int sin_size; + unsigned int fd; +#else unsigned int sin_size; + int fd; +#endif /* WIN32 */ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; int exit = 0; @@ -60,7 +68,11 @@ && (p->skype_callflow == CALLFLOW_STATUS_INPROGRESS || p->skype_callflow == SKYPIAX_STATE_UP)) { +#ifdef WIN32 + unsigned int fdselect; +#else int fdselect; +#endif /* WIN32 */ int rt; fd_set fs; struct timeval to; @@ -1090,7 +1102,7 @@ if (p->interface_state != SKYPIAX_STATE_DIALING) { /* we are not calling out */ - if (1) { + if (1) { //FIXME /* we are not inside an active call */ p->skype_callflow = CALLFLOW_STATUS_RINGING; p->interface_state = SKYPIAX_STATE_RING; @@ -1227,10 +1239,10 @@ DEBUGA_SKYPE("skype_call: %s SKYPIAX_CONTROL_ANSWER sent\n", SKYPIAX_P_LOG, id); - if (1) { + if (1) { //FIXME char msg_to_skype[1024]; - if (1) { + if (1) { //FIXME switch_threadattr_t *thd_attr = NULL; switch_threadattr_create(&thd_attr, skypiax_module_pool);

1 0