November 2008 - freeswitch-branches@lists.freeswitch.org

[Freeswitch-branches] [commit] r10424 - freeswitch/branches/gmaruzz/stuff
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: gmaruzz Date: Mon Nov 17 08:48:42 2008 New Revision: 10424 Log: merged trunk 10229:10423 into gmaruzz branch Modified: freeswitch/branches/gmaruzz/stuff/skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/stuff/skypiax.conf.xml ============================================================================== --- freeswitch/branches/gmaruzz/stuff/skypiax.conf.xml (original) +++ freeswitch/branches/gmaruzz/stuff/skypiax.conf.xml Mon Nov 17 08:48:42 2008 @@ -11,7 +11,7 @@ </settings>  <analog_spans> - + <param name="hold-music" value="$${moh_uri}"/> <param name="tonegroup" value="us"/> <param name="digit-timeout" value="2000"/> @@ -21,6 +21,7 @@ <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> + <param name="X11-display" value=":99"/>  @@ -33,6 +34,7 @@ <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> + <param name="X11-display" value=":991"/>  @@ -45,6 +47,7 @@ <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> + <param name="X11-display" value=":991"/> <param name="hold-music" value="$${moh_uri}"/> @@ -67,6 +70,7 @@ <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> + <param name="X11-display" value=":991"/> <param name="hold-music" value="$${moh_uri}"/> @@ -78,6 +82,7 @@ <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> + <param name="X11-display" value=":991"/> <param name="hold-music" value="$${moh_uri}"/>

1 0

[Freeswitch-branches] [commit] r10371 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: gmaruzz Date: Thu Nov 13 11:08:28 2008 New Revision: 10371 Log: skypiax: at the moment it's an hack made of ad hoc band aids. But it can accept incoming calls and originate outbound calls, audio is going back and forth, and so are DTMFs. It works just for one call. Crashes on exit. Now I got a vague idea of how an endpoint is working on FS. During the next days, a fairly thorough rewrite. 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 Thu Nov 13 11:08:28 2008 @@ -220,6 +220,7 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); int option_debug = 100; +switch_core_session_t *global_session = NULL; static switch_status_t skypiax_codec(private_t *tech_pvt, int sample_rate, int codec_ms) { @@ -687,12 +688,11 @@ { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec SUCCESS\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_codec SUCCESS\n"); } DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - /* State methods they get called when the state changes to the specific state returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next @@ -1018,7 +1018,7 @@ return SWITCH_STATUS_SUCCESS; } - +#ifdef NOTDEF //FIXME: moved below /* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ @@ -1033,6 +1033,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { + tech_pvt->p = SKYPIAX_CONFIGS[2]; //FIXME channel = switch_core_session_get_channel(*new_session); tech_init(tech_pvt, *new_session, NULL); } else { @@ -1044,7 +1045,7 @@ if (outbound_profile) { char name[128]; - snprintf(name, sizeof(name), "SKYPIAX/%s", outbound_profile->destination_number); + snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -1057,6 +1058,7 @@ } + skypiax_skype_call(tech_pvt->p, outbound_profile->destination_number, 30); switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); @@ -1067,6 +1069,7 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } +#endif // NOTDEF //FIXME: moved below static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event) { @@ -1727,6 +1730,7 @@ DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "FINISHED")) { + global_session = NULL; //FIXME p->skype_callflow = CALLFLOW_STATUS_FINISHED; if (option_debug) DEBUGA_SKYPE("skype_call %s now is DOWN\n", SKYPIAX_P_LOG, id); @@ -1873,7 +1877,7 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); #ifndef NOTDEF - if (1) { + if (!global_session) { //FIXME FIXME FIXME switch_core_session_t *session = NULL; private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -1897,9 +1901,9 @@ #if 1 if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - "SKYPIAX", + "skypiax", "XML", - "calling_name", + "gmaruzz_from_skype", "calling_number", NULL, "calling_ani", @@ -1909,7 +1913,7 @@ "default", "5000")) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "Skypiax/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "skypiax/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } @@ -1942,6 +1946,33 @@ } #endif //0 } + } else { + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + tech_pvt = p->tech_pvt; + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + //session = tech_pvt->session; + session = global_session; + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(5000000); + channel = switch_core_session_get_channel(session); + + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + + + switch_channel_mark_pre_answered(channel); + + //switch_channel_set_state(channel, CS_EXECUTE); + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + + } #endif //NOTDEF /**************************/ @@ -1972,6 +2003,100 @@ return 0; } +int skypiax_skype_call(struct skypiax_config *p, char *idest, int timeout, switch_core_session_t *session) +{ + char rdest[80]; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } +usleep(5000); + + //FIXME strncpy(rdest, idest, sizeof(rdest) - 1); + strncpy(rdest, "echo123", sizeof(rdest) - 1); + if (option_debug) + DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); + //skypiax_skype_write(p, "GET AGC"); + //usleep(10000); + skypiax_skype_write(p, "SET AGC OFF"); + usleep(10000); + //skypiax_skype_write(p, "GET AGC"); + //usleep(10000); + //skypiax_skype_write(p, "GET AEC"); + //usleep(10000); + skypiax_skype_write(p, "SET AEC OFF"); + usleep(10000); + //skypiax_skype_write(p, "GET AEC"); + //usleep(300000); + + char msg_to_skype[1024]; + sprintf(msg_to_skype, "CALL %s", rdest); + if (skypiax_skype_write(p, msg_to_skype) < 0) { + + ERRORA("failed to communicate with Skype client, now exit\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + global_session = session; + //p->skype_call_ongoing = 1; + + //if (p->owner) { + //ast_setstate(p->owner, AST_STATE_RINGING); + //} + //FIXME ast_queue_control(p->owner, AST_CONTROL_RINGING); + return 0; +} + +static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) +{ + if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, pool)) != 0) { + private_t *tech_pvt; + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + + switch_core_session_add_stream(*new_session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { + tech_pvt->p = &SKYPIAX_CONFIGS[2]; //FIXME + channel = switch_core_session_get_channel(*new_session); + tech_init(tech_pvt, *new_session, NULL); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + if (outbound_profile) { + char name[128]; + + snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number); + switch_channel_set_name(channel, name); + + caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); + switch_channel_set_caller_profile(channel, caller_profile); + tech_pvt->caller_profile = caller_profile; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + + skypiax_skype_call(tech_pvt->p, outbound_profile->destination_number, 30, *new_session); + + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_channel_set_state(channel, CS_INIT); + return SWITCH_CAUSE_SUCCESS; + } + + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + +} + /*! * \brief This thread runs during a call, and monitor the interface serial port for signaling, like hangup, caller id, etc *

1 0

[Freeswitch-branches] [commit] r10369 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: gmaruzz Date: Wed Nov 12 23:22:35 2008 New Revision: 10369 Log: skypiax: now it reads both DTMFs and audio, and the IVR's echo works (it echoes your voice from skype back to you) :-) 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 Wed Nov 12 23:22:35 2008 @@ -583,7 +583,39 @@ } return 0; } +static switch_status_t skypiax_skypeaudio_read(private_t *tech_pvt) +{ + struct skypiax_config *p; + short buf[640]; + int samples; + + p = tech_pvt->p; + + //DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + + + memset(buf, '\0', sizeof(buf)); + + + //if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) + if ((samples = read(p->audiopipe[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short))) != 320) { + DEBUGA_SKYPE("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, + 320); + usleep(1000); + //do nothing + } else { + tech_pvt->read_frame.datalen=samples; + //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + /* A real frame */ + } + + //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + + return SWITCH_STATUS_SUCCESS; +} + #ifdef NOTDEF +//cicopet struct ast_frame *skypiax_skypeaudio_read(struct skypiax_config *p) { static struct ast_frame f; @@ -825,6 +857,15 @@ *frame = NULL; +if ( skypiax_skypeaudio_read(tech_pvt) != SWITCH_STATUS_SUCCESS ) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_skypeaudio_read ERROR\n"); + +} else { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "skypiax_skypeaudio_read SUCCESS\n"); + +} + while (switch_test_flag(tech_pvt, TFLAG_IO)) { if (switch_test_flag(tech_pvt, TFLAG_BREAK)) { switch_clear_flag(tech_pvt, TFLAG_BREAK);

1 0

[Freeswitch-branches] [commit] r10349 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: gmaruzz Date: Wed Nov 12 06:57:47 2008 New Revision: 10349 Log: skypiax: trying to send DTMF from incoming skype to IVR 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 Wed Nov 12 06:57:47 2008 @@ -173,6 +173,7 @@ //int phonebook_text_lenght; FILE *phonebook_writing_fp; int skypiax_dir_entry_extension_prefix; + void *tech_pvt; }; typedef struct skypiax_config skypiax_config_t; @@ -645,8 +646,11 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; - if(p) + if(p){ tech_pvt->p=p; + p->tech_pvt=tech_pvt; + + } if ( skypiax_codec(tech_pvt, 8000, 20) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); @@ -897,7 +901,7 @@ int sent; struct skypiax_config *p=NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -919,7 +923,7 @@ #endif sent = write(p->audioskypepipe[1], (short *) frame->data, frame->datalen); - ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; @@ -1579,8 +1583,31 @@ } if (!strcasecmp(prop, "DTMF")) { + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + //FIXME struct ast_frame f2 = { AST_FRAME_DTMF, value[0], }; DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); + + tech_pvt = p->tech_pvt; + session = tech_pvt->session; + channel = switch_core_session_get_channel(session); + + + + if (channel) { + switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) }; + if (globals.debug) { + 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); + switch_mutex_unlock(tech_pvt->flag_mutex); + } + + //FIXME ast_queue_frame(p->owner, &f2); }

1 0

[Freeswitch-branches] [commit] r10342 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: gmaruzz Date: Wed Nov 12 05:32:02 2008 New Revision: 10342 Log: skypiax: accept a call and sends you the audioPA_ALSA_PLUGHW=1 /usr/local/freeswitch/bin/freeswitch PA_ALSA_PLUGHW=1 /usr/local/freeswitch/bin/freeswitch 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 Wed Nov 12 05:32:02 2008 @@ -220,6 +220,134 @@ int option_debug = 100; +static switch_status_t skypiax_codec(private_t *tech_pvt, int sample_rate, int codec_ms) +{ + if (switch_core_codec_init(&tech_pvt->read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + + if (switch_core_codec_init(&tech_pvt->write_codec, + "L16", + NULL, + sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&tech_pvt->read_codec); + return SWITCH_STATUS_FALSE; + } + + tech_pvt->read_frame.rate = sample_rate; + tech_pvt->read_frame.codec = &tech_pvt->read_codec; + + + switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); + switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + + return SWITCH_STATUS_SUCCESS; + +} +#undef PORTAUDIO_ENGAGE +#ifdef PORTAUDIO_ENGAGE +static switch_status_t engage_device(int sample_rate, int codec_ms) +{ + PaStreamParameters inputParameters, outputParameters; + PaError err; + + if (!globals.audio_stream) { + if (!sample_rate) { + sample_rate = globals.sample_rate; + } + if (!codec_ms) { + codec_ms = globals.codec_ms; + } + + if (!globals.read_codec.implementation) { + if (switch_core_codec_init(&globals.read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + } + + switch_assert(globals.read_codec.implementation); + + if (!globals.write_codec.implementation) { + if (switch_core_codec_init(&globals.write_codec, + "L16", + NULL, + sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&globals.read_codec); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.timer.timer_interface) { + if (switch_core_timer_init(&globals.timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.timer); + return SWITCH_STATUS_FALSE; + } + } + + globals.read_frame.rate = sample_rate; + globals.read_frame.codec = &globals.read_codec; + + switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + inputParameters.device = globals.indev; + inputParameters.channelCount = 1; + inputParameters.sampleFormat = SAMPLE_TYPE; + inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency; + inputParameters.hostApiSpecificStreamInfo = NULL; + + outputParameters.device = globals.outdev; + outputParameters.channelCount = 1; + outputParameters.sampleFormat = SAMPLE_TYPE; + outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; + outputParameters.hostApiSpecificStreamInfo = NULL; + err = OpenAudioStream(&globals.audio_stream, &inputParameters, &outputParameters, sample_rate, paClipOff, + globals.read_codec.implementation->samples_per_packet); + /* UNLOCKED ************************************************************************************************* */ + switch_mutex_unlock(globals.device_lock); + + if (err != paNoError) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.hold_timer); + return SWITCH_STATUS_FALSE; + } + } + + return SWITCH_STATUS_SUCCESS; +} +#endif // PORTAUDIO_ENGAGE + + #define SKYPE_AUDIO #ifdef SKYPE_AUDIO @@ -519,6 +647,13 @@ tech_pvt->session = session; if(p) tech_pvt->p=p; +if ( skypiax_codec(tech_pvt, 8000, 20) != SWITCH_STATUS_SUCCESS) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); +} else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec SUCCESS\n"); +} + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -719,7 +854,7 @@ #endif - //switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //FIXME + switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //FIXME if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);

1 0

[Freeswitch-branches] [commit] r10313 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: gmaruzz Date: Mon Nov 10 08:41:00 2008 New Revision: 10313 Log: skypiax: we will have to correctly build the FS frame, set the flags (TFLAG_VOICE, etc) 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 Mon Nov 10 08:41:00 2008 @@ -676,6 +676,7 @@ //unsigned int elapsed; switch_byte_t *data; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -684,20 +685,46 @@ tech_pvt->read_frame.flags = SFF_NONE; *frame = NULL; - while (switch_test_flag(tech_pvt, TFLAG_IO)) { + while (switch_test_flag(tech_pvt, TFLAG_IO)) { if (switch_test_flag(tech_pvt, TFLAG_BREAK)) { switch_clear_flag(tech_pvt, TFLAG_BREAK); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL READ FRAME goto CNG\n"); goto cng; } if (!switch_test_flag(tech_pvt, TFLAG_IO)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL READ FRAME not IO\n"); return SWITCH_STATUS_FALSE; } +#if 0 + if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) { + DEBUGA_SOUND("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, + SAMPLES_PER_FRAME * sizeof(short)); + usleep(100); + //do nothing + } else { + //DEBUGA_SOUND("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + /* A real frame */ + f.frametype = AST_FRAME_VOICE; + f.subclass = AST_FORMAT_SLINEAR; + f.samples = SKYPIAX_FRAME_SIZE; + f.datalen = SKYPIAX_FRAME_SIZE * 2; + f.data = buf; + f.offset = AST_FRIENDLY_OFFSET; + f.src = skypiax_type; + f.mallocd = 0; + } +#endif + + + //switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //FIXME + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL READ CONTINUE\n"); continue; } *frame = &tech_pvt->read_frame; @@ -713,6 +740,7 @@ } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL READ FALSE\n"); return SWITCH_STATUS_FALSE; cng: @@ -734,6 +762,8 @@ int sent; struct skypiax_config *p=NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); + channel = switch_core_session_get_channel(session); assert(channel != NULL);

1 0

[Freeswitch-branches] [commit] r10312 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: gmaruzz Date: Mon Nov 10 07:43:38 2008 New Revision: 10312 Log: skypiax: answers an incoming call, goes to the dialplan extension, but do not read or write audio frames 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 Mon Nov 10 07:43:38 2008 @@ -125,21 +125,6 @@ switch_mutex_t *mutex; } globals; -struct private_object { - unsigned int flags; - switch_codec_t read_codec; - switch_codec_t write_codec; - switch_frame_t read_frame; - unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_core_session_t *session; - switch_caller_profile_t *caller_profile; - switch_mutex_t *mutex; - switch_mutex_t *flag_mutex; - //switch_thread_cond_t *cond; -}; - -typedef struct private_object private_t; - struct skypiax_config { char span_id[80]; char name[80]; @@ -195,6 +180,23 @@ static skypiax_config_t SKYPIAX_CONFIGS[SKYPIAX_MAX_INTERFACES]; +struct private_object { + unsigned int flags; + switch_codec_t read_codec; + switch_codec_t write_codec; + switch_frame_t read_frame; + unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_core_session_t *session; + switch_caller_profile_t *caller_profile; + switch_mutex_t *mutex; + switch_mutex_t *flag_mutex; + skypiax_config_t *p; + //switch_thread_cond_t *cond; +}; + +typedef struct private_object private_t; + + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan); @@ -270,7 +272,7 @@ DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); while (1) { len = recv(fd, in, sizeof(short) * GG, 0); - DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); + //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); if (len > 0) { a = 0; for (i = 0; i < len / sizeof(short); i++) { @@ -362,7 +364,7 @@ while (1) { got = read(p->audioskypepipe[0], in, (NN / 2) * sizeof(short)); - ERRORA("got %d\n", SKYPIAX_P_LOG, got); + //ERRORA("got %d\n", SKYPIAX_P_LOG, got); if (got > 0) { a = 0; @@ -504,9 +506,9 @@ #endif //NOTDEF #endif /* SKYPE_AUDIO */ -static void tech_init(private_t *tech_pvt, switch_core_session_t *session) +static void tech_init(private_t *tech_pvt, switch_core_session_t *session, skypiax_config_t *p) { - struct skypiax_config *p = NULL; + //struct skypiax_config *p = NULL; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); tech_pvt->read_frame.data = tech_pvt->databuf; @@ -515,6 +517,8 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; + if(p) + tech_pvt->p=p; DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -575,7 +579,7 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); return SWITCH_STATUS_SUCCESS; @@ -727,7 +731,8 @@ switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; //switch_frame_t *pframe; - //FIXME int sent; + int sent; + struct skypiax_config *p=NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -735,7 +740,11 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + p=tech_pvt->p; + assert(p != NULL); + if (!switch_test_flag(tech_pvt, TFLAG_IO)) { + ERRORA("CIAPA \n", SKYPIAX_P_LOG); return SWITCH_STATUS_FALSE; } #ifdef BIGENDIAN @@ -744,8 +753,8 @@ } #endif - //FIXME sent = write(p->audioskypepipe[1], (short *) frame->data, frame->datalen); - //FIXME ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + sent = write(p->audioskypepipe[1], (short *) frame->data, frame->datalen); + ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; @@ -756,6 +765,7 @@ { private_t *tech_pvt; switch_channel_t *channel = NULL; + struct skypiax_config *p; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -763,6 +773,9 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + p=tech_pvt->p; + + ERRORA("ANSWERED! \n", SKYPIAX_P_LOG); return SWITCH_STATUS_SUCCESS; } @@ -772,6 +785,7 @@ { switch_channel_t *channel; private_t *tech_pvt; + struct skypiax_config *p; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -779,9 +793,12 @@ tech_pvt = (private_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); + p=tech_pvt->p; + switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: { + ERRORA("TO BE ANSWERED! \n", SKYPIAX_P_LOG); channel_answer_channel(session); } break; @@ -807,7 +824,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(*new_session); - tech_init(tech_pvt, *new_session); + tech_init(tech_pvt, *new_session, NULL); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(new_session); @@ -1266,7 +1283,7 @@ if (read_from_pipe[i] == '\0') { - if (option_debug > 1) + if (option_debug > 101) DEBUGA_SKYPE("read_skype: howmany=%d, i=%d, a=%d, |||%s||| \n", SKYPIAX_P_LOG, howmany, i, a, messaggio); @@ -1371,7 +1388,7 @@ where = strsep(stringp, " "); - if (option_debug > 1) + if (option_debug > 101) DEBUGA_SKYPE ("Skype MSG: messaggio: %s, obj: %s, id: %s, prop: %s, value: %s,where: %s!\n", SKYPIAX_P_LOG, messaggio, obj, id, prop, value, where ? where : "NULL"); @@ -1622,40 +1639,59 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); -#ifdef NOTDEF +#ifndef NOTDEF if (1) { - switch_core_session_t *session; + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel!\n"); - if ((session = switch_core_session_request(iax_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(skypiax_endpoint_interface, NULL)) != 0) { switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(session); - tech_init(tech_pvt, session); + tech_init(tech_pvt, session, p); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(&session); break; } + // if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, dialplan, cid_name, cid_num, ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) + +#if 1 if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - iaxevent->ies.username, - globals.dialplan, - iaxevent->ies.calling_name, - iaxevent->ies.calling_number, - iax_get_peer_ip(iaxevent->session), - iaxevent->ies.calling_ani, + "SKYPIAX", + "XML", + "calling_name", + "calling_number", NULL, + "calling_ani", NULL, - modname, - iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) { + NULL, + (char *) modname, + "default", + "5000")) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "Skypiax/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + switch_channel_set_state(channel, CS_INIT); + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + } + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); +#endif //0 +#if 0 if (iax_set_codec(tech_pvt, iaxevent->session, &iaxevent->ies.format, &iaxevent->ies.capability, &iaxevent->ies.samprate, IAX_SET) != SWITCH_STATUS_SUCCESS) { iax_reject(iaxevent->session, "Codec Error!"); @@ -1671,6 +1707,7 @@ switch_core_session_destroy(&session); } } +#endif //0 } } #endif //NOTDEF

1 0

[Freeswitch-branches] [commit] r10311 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: gmaruzz Date: Mon Nov 10 04:56:40 2008 New Revision: 10311 Log: skypiax: added audio thread, but cannot activate incoming call. Need to move things from skypiax_config to tech_pvt 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 Mon Nov 10 04:56:40 2008 @@ -270,6 +270,7 @@ DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); while (1) { len = recv(fd, in, sizeof(short) * GG, 0); + DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); if (len > 0) { a = 0; for (i = 0; i < len / sizeof(short); i++) { @@ -312,9 +313,10 @@ } return NULL; } -void *skypiax_do_tcp_cli_thread(void *data) +static void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t *thread, void *obj) +//void *skypiax_do_tcp_cli_thread(void *data) { - struct skypiax_config *p = data; + struct skypiax_config *p = obj; int s, fd, len; short in[NN / 2]; short out[NN]; @@ -355,11 +357,12 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { - DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); + ERRORA("ACCEPTED\n", SKYPIAX_P_LOG); //while (1 && p->owner && p->owner->_state == AST_STATE_UP) FIXME FIXME FIXME while (1) { got = read(p->audioskypepipe[0], in, (NN / 2) * sizeof(short)); + ERRORA("got %d\n", SKYPIAX_P_LOG, got); if (got > 0) { a = 0; @@ -377,7 +380,7 @@ break; } } else { - usleep(100); + usleep(1000); } } @@ -498,31 +501,21 @@ } return &f; } -int skypiax_skypeaudio_write(struct skypiax_config *p, struct ast_frame *f) -{ - int sent; - - if (option_debug > 100) { - DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - } - sent = write(p->audioskypepipe[1], (short *) f->data, f->datalen); - - if (option_debug > 100) { - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); - } - return 0; -} #endif //NOTDEF #endif /* SKYPE_AUDIO */ static void tech_init(private_t *tech_pvt, switch_core_session_t *session) { + struct skypiax_config *p = NULL; + + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); tech_pvt->read_frame.data = tech_pvt->databuf; tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } /* @@ -734,6 +727,7 @@ switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; //switch_frame_t *pframe; + //FIXME int sent; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -750,6 +744,9 @@ } #endif + //FIXME sent = write(p->audioskypepipe[1], (short *) frame->data, frame->datalen); + //FIXME ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + return SWITCH_STATUS_SUCCESS; @@ -1581,6 +1578,19 @@ if (1) { char msg_to_skype[1024]; if (!p->tcp_cli_thread) { +if(1) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + switch_threadattr_create(&thd_attr, 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_tcp_cli_thread, p, module_pool); + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); +} + + #ifdef NOTDEF if (ast_pthread_create (&p->tcp_cli_thread, NULL, skypiax_do_tcp_cli_thread, p) < 0) { @@ -1605,6 +1615,72 @@ } p->skype_callflow = AST_STATE_UP; + + /**************************/ + + //FIXME switch_core_session_t **new_session; + + //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); + +#ifdef NOTDEF + if (1) { + switch_core_session_t *session; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel!\n"); + + if ((session = switch_core_session_request(iax_endpoint_interface, NULL)) != 0) { + switch_core_session_add_stream(session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { + channel = switch_core_session_get_channel(session); + tech_init(tech_pvt, session); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(&session); + break; + } + + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + iaxevent->ies.username, + globals.dialplan, + iaxevent->ies.calling_name, + iaxevent->ies.calling_number, + iax_get_peer_ip(iaxevent->session), + iaxevent->ies.calling_ani, + NULL, + NULL, + modname, + iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) { + char name[128]; + switch_snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + } + + if (iax_set_codec(tech_pvt, iaxevent->session, + &iaxevent->ies.format, &iaxevent->ies.capability, &iaxevent->ies.samprate, IAX_SET) != SWITCH_STATUS_SUCCESS) { + iax_reject(iaxevent->session, "Codec Error!"); + switch_core_session_destroy(&session); + } else { + tech_pvt->iax_session = iaxevent->session; + tech_pvt->session = session; + iax_accept(tech_pvt->iax_session, tech_pvt->codec); + iax_ring_announce(tech_pvt->iax_session); + switch_channel_set_state(channel, CS_INIT); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + } + } + } + } +#endif //NOTDEF + /**************************/ + + + + + + } else { WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPIAX_P_LOG, id, value);

1 0

[Freeswitch-branches] [commit] r10309 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: gmaruzz Date: Mon Nov 10 01:35:51 2008 New Revision: 10309 Log: skypiax: cosmetics 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 Mon Nov 10 01:35:51 2008 @@ -267,6 +267,7 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { + DEBUGA_SKYPE("ACCEPTED\n", SKYPIAX_P_LOG); while (1) { len = recv(fd, in, sizeof(short) * GG, 0); if (len > 0) { @@ -290,7 +291,7 @@ } } else if (len == 0) { - DEBUGA_SKYPE("client GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); break; } else { ERRORA("len=%d\n", SKYPIAX_P_LOG, len); @@ -298,7 +299,7 @@ break; } } - DEBUGA_SKYPE("client GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); close(fd); if (exit) break; @@ -372,7 +373,7 @@ len = send(fd, out, got * 2, 0); if (len == 0) { - DEBUGA_SKYPE("client GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); break; } } else { @@ -380,11 +381,11 @@ } } - DEBUGA_SKYPE("client GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); close(fd); } - DEBUGA_SKYPE("server (I am it) GONE\n", SKYPIAX_P_LOG); + DEBUGA_SKYPE("client (I am it) GONE\n", SKYPIAX_P_LOG); close(s); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); @@ -1130,8 +1131,7 @@ if (i < 20) { /* last fragment */ write(AsteriskHandlesAst->fdesc[1], b, strlen(b) + 1); //write(AsteriskHandlesAst->fdesc[1], "\0", 1); - DEBUGA_SKYPE("SKYPE pipewrite: |||%s|||len=%d serial=%ld\n\n\n", SKYPIAX_P_LOG, b, - strlen(b) + 1, an_event.xclient.serial); + //FIXME DEBUGA_SKYPE("SKYPE pipewrite: |||%s|||len=%d serial=%ld\n\n\n", SKYPIAX_P_LOG, b, strlen(b) + 1, an_event.xclient.serial); //usleep(1000); memset(buffer, '\0', 17000); }

1 0

[Freeswitch-branches] [commit] r10308 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: gmaruzz Date: Mon Nov 10 01:15:10 2008 New Revision: 10308 Log: skypiax: better logging 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 Mon Nov 10 01:15:10 2008 @@ -16,8 +16,8 @@ #define NOTICA(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][NOTICA %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); -#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, "none", -1, -2, -3 -#define SKYPIAX_TMP_LOG NULL, (unsigned long)55, __LINE__, "none", -1, -2, -3 +//#define SKYPIAX_P_LOG p ? p->owner : NULL, (unsigned long)pthread_self(), __LINE__, p ? p->name ? p->name : "none" : "none", p ? p->owner ? p->owner->_state : -1 : -1, p ? p->interface_state : -1, p ? p->skype_callflow : -1 +#define SKYPIAX_P_LOG NULL, (unsigned long)55, __LINE__, p ? p->name ? p->name : "none" : "none", -1, p ? p->interface_state : -1, p ? p->skype_callflow : -1 /*********************************/ @@ -886,7 +886,7 @@ int X11_errors_handler(Display * dpy, XErrorEvent * err) { (void) dpy; - //struct skypiax_pvt *p = NULL; + struct skypiax_config *p = NULL; xerror = err->error_code; DEBUGA_SKYPE("Received error code %d from X Server\n", SKYPIAX_P_LOG, xerror); @@ -912,7 +912,7 @@ Window w_P; Display *disp; Window handle_P; - //struct skypiax_pvt *p = NULL; + struct skypiax_config *p = NULL; w_P = AsteriskHandlesAst->skype_win; disp = AsteriskHandlesAst->disp; @@ -964,7 +964,7 @@ unsigned long bytes_after_ret; unsigned char *prop; int status; - //struct skypiax_pvt *p = NULL; + struct skypiax_config *p = NULL; X11_errors_trap(); //XLockDisplay(disp); @@ -993,7 +993,7 @@ int *dispptr; int disp; - //struct skypiax_pvt *p = NULL; + struct skypiax_config *p = NULL; dispptr = data; disp = *dispptr; @@ -1880,6 +1880,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { + struct skypiax_config *p = NULL; module_pool = pool;

1 0