- Freeswitch-svn - FreeSWITCH Mailing Lists

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

01 Feb '09

Author: anthm Date: Sat Jan 31 18:06:46 2009 New Revision: 11581 Log: probably make nat work on sla Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.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 Jan 31 18:06:46 2009 @@ -779,7 +779,7 @@ void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip); void sofia_sla_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); -void sofia_sla_handle_sip_i_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); +void sofia_sla_handle_sip_i_subscribe(nua_t *nua, const char *contact_str, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); void sofia_sla_handle_sip_r_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); void sofia_sla_handle_sip_i_notify(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jan 31 18:06:46 2009 @@ -3047,7 +3047,8 @@ " call_id VARCHAR(255),\n" " aor VARCHAR(255),\n" " profile_name VARCHAR(255),\n" - " hostname VARCHAR(255)\n" + " hostname VARCHAR(255),\n" + " contact_str VARCHAR(255)\n" ");\n"; if (profile->odbc_dsn) { @@ -3105,7 +3106,7 @@ free(test_sql); if (profile->manage_shared_appearance) { - test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where hostname='%q'", mod_sofia_globals.hostname); + test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); @@ -3145,7 +3146,7 @@ free(test_sql); if(profile->manage_shared_appearance) { - test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where hostname='%q'", mod_sofia_globals.hostname); + test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); free(test_sql); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Jan 31 18:06:46 2009 @@ -1423,17 +1423,6 @@ return; } - /* the following could be refactored back to the calling event handler in sofia.c XXX MTK */ - if (profile->manage_shared_appearance) { - if (!strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { - /* only fire this on <200 to try to avoid resubscribes. probably better ways to do this? */ - if (status < 200) { - sofia_sla_handle_sip_i_subscribe(nua, profile, nh, sip, tags); - } - return; - } - } - get_addr(network_ip, sizeof(network_ip), my_addrinfo->ai_addr, my_addrinfo->ai_addrlen); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); @@ -1524,6 +1513,22 @@ is_nat ? ";nat" : ""); } + + + /* the following could be refactored back to the calling event handler in sofia.c XXX MTK */ + if (profile->manage_shared_appearance) { + if (!strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { + /* only fire this on <200 to try to avoid resubscribes. probably better ways to do this? */ + if (status < 200) { + sofia_sla_handle_sip_i_subscribe(nua, contact_str, profile, nh, sip, tags); + } + switch_safe_free(contact_str); + return; + } + } + + + if (to) { to_str = switch_mprintf("sip:%s@%s", to->a_url->url_user, to->a_url->url_host); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c Sat Jan 31 18:06:46 2009 @@ -78,12 +78,13 @@ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); } -void sofia_sla_handle_sip_i_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) +void sofia_sla_handle_sip_i_subscribe(nua_t *nua, const char *contact_str, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) { char *aor = NULL; char *subscriber = NULL; char *sql = NULL; - + char *route_uri = NULL; + /* * XXX MTK FIXME - we don't look at the tag to see if NUTAG_SUBSTATE(nua_substate_terminated) or * a Subscription-State header with state "terminated" and/or expiration of 0. So we never forget @@ -119,22 +120,43 @@ } if ((sql = - switch_mprintf("insert into sip_shared_appearance_subscriptions (subscriber, call_id, aor, profile_name, hostname) " - "values ('%q','%q','%q','%q','%q')", - subscriber, sip->sip_call_id->i_id, aor, profile->name, mod_sofia_globals.hostname))) { + switch_mprintf("insert into sip_shared_appearance_subscriptions (subscriber, call_id, aor, profile_name, hostname, contact_str) " + "values ('%q','%q','%q','%q','%q','%q')", + subscriber, sip->sip_call_id->i_id, aor, profile->name, mod_sofia_globals.hostname, contact_str))) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } + if (strstr(contact_str, ";fs_nat")) { + char *p; + route_uri = strdup(contact_str); + if ((p = strstr(contact_str, ";fs_"))) { + *p = '\0'; + } + } + + + if (route_uri) { + char *p; + + while (route_uri && *route_uri && (*route_uri == '<' || *route_uri == ' ')) { + route_uri++; + } + if ((p = strchr(route_uri, '>'))) { + *p++ = '\0'; + } + } nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(profile->sla_contact), NUTAG_WITH_THIS(nua), - SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=300"), /* you thought the OTHER time was fake... need delta here FIXME XXX MTK */ - SIPTAG_EXPIRES_STR("300"), /* likewise, totally fake - FIXME XXX MTK */ + TAG_IF(route_uri, NUTAG_PROXY(route_uri)), + SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=300"), /* you thought the OTHER time was fake... need delta here FIXME XXX MTK */ + SIPTAG_EXPIRES_STR("300"), /* likewise, totally fake - FIXME XXX MTK */ /* sofia_presence says something about needing TAG_IF(sticky, NUTAG_PROXY(sticky)) for NAT stuff? */ TAG_END()); switch_safe_free(aor); switch_safe_free(subscriber); + switch_safe_free(route_uri); switch_safe_free(sql); } @@ -199,7 +221,7 @@ contact = switch_mprintf("sip:%s@%s",sip->sip_contact->m_url->url_user, sip->sip_contact->m_url->url_host); if(sip->sip_payload && sip->sip_payload->pl_data) { - sql = switch_mprintf("select subscriber,call_id,aor,profile_name,hostname from sip_shared_appearance_subscriptions where " + sql = switch_mprintf("select subscriber,call_id,aor,profile_name,hostname,route_uri from sip_shared_appearance_subscriptions where " "aor='%q' and subscriber<>'%q' and profile_name='%q' and hostname='%q'", aor, contact, profile->name, mod_sofia_globals.hostname); @@ -224,17 +246,41 @@ /* char *aor = argv[2]; */ /* char *profile_name = argv[3]; */ /* char *hostname = argv[4]; */ + char *contact_str = argv[5]; nua_handle_t *nh; + char *route_uri = NULL; + nh = nua_handle_by_call_id(helper->profile->nua, call_id); /* that's all you need to find the subscription's nh */ - if(nh) - { + if(nh) { + + if (strstr(contact_str, ";fs_nat")) { + char *p; + route_uri = strdup(contact_str); + if ((p = strstr(contact_str, ";fs_"))) { + *p = '\0'; + } + } + + if (route_uri) { + char *p; + + while (route_uri && *route_uri && (*route_uri == '<' || *route_uri == ' ')) { + route_uri++; + } + if ((p = strchr(route_uri, '>'))) { + *p++ = '\0'; + } + } + nua_notify(nh, - SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=300"), /* XXX MTK FIXME - this is totally fake calculation */ - SIPTAG_CONTENT_TYPE_STR("application/dialog-info+xml"), /* could've just kept the type from the payload */ - SIPTAG_PAYLOAD_STR(helper->payload), - TAG_END()); + SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=300"), /* XXX MTK FIXME - this is totally fake calculation */ + TAG_IF(route_uri, NUTAG_PROXY(route_uri)), + SIPTAG_CONTENT_TYPE_STR("application/dialog-info+xml"), /* could've just kept the type from the payload */ + SIPTAG_PAYLOAD_STR(helper->payload), + TAG_END()); + switch_safe_free(route_uri); } return 0; }

1 0

[commit] r11580 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: brian Date: Sat Jan 31 13:42:40 2009 New Revision: 11580 Log: doh Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 31 13:42:40 2009 @@ -593,7 +593,6 @@ if (ok) { switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); } else { - abort(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname); } }

1 0

[commit] r11579 - in freeswitch/branches/gmaruzz/mod_skypiax: . asterisk
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: gmaruzz Date: Sat Jan 31 10:48:15 2009 New Revision: 11579 Log: skypiax: same skyiax_protocol.c for FS and *. FS: works as before. Incoming audio not yet working on *, outgoing audio, incoming dtmf, IVR, works Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c 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 Sat Jan 31 10:48:15 2009 @@ -23,6 +23,9 @@ #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include +#ASTERISK +CFLAGS+=-DASTERISK + #ASTERISK VERSION #Uncomment one of the following lines to match your Asterisk series #CFLAGS+=-DASTERISK_VERSION_1_4 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 Jan 31 10:48:15 2009 @@ -2236,6 +2236,71 @@ return skypiax_do_tcp_cli_thread_func(obj); } +int skypiax_skypeaudio_write(struct skypiax_pvt *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; +} +int skypiax_console_skype(int fd, int argc, char *argv[]) +{ + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + char skype_msg[1024]; + int i, a, c; + + if (argc == 1) { + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" console for skypiax_skype, please enter 'help console'\n"); + return RESULT_SUCCESS; + } + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (!p->skype) { + ast_cli(fd, "The \"current\" console is not connected to a Skype client'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + + memset(skype_msg, 0, sizeof(skype_msg)); + c = 0; + for (i = 1; i < argc; i++) { + for (a = 0; a < strlen(argv[i]); a++) { + skype_msg[c] = argv[i][a]; + c++; + if (c == 1022) + break; + } + if (i != argc - 1) { + skype_msg[c] = ' '; + c++; + } + if (c == 1023) + break; + } + skypiax_skype_write(p, skype_msg); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} + /************************************************/ #ifdef ASTERISK_VERSION_1_4 #ifndef AST_MODULE Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c Sat Jan 31 10:48:15 2009 @@ -1,19 +1,23 @@ #include "skypiax.h" +#ifdef ASTERISK #define skypiax_sleep usleep -#define skypiax_file_write switch_file_write -#define skypiax_file_read switch_file_read - #define tech_pvt p - #define SKYPIAX_DIR_CONFIG "directoriax.conf" - extern int skypiax_debug; -//extern switch_memory_pool_t *skypiax_module_pool; +#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 +#endif /* ASTERISK */ + extern int option_debug; -//extern switch_endpoint_interface_t *skypiax_endpoint_interface; extern int running; -extern char *skypiax_console_active; /* GLOBALS */ int skypiax_dir_entry_extension=1; @@ -1028,7 +1032,6 @@ howmany = strlen(b) + 1; howmany = write(SkypiaxHandles->fdesc[1], b, howmany); - //DEBUGA_PBX("HERE: %s\n", SKYPIAX_P_LOG, b); memset(buffer, '\0', 17000); } @@ -1632,110 +1635,7 @@ return 0; } -#if 0 -static switch_status_t channel_write_frame(switch_core_session_t * session, - switch_frame_t * frame, switch_io_flag_t flags, - int stream_id) -{ - switch_channel_t *channel = NULL; - private_t *tech_pvt = NULL; - unsigned int sent; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - - if (!switch_test_flag(tech_pvt, TFLAG_IO)) { - ERRORA("CIAPA \n", SKYPIAX_P_LOG); - return SWITCH_STATUS_FALSE; - } -#ifdef BIGENDIAN - if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) { - switch_swap_linear(frame->data, (int) frame->datalen / 2); - } -#endif - - sent = frame->datalen; -#ifdef WIN32 - switch_file_write(tech_pvt->audioskypepipe[1], frame->data, &sent); -#else /* WIN32 */ - sent = write(tech_pvt->audioskypepipe[1], frame->data, sent); -#endif /* WIN32 */ - if (sent != frame->datalen && sent != -1) { - DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); - } - - return SWITCH_STATUS_SUCCESS; -} -#endif - - -int skypiax_skypeaudio_write(struct skypiax_pvt *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; -} -int skypiax_console_skype(int fd, int argc, char *argv[]) -{ - struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); - char skype_msg[1024]; - int i, a, c; - - if (argc == 1) { - return RESULT_SHOWUSAGE; - } - if (!p) { - ast_cli(fd, - "No \"current\" console for skypiax_skype, please enter 'help console'\n"); - return RESULT_SUCCESS; - } - if (option_debug > 10) { - DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - } - if (!p->skype) { - ast_cli(fd, "The \"current\" console is not connected to a Skype client'\n"); - if (option_debug > 10) { - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); - } - if (option_debug > 10) { - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); - } - return RESULT_SUCCESS; - } - - memset(skype_msg, 0, sizeof(skype_msg)); - c = 0; - for (i = 1; i < argc; i++) { - for (a = 0; a < strlen(argv[i]); a++) { - skype_msg[c] = argv[i][a]; - c++; - if (c == 1022) - break; - } - if (i != argc - 1) { - skype_msg[c] = ' '; - c++; - } - if (c == 1023) - break; - } - skypiax_skype_write(p, skype_msg); - if (option_debug > 10) { - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); - } - return RESULT_SUCCESS; -} +#ifdef ASTERISK int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[]) { //int res; @@ -2107,3 +2007,4 @@ return RESULT_SUCCESS; } +#endif /* ASTERISK */ 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 Jan 31 10:48:15 2009 @@ -1,14 +1,26 @@ #include "skypiax.h" +#ifdef ASTERISK +#define skypiax_sleep usleep +#define tech_pvt p +#define SKYPIAX_DIR_CONFIG "directoriax.conf" +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 +#endif /* ASTERISK */ -extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; -extern switch_endpoint_interface_t *skypiax_endpoint_interface; extern int running; +/* GLOBALS */ +int skypiax_dir_entry_extension=1; /*************************************/ #ifndef WIN32 XErrorHandler old_handler = 0; @@ -118,8 +130,8 @@ if ((SAMPLERATE_SKYPIAX - 8000) == 0) { - 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]); + //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) { a = 0; for (i = 0; i < len / sizeof(short); i++) { @@ -509,7 +521,7 @@ if (samples != SAMPLES_PER_FRAME * sizeof(short)) { //if (samples) //ERRORA("SRV PIPE READ=====> NOT GOOD samples=%u expected=%lu\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); - assert(samples == SAMPLES_PER_FRAME * sizeof(short)); //do a crash, please + //assert(samples == SAMPLES_PER_FRAME * sizeof(short)); //do a crash, please return 0; } else { /* A real frame */ @@ -925,6 +937,15 @@ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + if(!strlen(tech_pvt->X11_display)) + strcpy(tech_pvt->X11_display, getenv("DISPLAY")); + + if(!tech_pvt->tcp_srv_port) + tech_pvt->tcp_srv_port = 10160; + + if(!tech_pvt->tcp_cli_port) + tech_pvt->tcp_cli_port = 10161; + 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); @@ -1613,3 +1634,377 @@ //FIXME ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING); return 0; } + +#ifdef ASTERISK +int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[]) +{ + //int res; + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + //char list_command[64]; + char fn[256]; + char date[256] = ""; + time_t t; + char *configfile = SKYPIAX_DIR_CONFIG; + int add_to_skypiax_dir_conf = 1; + //int fromskype = 0; + //int fromcell = 0; + +#if 0 + if(directoriax_entry_extension){ + skypiax_dir_entry_extension=directoriax_entry_extension; + }else{ + ast_cli(fd, "No 'directoriax_entry_extension', you MUST have loaded directoriax.so\n"); + return RESULT_SUCCESS; + } +#endif + + if (argc != 2) + return RESULT_SHOWUSAGE; + if (!p) { + ast_cli(fd, "No \"current\" console ???, please enter 'help skypiax_console'\n"); + return RESULT_SUCCESS; + } + + if (!strcasecmp(argv[1], "add")) + add_to_skypiax_dir_conf = 1; + else if (!strcasecmp(argv[1], "replace")) + add_to_skypiax_dir_conf = 0; + else { + ast_cli(fd, "\n\nYou have neither specified 'add' nor 'replace'\n\n"); + return RESULT_SHOWUSAGE; + } + +#if 0 + if (!strcasecmp(argv[2], "fromskype")) + fromskype = 1; + else if (!strcasecmp(argv[2], "fromcell")) + fromcell = 1; + else { + ast_cli(fd, "\n\nYou have neither specified 'fromskype' nor 'fromcell'\n\n"); + return RESULT_SHOWUSAGE; + } + + if (fromcell) { + ast_cli(fd, + "Importing from cellphone is currently supported only on \"AT\" cellphones :( !\n"); + //fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + return RESULT_SUCCESS; + } + + if (fromskype) + if (!p->skype) { + ast_cli(fd, "Importing from skype is supported by skypiax_dir on chan_skypiax!\n"); + //fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + return RESULT_SUCCESS; + } + + if (fromcell || fromskype) + if (argc != 3) { + ast_cli(fd, + "\n\nYou don't have to specify a filename with 'fromcell' or with 'fromskype'\n\n"); + return RESULT_SHOWUSAGE; + } +#endif + + /*******************************************************************************************/ + + if (configfile[0] == '/') { + ast_copy_string(fn, configfile, sizeof(fn)); + } else { + snprintf(fn, sizeof(fn), "%s/%s", ast_config_AST_CONFIG_DIR, configfile); + } + if (option_debug) + NOTICA("Opening '%s'\n", SKYPIAX_P_LOG, fn); + time(&t); + ast_copy_string(date, ctime(&t), sizeof(date)); + + if (add_to_skypiax_dir_conf) + p->phonebook_writing_fp = fopen(fn, "a+"); + else + p->phonebook_writing_fp = fopen(fn, "w+"); + + if (p->phonebook_writing_fp) { + if (add_to_skypiax_dir_conf) { + if (option_debug) + NOTICA("Opened '%s' for appending \n", SKYPIAX_P_LOG, fn); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, ";! Update Date: %s", date); + fprintf(p->phonebook_writing_fp, ";! Updated by: %s, %d\n", __FILE__, __LINE__); + fprintf(p->phonebook_writing_fp, ";!\n"); + } else { + if (option_debug) + NOTICA("Opened '%s' for writing \n", SKYPIAX_P_LOG, fn); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, ";! Automatically generated configuration file\n"); + fprintf(p->phonebook_writing_fp, ";! Filename: %s (%s)\n", configfile, fn); + fprintf(p->phonebook_writing_fp, ";! Creation Date: %s", date); + fprintf(p->phonebook_writing_fp, ";! Generated by: %s, %d\n", __FILE__, __LINE__); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, "[general]\n\n"); + fprintf(p->phonebook_writing_fp, "[default]\n"); + } + + /*******************************************************************************************/ + //if (fromskype) { + if (p->skype) { + WARNINGA + ("About to querying the Skype client 'Contacts', it may take some moments... Don't worry.\n", + SKYPIAX_P_LOG); + if (p->skype_thread != AST_PTHREADT_NULL) { + char msg_to_skype[1024]; + + p->skype_friends[0] = '\0'; + sprintf(msg_to_skype, "#333 SEARCH FRIENDS"); + if (skypiax_skype_write(p, msg_to_skype) < 0) { + return -1; + } + + int friends_count = 0; + while (p->skype_friends[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + friends_count++; + if (friends_count > 20000) { + return -1; /* FIXME */ + } + } + + } + + if (p->skype_thread != AST_PTHREADT_NULL) { + char msg_to_skype[1024]; + + if (p->skype_friends[0] != '\0') { + char *buf, *where; + char **stringp; + int skype_dir_file_written = 0; + + buf = p->skype_friends; + stringp = &buf; + where = strsep(stringp, ", "); + while (where) { + if (where[0] != '\0') { + /* + * So, we have the Skype username (the HANDLE, I think is called). + * But we want to call the names we see in the Skype contact list + * So, let's check the DISPLAYNAME (the end user modified contact name) + * Then, we check the FULLNAME (that appears as it was the DISPLAYNAME + * if the end user has not modify it) + * If we still have neither DISPLAYNAME nor FULLNAME, we'll use the + * Skipe username (the HANDLE) + */ + + p->skype_displayname[0] = '\0'; + sprintf(msg_to_skype, "#765 GET USER %s DISPLAYNAME", where); + skypiax_skype_write(p, msg_to_skype); + int displayname_count = 0; + while (p->skype_displayname[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + displayname_count++; + if (displayname_count > 20000) + return -1; /* FIXME */ + } + if (p->skype_displayname[0] != '\0') { + char *where2; + char sanitized[300]; + + sanitized[0] = '\0'; + + where2 = strstr(p->skype_displayname, "DISPLAYNAME "); + if (where2) { + + /* there can be some *smart* that makes a displayname + * that is different than first<space>last, */ + /* maybe initials, simbols, slashes, + * something smartish... let's check */ + + if (where2[12] != '\0') { + int i = 12; + int x = 0; + int spaces = 0; + int last_char_was_space = 0; + + for (i = 12; i < strlen(where2) && x < 299; i++) { + if (!isalnum(where2[i])) { + if (!isblank(where2[i])) { + /* bad char */ + continue; + } + /* is a space */ + if (last_char_was_space == 1) /* do not write 2 consecutive spaces */ + continue; + last_char_was_space = 1; + sanitized[x] = ' '; + x++; + continue; + } + /* is alphanum */ + last_char_was_space = 0; + sanitized[x] = where2[i]; + x++; + continue; + } + + sanitized[x] = '\0'; + if (spaces == 0) { + } + DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", + SKYPIAX_P_LOG, sanitized, where, &where2[12]); + } + + if (where2[12] != '\0') { + skypiax_dir_entry_extension++; + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + } + skype_dir_file_written = 1; + + } + } + } + p->skype_displayname[0] = '\0'; + + p->skype_fullname[0] = '\0'; + sprintf(msg_to_skype, "#222 GET USER %s FULLNAME", where); + skypiax_skype_write(p, msg_to_skype); + int fullname_count = 0; + while (p->skype_fullname[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + fullname_count++; + if (fullname_count > 20000) + return -1; /* FIXME */ + } + if (p->skype_fullname[0] != '\0') { + char *where2; + char sanitized[300]; + + where2 = strstr(p->skype_fullname, "FULLNAME "); + if (where2) { + + /* there can be some *smart* that makes a fullname + * that is different than first<space>last, */ + /* maybe initials, simbols, slashes, + * something smartish... let's check */ + + if (where2[9] != '\0') { + int i = 9; + int x = 0; + int spaces = 0; + int last_char_was_space = 0; + + for (i = 9; i < strlen(where2) && x < 299; i++) { + if (!isalnum(where2[i])) { + if (!isblank(where2[i])) { + /* bad char */ + continue; + } + /* is a space */ + if (last_char_was_space == 1) /* do not write 2 consecutive spaces */ + continue; + last_char_was_space = 1; + sanitized[x] = ' '; + x++; + continue; + } + /* alphanum */ + last_char_was_space = 0; + sanitized[x] = where2[i]; + x++; + continue; + } + + sanitized[x] = '\0'; + if (spaces == 0) { + } + DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", + SKYPIAX_P_LOG, sanitized, where, &where2[9]); + } + + if (skype_dir_file_written == 0) { + skypiax_dir_entry_extension++; + if (where2[9] != '\0') { + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + + } + + } else { + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, where, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, where, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + + } + } + } + + skype_dir_file_written = 0; + + } + + } + p->skype_fullname[0] = '\0'; + + } + where = strsep(stringp, ", "); + } + + p->skype_friends[0] = '\0'; + } + } + } else { + + ast_cli(fd, + "Skype not configured on the 'current' console, not importing from Skype client!\n"); + } + //} + /*******************************************************************************************/ + /*******************************************************************************************/ + } else { + ast_cli(fd, "\n\nfailed to open the skypiax_dir.conf configuration file: %s\n", fn); + ERRORA("failed to open the skypiax_dir.conf configuration file: %s\n", SKYPIAX_P_LOG, + fn); + return RESULT_FAILURE; + } + + fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + + return RESULT_SUCCESS; +} +#endif /* ASTERISK */

1 0

[commit] r11578 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: gmaruzz Date: Sat Jan 31 10:07:53 2009 New Revision: 11578 Log: skypiax: has answered first call on asterisk, DTMF incoming works (eg. IVR), outbound audio works, incoming audio not yet Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h freeswitch/branches/gmaruzz/mod_skypiax/asterisk/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 Jan 31 10:07:53 2009 @@ -107,7 +107,7 @@ /*! \brief Default skypiax_pvt structure values, * used by skypiax_mkif to initialize the interfaces */ struct skypiax_pvt skypiax_default = { - .interface_state = AST_STATE_DOWN, + .interface_state = SKYPIAX_STATE_DOWN, .skype_callflow = 0, .context = "default", .language = "en", @@ -341,7 +341,7 @@ DEBUGA_PBX("Requesting: %s, name: %s, format: %d\n", SKYPIAX_P_LOG, type, name, format); /* create a new channel owning this interface */ - tmp = skypiax_new(p, AST_STATE_DOWN, p->context); + tmp = skypiax_new(p, SKYPIAX_STATE_DOWN, p->context); if (!tmp) { /* the channel was not created, probable memory allocation error */ *cause = AST_CAUSE_SWITCH_CONGESTION; @@ -398,16 +398,16 @@ if (option_debug > 10) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } - if (p->skype && p->interface_state != AST_STATE_DOWN) { + if (p->skype && p->interface_state != SKYPIAX_STATE_DOWN) { char msg_to_skype[1024]; - p->interface_state = AST_STATE_HANGUP_REQUESTED; + p->interface_state = SKYPIAX_STATE_HANGUP_REQUESTED; DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPIAX_P_LOG, p->skype_call_id); //sprintf(msg_to_skype, "SET CALL %s STATUS FINISHED", p->skype_call_id); sprintf(msg_to_skype, "ALTER CALL %s HANGUP", p->skype_call_id); skypiax_skype_write(p, msg_to_skype); } - while (p->interface_state != AST_STATE_DOWN) { + while (p->interface_state != SKYPIAX_STATE_DOWN) { usleep(10000); } DEBUGA_SKYPE("Now is really DOWN\n", SKYPIAX_P_LOG); @@ -434,7 +434,7 @@ } p->controldev_thread = AST_PTHREADT_NULL; - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; p->skype_callflow = CALLFLOW_CALL_IDLE; DEBUGA_PBX("I'll send AST_CONTROL_HANGUP\n", SKYPIAX_P_LOG); @@ -454,7 +454,7 @@ /* our channel has no more this skypiax pvt interface to manage */ c->tech_pvt = NULL; /* set the channel state to DOWN, eg. available, not in active use */ - if (ast_setstate(c, AST_STATE_DOWN)) { + if (ast_setstate(c, SKYPIAX_STATE_DOWN)) { ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); @@ -490,11 +490,11 @@ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } /* whle ringing, we just wait, the skype thread will answer */ - while (p->interface_state == AST_STATE_RING) { + while (p->interface_state == SKYPIAX_STATE_RING) { usleep(10000); //10msec } - if (p->interface_state != AST_STATE_UP) { - ERRORA("call answering failed\n", SKYPIAX_P_LOG); + if (p->interface_state != SKYPIAX_STATE_UP) { + ERRORA("call answering failed, we want it to be into interface_state=%d, got %d\n", SKYPIAX_P_LOG, SKYPIAX_STATE_UP, p->interface_state); res = -1; } else { if (option_debug) @@ -603,7 +603,7 @@ f.delivery.tv_usec = 0; /* if the call is not active (ie: answered), do not send audio frames, they would pile up in a lag queue */ - if (p->owner && p->owner->_state != AST_STATE_UP) { + if (p->owner && p->owner->_state != SKYPIAX_STATE_UP) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -652,8 +652,8 @@ if (option_debug > 10) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } - if ((c->_state != AST_STATE_DOWN) - && (c->_state != AST_STATE_RESERVED)) { + if ((c->_state != SKYPIAX_STATE_DOWN) + && (c->_state != SKYPIAX_STATE_RESERVED)) { ERRORA("skypiax_call called on %s, neither down nor reserved\n", SKYPIAX_P_LOG, c->name); if (option_debug > 10) { @@ -697,7 +697,7 @@ DEBUGA_PBX("skypiax_call dialed idest: %s, timeout: %d, dstr: %s!\n", SKYPIAX_P_LOG, idest, timeout, dstr); - ast_setstate(p->owner, AST_STATE_DIALING); + ast_setstate(p->owner, SKYPIAX_STATE_DIALING); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -732,7 +732,7 @@ if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } - if (p->owner && p->owner->_state != AST_STATE_UP) { + if (p->owner && p->owner->_state != SKYPIAX_STATE_UP) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -862,7 +862,7 @@ return NULL; } /* if the requested state is different from DOWN, let the pbx manage this interface (now part of the newly created channel) */ - if (state != AST_STATE_DOWN) { + if (state != SKYPIAX_STATE_DOWN) { DEBUGA_PBX("Try to start PBX on %s, state=%d\n", SKYPIAX_P_LOG, tmp->name, state); if (ast_pbx_start(tmp)) { ERRORA("Unable to start PBX on %s\n", SKYPIAX_P_LOG, tmp->name); @@ -1422,7 +1422,7 @@ free(tmp); return NULL; } - res = pipe(tmp->AsteriskHandlesAst.fdesc); + res = pipe(tmp->SkypiaxHandles.fdesc); if (res) { ast_log(LOG_ERROR, "Unable to create skype pipe\n"); if (option_debug > 10) { @@ -1431,9 +1431,10 @@ free(tmp); return NULL; } - fcntl(tmp->AsteriskHandlesAst.fdesc[0], F_SETFL, O_NONBLOCK); - fcntl(tmp->AsteriskHandlesAst.fdesc[1], F_SETFL, O_NONBLOCK); + 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) { if (option_debug > 1) ast_log(LOG_DEBUG, "TO BE started skype_thread=%lu STOP=%lu NULL=%lu\n", @@ -1441,7 +1442,7 @@ (unsigned long) AST_PTHREADT_NULL); #ifdef __CYGWIN__ if (ast_pthread_create - (&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->AsteriskHandlesAst) < 0) { + (&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->SkypiaxHandles) < 0) { ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); @@ -1452,7 +1453,7 @@ #else /* __CYGWIN__ */ #ifdef WANT_SKYPE_X11 if (option_debug > 1) - ast_log(LOG_DEBUG, "AsteriskHandlesfd: %d\n", tmp->AsteriskHandlesAst.fdesc[1]); + ast_log(LOG_DEBUG, "AsteriskHandlesfd: %d\n", tmp->SkypiaxHandles.fdesc[1]); if (ast_pthread_create(&tmp->skype_thread, NULL, do_skypeapi_thread, tmp) < 0) { ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); if (option_debug > 10) { @@ -1478,6 +1479,57 @@ (unsigned long) AST_PTHREADT_NULL); } + +#if 0 + if (tmp->skype) { +#if 0 + if (option_debug > 1) + ast_log(LOG_DEBUG, "TO BE started skype_thread=%lu STOP=%lu NULL=%lu\n", + (unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, + (unsigned long) AST_PTHREADT_NULL); +#endif +#ifdef __CYGWIN__ + if (ast_pthread_create + (&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->SkypiaxHandles) < 0) { + ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } +#else /* __CYGWIN__ */ +#ifdef WANT_SKYPE_X11 + if (ast_pthread_create(&tmp->signaling_thread, NULL, do_signaling_thread_fnc, 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); + } + free(tmp); + return NULL; + } +#endif /* WANT_SKYPE_X11 */ +#endif /* __CYGWIN__ */ + usleep(100000); //0.1 sec + if( tmp->skype_thread == AST_PTHREADT_NULL){ + ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } + if (option_debug > 1) + ast_log(LOG_DEBUG, "STARTED signaling_thread=%lu STOP=%lu NULL=%lu\n", + (unsigned long) tmp->signaling_thread, (unsigned long) AST_PTHREADT_STOP, + (unsigned long) AST_PTHREADT_NULL); + } + +#endif + + + + /* return the newly created skypiax_pvt */ if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); @@ -1577,14 +1629,14 @@ /* This interface needs to be watched, as it lacks an owner */ if (p->skype) { - if (FD_ISSET(p->AsteriskHandlesAst.fdesc[0], &rfds)) - ERRORA("Descriptor %d (AsteriskHandlesAst.fdesc[0]) appears twice ?\n", - SKYPIAX_P_LOG, p->AsteriskHandlesAst.fdesc[0]); - - if (p->AsteriskHandlesAst.fdesc[0] > 0) { - FD_SET(p->AsteriskHandlesAst.fdesc[0], &rfds); - if (p->AsteriskHandlesAst.fdesc[0] > max) - max = p->AsteriskHandlesAst.fdesc[0]; + if (FD_ISSET(p->SkypiaxHandles.fdesc[0], &rfds)) + ERRORA("Descriptor %d (SkypiaxHandles.fdesc[0]) appears twice ?\n", + SKYPIAX_P_LOG, p->SkypiaxHandles.fdesc[0]); + + if (p->SkypiaxHandles.fdesc[0] > 0) { + FD_SET(p->SkypiaxHandles.fdesc[0], &rfds); + if (p->SkypiaxHandles.fdesc[0] > max) + max = p->SkypiaxHandles.fdesc[0]; } } @@ -1639,12 +1691,12 @@ for (; p; p = p->next) { if (p->skype) { - if (FD_ISSET(p->AsteriskHandlesAst.fdesc[0], &rfds)) { + if (FD_ISSET(p->SkypiaxHandles.fdesc[0], &rfds)) { res = skypiax_skype_read(p); if (res == CALLFLOW_INCOMING_CALLID || res == CALLFLOW_INCOMING_RING) { //ast_log(LOG_NOTICE, "CALLFLOW_INCOMING_RING SKYPE\n"); DEBUGA_SKYPE("CALLFLOW_INCOMING_RING\n", SKYPIAX_P_LOG); - skypiax_new(p, AST_STATE_RING, p->context /* p->context */ ); + skypiax_new(p, SKYPIAX_STATE_RING, p->context /* p->context */ ); } } } @@ -2051,7 +2103,33 @@ return 0; } -int start_audio_threads(private_t *tech_pvt) { +int start_audio_threads(private_t *p) { + if (!p->tcp_srv_thread) { + if (ast_pthread_create + (&p->tcp_srv_thread, NULL, skypiax_do_tcp_srv_thread, p) < 0) { + ERRORA("Unable to start tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } else { + DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + } + } + if (!p->tcp_cli_thread) { + if (ast_pthread_create + (&p->tcp_cli_thread, NULL, skypiax_do_tcp_cli_thread, p) < 0) { + ERRORA("Unable to start tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } else { + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + } + } + + #ifdef NOTDEF switch_threadattr_t *thd_attr = NULL; @@ -2077,7 +2155,8 @@ return 0; } -int new_inbound_channel(private_t *tech_pvt) { +int new_inbound_channel(private_t *p) { + #ifdef NOTDEF switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; @@ -2113,12 +2192,12 @@ } switch_channel_mark_answered(channel); - DEBUGA_SKYPE("Here\n", SKYPIAX_P_LOG); #endif + NOTICA("Here\n", SKYPIAX_P_LOG); return 0; } -int outbound_channel_answered(private_t *tech_pvt) { +int outbound_channel_answered(private_t *p) { #ifdef NOTDEF switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; @@ -2142,12 +2221,20 @@ } switch_core_session_rwunlock(session); - DEBUGA_SKYPE("HERE!\n", SKYPIAX_P_LOG); #endif + NOTICA("HERE!\n", SKYPIAX_P_LOG); return 0; } +void * skypiax_do_tcp_srv_thread(void *obj) +{ + return skypiax_do_tcp_srv_thread_func(obj); +} +void * skypiax_do_tcp_cli_thread(void *obj) +{ + return skypiax_do_tcp_cli_thread_func(obj); +} /************************************************/ #ifdef ASTERISK_VERSION_1_4 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 Jan 31 10:07:53 2009 @@ -297,6 +297,7 @@ char skype_password[256]; char destination[256]; char session_uuid_str[512 + 1]; + pthread_t signaling_thread; }; typedef struct skypiax_pvt private_t; @@ -401,12 +402,13 @@ int new_inbound_channel(private_t *tech_pvt); int outbound_channel_answered(private_t *tech_pvt); int skypiax_skype_senddigit(struct skypiax_pvt *p, char digit); -#define SKYPIAX_STATE_DOWN 1 -#define SKYPIAX_STATE_RING 2 -#define SKYPIAX_STATE_DIALING 3 -#define SKYPIAX_STATE_BUSY 4 -#define SKYPIAX_STATE_UP 5 -#define SKYPIAX_STATE_RINGING 6 -#define SKYPIAX_STATE_PRERING 7 +#define SKYPIAX_STATE_DOWN AST_STATE_DOWN +#define SKYPIAX_STATE_RING AST_STATE_RING +#define SKYPIAX_STATE_DIALING AST_STATE_DIALING +#define SKYPIAX_STATE_BUSY AST_STATE_BUSY +#define SKYPIAX_STATE_UP AST_STATE_UP +#define SKYPIAX_STATE_RINGING AST_STATE_RINGING +#define SKYPIAX_STATE_PRERING AST_STATE_PRERING +#define SKYPIAX_STATE_RESERVED AST_STATE_RESERVED #define SKYPIAX_STATE_HANGUP_REQUESTED 200 #endif /* _SKYPIAX_H_ */ Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c Sat Jan 31 10:07:53 2009 @@ -126,8 +126,8 @@ if ((SAMPLERATE_SKYPIAX - 8000) == 0) { - 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]); + //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) { a = 0; for (i = 0; i < len / sizeof(short); i++) { @@ -933,6 +933,15 @@ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + if(!strlen(tech_pvt->X11_display)) + strcpy(tech_pvt->X11_display, getenv("DISPLAY")); + + if(!tech_pvt->tcp_srv_port) + tech_pvt->tcp_srv_port = 10160; + + if(!tech_pvt->tcp_cli_port) + tech_pvt->tcp_cli_port = 10161; + 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); @@ -1019,6 +1028,7 @@ howmany = strlen(b) + 1; howmany = write(SkypiaxHandles->fdesc[1], b, howmany); + //DEBUGA_PBX("HERE: %s\n", SKYPIAX_P_LOG, b); memset(buffer, '\0', 17000); }

1 0

[commit] r11577 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: gmaruzz Date: Sat Jan 31 07:51:01 2009 New Revision: 11577 Log: skypiax: compiles and run on asterisk (at least 1.2 series). Does nothing Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/asterisk/cyg_no_pthread_kill.c freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile Sat Jan 31 07:51:01 2009 @@ -0,0 +1,89 @@ +# +# Asterisk -- A telephony toolkit for Linux. +# +# Makefile for channel drivers +# +# Copyright (C) 1999-2005, Mark Spencer +# +# Mark Spencer <markster(a)digium.com> +# +# Edited By Belgarath <> Aug 28 2004 +# Added bare bones ultrasparc-linux support. +# +# This program is free software, distributed under the terms of +# the GNU General Public License +# + +#ASTERISK INCLUDE FILES +#The directory that contains the Asterisk include files (eg: /usr/include or /usr/include/asterisk or /usr/src/asterisk/include or ...) +#AST_INCLUDE_DIR=/usr/src/asterisk/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_trunk/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_160/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include +AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include + +#ASTERISK VERSION +#Uncomment one of the following lines to match your Asterisk series +#CFLAGS+=-DASTERISK_VERSION_1_4 +#CFLAGS+=-DASTERISK_VERSION_1_6 +CFLAGS+=-DASTERISK_VERSION_1_2 + +#LINUX SKYPE SUPPORT (Celliax for Cygwin always supports Skype) +SKYPE_LIB=-L/usr/X11R6/lib -lX11 + +CFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations +CFLAGS+=-g3 + + + +CFLAGS+=-I$(AST_INCLUDE_DIR) -I. +CFLAGS+=-D_REENTRANT -D_GNU_SOURCE +#CFLAGS+=-O6 +CFLAGS+=-march=i686 +CFLAGS+=-fomit-frame-pointer +ifeq ($(shell uname -m),x86_64) +CFLAGS+=-fPIC +endif + +SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n .)"' +CFLAGS += $(SVNDEF) + + +SOLINK=-shared -Xlinker -x +CHANNEL_LIBS=chan_skypiax.so +CC=gcc + +OSARCH=$(shell uname -s) + +ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) +# definition of pthread_kill as a printf (or as a noop) is required for Asterisk (and skypiax) to run on Cygwin +# without it, each time (often) pthread_kill is called (by any thread, with any signal, URG included), bad things happen +CC=gcc -D pthread_kill=cyg_no_pthreadkill +AST_DLL_DIR=/home/maruzz/devel/svn_asterisk_branches_12 +CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols cyg_no_pthread_kill.o +CYGSOLIB=-L/usr/lib/w32api -lrpcrt4 -L/lib/mingw -lwinmm -L$(AST_DLL_DIR) -lasterisk.dll -L$(AST_DLL_DIR)/res -lres_features.so +SKYPE_LIB= +CHANNEL_LIBS=cyg_no_pthread_kill.o chan_skypiax.so +endif + +all: $(CHANNEL_LIBS) + +clean: + rm -f *.so *.o *.so.a + + +#chan_skypiax section begins + +#to debug threads and lock on 1.4 uncomment the following +#CFLAGS+=-include /usr/src/asterisk/include/asterisk/autoconfig.h + + +cyg_no_pthread_kill.o: cyg_no_pthread_kill.c + $(CC) $(CFLAGS) -c -o cyg_no_pthread_kill.o cyg_no_pthread_kill.c +chan_skypiax.o: chan_skypiax.c + $(CC) $(CFLAGS) -c -o chan_skypiax.o chan_skypiax.c +chan_skypiax.so: chan_skypiax.o skypiax_protocol.o + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_skypiax.o skypiax_protocol.o -lm -ldl $(SKYPE_LIB) ${CYGSOLIB} +#chan_skypiax section ends + Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Sat Jan 31 07:51:01 2009 @@ -0,0 +1,2161 @@ +//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 +#include "skypiax.h" + +/* LOCKS */ +/*! \brief Protect the skypiax_usecnt */ +AST_MUTEX_DEFINE_STATIC(skypiax_usecnt_lock); +/*! \brief Protect the monitoring thread, so only one process can kill or start it, and not + * when it's doing something critical. */ +AST_MUTEX_DEFINE_STATIC(skypiax_monlock); +/*! \brief Protect the interfaces list */ +AST_MUTEX_DEFINE_STATIC(skypiax_iflock); + +/* GLOBAL VARIABLES */ +int running = 1; +char skypiax_console_active_array[50] = ""; +char *skypiax_console_active = skypiax_console_active_array; +/*! \brief Count of active channels for this module */ +int skypiax_usecnt = 0; +int skypiax_debug = 0; +/*! \brief This is the thread for the monitor which checks for input on the channels + * which are not currently in use. */ +pthread_t skypiax_monitor_thread = AST_PTHREADT_NULL; +pthread_t skypiax_monitor_audio_thread = AST_PTHREADT_NULL; + +/* CONSTANTS */ +/*! \brief Textual description for this module */ +const char skypiax_desc[] = "Skypiax, Skype Driver"; +/*! \brief Textual type for this module */ +const char skypiax_type[] = "Skypiax"; +/*! \brief Name of configuration file for this module */ +const char skypiax_config[] = "skypiax.conf"; + +char skypiax_console_skypiax_usage[] = + " \n" "chan_skypiax commands info\n" " \n" + " chan_skypiax adds to Asterisk the following CLI commands:\n" " \n" + " CLI COMMANDS:\n" " skypiax_hangup\n" " skypiax_dial\n" + " skypiax_console\n" " skypiax_playback_boost\n" + " skypiax_capture_boost\n" " skypiax_skype\n" + " skypiax_dir_import\n" "\n" + " You can type 'help [command]' to obtain more specific info on usage.\n" + " \n"; +char skypiax_console_hangup_usage[] = + "Usage: skypiax_hangup\n" + " Hangs up any call currently placed on the \"current\" skypiax_console (Skypiax) channel.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; +char skypiax_console_playback_boost_usage[] = + "Usage: skypiax_playback_boost [value]\n" + " Shows or set the value of boost applied to the outgoing sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the \"current\" skypiax_console (Skypiax) channel.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; +char skypiax_console_capture_boost_usage[] = + "Usage: skypiax_capture_boost [value]\n" + " Shows or set the value of boost applied to the incoming sound (voice). Possible values are: 0 (no boost applied), -40 to 40 (negative to positive range, in db). Without specifying a value, it just shows the current value. The value is for the \"current\" skypiax_console (Skypiax) channel.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; + +char skypiax_console_dial_usage[] = + "Usage: skypiax_dial [DTMFs]\n" + " Dials a given DTMF string in the call currently placed on the\n" + " \"current\" skypiax_console (Skypiax) channel.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; + +char skypiax_console_skypiax_console_usage[] = + "Usage: skypiax_console [interface] | [show]\n" + " If used without a parameter, displays which interface is the \"current\"\n" + " skypiax_console. If a device is specified, the \"current\" skypiax_console is changed to\n" + " the interface specified.\n" + " If the parameter is \"show\", the available interfaces are listed\n"; + +char skypiax_console_skype_usage[] = + "Usage: skypiax_skype [command string]\n" + " Send the 'command string' skype_msg to the Skype client connected to the \"current\" skypiax_console (Skypiax) channel.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; + +char skypiax_console_skypiax_dir_import_usage[] = + "Usage: skypiax_dir_import [add | replace]\n" + " Write in the directoriax.conf config file all the entries found in 'Contacts' list of the Skype client connected to the \"current\" skypiax_console.\n" + " You can choose between 'add' to the end of the directoriax.conf file, or 'replace' the whole file with this new content.\n" + " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; + +/*! \brief Definition of this channel for PBX channel registration */ +const struct ast_channel_tech skypiax_tech = { + .type = skypiax_type, + .description = skypiax_desc, + .capabilities = AST_FORMAT_SLINEAR, + .requester = skypiax_request, + .hangup = skypiax_hangup, + .answer = skypiax_answer, + .read = skypiax_read, + .call = skypiax_call, + .write = skypiax_write, + .indicate = skypiax_indicate, + .fixup = skypiax_fixup, + .devicestate = skypiax_devicestate, +#ifdef ASTERISK_VERSION_1_4 + .send_digit_begin = skypiax_senddigit_begin, + .send_digit_end = skypiax_senddigit_end, +#else /* ASTERISK_VERSION_1_4 */ + .send_digit = skypiax_senddigit, +#endif /* ASTERISK_VERSION_1_4 */ +}; + +/*! \brief fake skypiax_pvt structure values, + * just for logging purposes */ +struct skypiax_pvt skypiax_log_struct = { + .name = "none", +}; + +/*! \brief Default skypiax_pvt structure values, + * used by skypiax_mkif to initialize the interfaces */ +struct skypiax_pvt skypiax_default = { + .interface_state = AST_STATE_DOWN, + .skype_callflow = 0, + .context = "default", + .language = "en", + .exten = "s", + .next = NULL, + .owner = NULL, + .controldev_thread = AST_PTHREADT_NULL, + .skypiax_sound_rate = 8000, + .skypiax_sound_capt_fd = -1, + .capture_boost = 0, + .playback_boost = 0, + .stripmsd = 0, + .skype = 0, + .skypiax_dir_entry_extension_prefix = 6, +}; + +/*! + * \brief PVT structure for a skypiax interface (channel), created by skypiax_mkif + */ +struct skypiax_pvt *skypiax_iflist = NULL; + +struct ast_cli_entry myclis[] = { + {{"skypiax_hangup", NULL}, skypiax_console_hangup, + "Hangup a call on the skypiax_console", + skypiax_console_hangup_usage}, + {{"skypiax_playback_boost", NULL}, skypiax_console_playback_boost, "playback boost", + skypiax_console_playback_boost_usage}, + {{"skypiax_capture_boost", NULL}, skypiax_console_capture_boost, "capture boost", + skypiax_console_capture_boost_usage}, + {{"skypiax_usage", NULL}, skypiax_console_skypiax, "chan_skypiax commands info", + skypiax_console_skypiax_usage}, + {{"skypiax_skype", NULL}, skypiax_console_skype, "Skype msg", + skypiax_console_skype_usage}, + {{"skypiax_dial", NULL}, skypiax_console_dial, + "Dial an extension on the skypiax_console", + skypiax_console_dial_usage}, + {{"skypiax_console", NULL}, skypiax_console_set_active, + "Sets/displays active skypiax_console", + skypiax_console_skypiax_console_usage}, + {{"skypiax_dir_import", NULL}, skypiax_console_skypiax_dir_import, + "Write the directoriax.conf file, used by directoriax app", + skypiax_console_skypiax_dir_import_usage}, +}; + +/* IMPLEMENTATION */ + +void skypiax_unlocka_log(void *x) +{ + ast_mutex_t *y; + y = x; + int i; + + for (i = 0; i < 5; i++) { //let's be generous + + ast_log(LOG_DEBUG, + SKYPIAX_SVN_VERSION + "[%-7lx] I'm a dying thread, and I'm to go unlocking mutex %p for the %dth time\n", + (unsigned long int) pthread_self(), y, i); + + ast_mutex_unlock(y); + } + ast_log(LOG_DEBUG, + SKYPIAX_SVN_VERSION + "[%-7lx] I'm a dying thread, I've finished unlocking mutex %p\n", + (unsigned long int) pthread_self(), y); +} + +int skypiax_queue_control(struct ast_channel *c, int control) +{ + struct skypiax_pvt *p = c->tech_pvt; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } +/* queue the frame */ + if (p) + p->control_to_send = control; + else { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; + } + DEBUGA_PBX("Queued CONTROL FRAME %d\n", SKYPIAX_P_LOG, control); + +/* wait for the frame to be sent */ + while (p->control_to_send) + usleep(1); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +int skypiax_devicestate(void *data) +{ + struct skypiax_pvt *p = NULL; + char *name = data; + int res = AST_DEVICE_INVALID; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (!data) { + ERRORA("Devicestate requested with no data\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return res; + } + + /* lock the interfaces' list */ + LOKKA(&skypiax_iflock); + /* make a pointer to the first interface in the interfaces list */ + p = skypiax_iflist; + /* Search for the requested interface and verify if is unowned */ + while (p) { + size_t length = strlen(p->name); + /* is this the requested interface? */ + if (strncmp(name, p->name, length) == 0) { + /* is this interface unowned? */ + if (!p->owner) { + res = AST_DEVICE_NOT_INUSE; + DEBUGA_PBX("Interface is NOT OWNED by a channel\n", SKYPIAX_P_LOG); + } else { + /* interface owned by a channel */ + res = AST_DEVICE_INUSE; + DEBUGA_PBX("Interface is OWNED by a channel\n", SKYPIAX_P_LOG); + } + + /* we found the requested interface, bail out from the while loop */ + break; + } + /* not yet found, next please */ + p = p->next; + } + /* unlock the interfaces' list */ + UNLOCKA(&skypiax_iflock); + + if (res == AST_DEVICE_INVALID) { + ERRORA("Checking device state for interface [%s] returning AST_DEVICE_INVALID\n", + SKYPIAX_P_LOG, name); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return res; +} + +#ifndef ASTERISK_VERSION_1_4 +int skypiax_indicate(struct ast_channel *c, int cond) +#else +int skypiax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen) +#endif +{ + struct skypiax_pvt *p = c->tech_pvt; + int res = 0; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + NOTICA("Let's INDICATE %d\n", SKYPIAX_P_LOG, cond); + + switch (cond) { + case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: + case AST_CONTROL_RINGING: + case -1: + res = -1; /* Ask for inband indications */ + break; + case AST_CONTROL_PROGRESS: + case AST_CONTROL_PROCEEDING: + case AST_CONTROL_VIDUPDATE: + case AST_CONTROL_HOLD: + case AST_CONTROL_UNHOLD: +#ifdef ASTERISK_VERSION_1_4 + case AST_CONTROL_SRCUPDATE: +#endif /* ASTERISK_VERSION_1_4 */ + break; + default: + WARNINGA("Don't know how to display condition %d on %s\n", SKYPIAX_P_LOG, cond, + c->name); + /* The core will play inband indications for us if appropriate */ + res = -1; + } + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return res; +} + +/*! \brief PBX interface function -build skypiax pvt structure + * skypiax calls initiated by the PBX arrive here */ +struct ast_channel *skypiax_request(const char *type, int format, void *data, int *cause) +{ + struct skypiax_pvt *p = NULL; + struct ast_channel *tmp = NULL; + char *name = data; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + DEBUGA_PBX("Try to request type: %s, name: %s, cause: %d," " format: %d\n", + SKYPIAX_P_LOG, type, name, *cause, format); + + if (!data) { + ERRORA("Channel requested with no data\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + + /* lock the interfaces' list */ + LOKKA(&skypiax_iflock); + /* make a pointer to the first interface in the interfaces list */ + p = skypiax_iflist; + /* Search for the requested interface and verify if is unowned and format compatible */ + //TODO implement groups a la chan_zap + while (p) { + size_t length = strlen(p->name); + /* is this the requested interface? */ + if (strncmp(name, p->name, length) == 0) { + /* is the requested format supported by this interface? */ + if ((format & AST_FORMAT_SLINEAR) != 0) { + /* is this interface unowned? */ + if (!p->owner) { + DEBUGA_PBX("Requesting: %s, name: %s, format: %d\n", SKYPIAX_P_LOG, type, name, + format); + /* create a new channel owning this interface */ + tmp = skypiax_new(p, AST_STATE_DOWN, p->context); + if (!tmp) { + /* the channel was not created, probable memory allocation error */ + *cause = AST_CAUSE_SWITCH_CONGESTION; + } + } else { + /* interface owned by another channel */ + WARNINGA("owned by another channel\n", SKYPIAX_P_LOG); + *cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL; + } + } else { + /* requested format not supported */ + WARNINGA("format %d not supported\n", SKYPIAX_P_LOG, format); + *cause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL; + } + /* we found the requested interface, bail out from the while loop */ + break; + } + /* not yet found, next please */ + p = p->next; + } + /* unlock the interfaces' list */ + UNLOCKA(&skypiax_iflock); + /* restart the monitor so it will watch only the remaining unowned interfaces */ + skypiax_restart_monitor(); + if (tmp == NULL) { + /* new channel was not created */ + WARNINGA("Unable to create new Skypiax channel %s\n", SKYPIAX_P_LOG, name); + } + /* return the newly created channel */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return tmp; +} + +/*! \brief Hangup skypiax call + * Part of PBX interface, called from ast_hangup */ + +int skypiax_hangup(struct ast_channel *c) +{ + struct skypiax_pvt *p; + + /* get our skypiax pvt interface from channel */ + p = c->tech_pvt; + /* if there is not skypiax pvt why we are here ? */ + if (!p) { + ERRORA("Asked to hangup channel not connected\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; + } + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (p->skype && p->interface_state != AST_STATE_DOWN) { + char msg_to_skype[1024]; + p->interface_state = AST_STATE_HANGUP_REQUESTED; + DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPIAX_P_LOG, p->skype_call_id); + //sprintf(msg_to_skype, "SET CALL %s STATUS FINISHED", p->skype_call_id); + sprintf(msg_to_skype, "ALTER CALL %s HANGUP", p->skype_call_id); + skypiax_skype_write(p, msg_to_skype); + } + + while (p->interface_state != AST_STATE_DOWN) { + usleep(10000); + } + DEBUGA_SKYPE("Now is really DOWN\n", SKYPIAX_P_LOG); + /* shutdown the serial monitoring thread */ + if (p->controldev_thread && (p->controldev_thread != AST_PTHREADT_NULL) + && (p->controldev_thread != AST_PTHREADT_STOP)) { + if (pthread_cancel(p->controldev_thread)) { + ERRORA("controldev_thread pthread_cancel failed, maybe he killed himself?\n", + SKYPIAX_P_LOG); + } + /* push it, maybe is stuck in a select or so */ + if (pthread_kill(p->controldev_thread, SIGURG)) { + DEBUGA_SERIAL("controldev_thread pthread_kill failed, no problem\n", SKYPIAX_P_LOG); + } +#ifndef __CYGWIN__ /* under cygwin, this seems to be not reliable, get stuck at times */ + /* wait for it to die */ + if (pthread_join(p->controldev_thread, NULL)) { + ERRORA("controldev_thread pthread_join failed, BAD\n", SKYPIAX_P_LOG); + } +#else /* __CYGWIN__ */ +/* allow the serial thread to die */ + usleep(300000); //300msecs +#endif /* __CYGWIN__ */ + } + p->controldev_thread = AST_PTHREADT_NULL; + + p->interface_state = AST_STATE_DOWN; + p->skype_callflow = CALLFLOW_CALL_IDLE; + + DEBUGA_PBX("I'll send AST_CONTROL_HANGUP\n", SKYPIAX_P_LOG); + ast_queue_control(p->owner, AST_CONTROL_HANGUP); + DEBUGA_PBX("I've sent AST_CONTROL_HANGUP\n", SKYPIAX_P_LOG); + + /* subtract one to the usage count of Skypiax-type channels */ + LOKKA(&skypiax_usecnt_lock); + skypiax_usecnt--; + if (skypiax_usecnt < 0) + ERRORA("Usecnt < 0???\n", SKYPIAX_P_LOG); + UNLOCKA(&skypiax_usecnt_lock); + ast_update_use_count(); + + /* our skypiax pvt interface is no more part of a channel */ + p->owner = NULL; + /* our channel has no more this skypiax pvt interface to manage */ + c->tech_pvt = NULL; + /* set the channel state to DOWN, eg. available, not in active use */ + if (ast_setstate(c, AST_STATE_DOWN)) { + ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + if (option_debug) + DEBUGA_PBX("Hanged Up\n", SKYPIAX_P_LOG); + /* restart the monitor thread, so it can recheck which interfaces it have to watch during its loop (the interfaces that are not owned by channels) */ + if (skypiax_restart_monitor()) { + ERRORA("skypiax_restart_monitor failed, BAD\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +/*! \brief Answer incoming call, + * Part of PBX interface */ +int skypiax_answer(struct ast_channel *c) +{ + struct skypiax_pvt *p = c->tech_pvt; + int res; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + /* whle ringing, we just wait, the skype thread will answer */ + while (p->interface_state == AST_STATE_RING) { + usleep(10000); //10msec + } + if (p->interface_state != AST_STATE_UP) { + ERRORA("call answering failed\n", SKYPIAX_P_LOG); + res = -1; + } else { + if (option_debug) + DEBUGA_PBX("call answered\n", SKYPIAX_P_LOG); + res = 0; + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return res; +} + +#ifdef ASTERISK_VERSION_1_4 +int skypiax_senddigit_begin(struct ast_channel *c, char digit) +{ + struct skypiax_pvt *p = c->tech_pvt; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + DEBUGA_PBX("DIGIT BEGIN received: %c\n", SKYPIAX_P_LOG, digit); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +int skypiax_senddigit_end(struct ast_channel *c, char digit, unsigned int duration) +{ + struct skypiax_pvt *p = c->tech_pvt; + char msg_to_skype[1024]; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + NOTICA("DIGIT END received: %c %d\n", SKYPIAX_P_LOG, digit, duration); + + sprintf(msg_to_skype, "SET CALL %s DTMF %c", p->skype_call_id, digit); + + skypiax_skype_write(p, msg_to_skype); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} +#else /* ASTERISK_VERSION_1_4 */ +int skypiax_senddigit(struct ast_channel *c, char digit) +{ + struct skypiax_pvt *p = c->tech_pvt; + char msg_to_skype[1024]; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + NOTICA("DIGIT received: %c\n", SKYPIAX_P_LOG, digit); + + sprintf(msg_to_skype, "SET CALL %s DTMF %c", p->skype_call_id, digit); + + skypiax_skype_write(p, msg_to_skype); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +#endif /* ASTERISK_VERSION_1_4 */ +//struct ast_frame *skypiax_skypeaudio_read(struct skypiax_pvt *p) +//#define SAMPLES_PER_FRAME 160 +/*! \brief Read audio frames from channel */ +struct ast_frame *skypiax_read(struct ast_channel *c) +{ + struct skypiax_pvt *p = c->tech_pvt; + static struct ast_frame f; + static short __buf[SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2]; + short *buf; + int samples; + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + +/* if there are control frames queued to be sent by skypiax_queue_control, send it the first */ +//TODO maybe better a real queue? + if (p && p->owner && p->control_to_send) { + ast_queue_control(p->owner, p->control_to_send); + DEBUGA_PBX("Sent CONTROL FRAME %d\n", SKYPIAX_P_LOG, p->control_to_send); + p->control_to_send = 0; + } + + memset(__buf, '\0', (SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2)); + + buf = __buf + AST_FRIENDLY_OFFSET / 2; + + f.frametype = AST_FRAME_NULL; + f.subclass = 0; + f.samples = 0; + f.datalen = 0; + f.data = NULL; + f.offset = 0; + f.src = skypiax_type; + f.mallocd = 0; + f.delivery.tv_sec = 0; + f.delivery.tv_usec = 0; + +/* if the call is not active (ie: answered), do not send audio frames, they would pile up in a lag queue */ + if (p->owner && p->owner->_state != AST_STATE_UP) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return &f; + } + + 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; + + if (p->capture_boost) + skypiax_sound_boost(&f, p->capture_boost); + } + + if (option_debug > 100) { + DEBUGA_SOUND("samples=%d\n", SKYPIAX_P_LOG, samples); + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return &f; +} + +/*! \brief Initiate skypiax call from PBX + * used from the dial() application + */ +int skypiax_call(struct ast_channel *c, char *idest, int timeout) +{ + struct skypiax_pvt *p = NULL; + p = c->tech_pvt; + char rdest[80], *where, dstr[100] = ""; + char *stringp = NULL; + int status; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if ((c->_state != AST_STATE_DOWN) + && (c->_state != AST_STATE_RESERVED)) { + ERRORA("skypiax_call called on %s, neither down nor reserved\n", SKYPIAX_P_LOG, + c->name); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + if (option_debug > 1) + DEBUGA_PBX("skypiax_call to call idest: %s, timeout: %d!\n", SKYPIAX_P_LOG, idest, + timeout); + + strncpy(rdest, idest, sizeof(rdest) - 1); + stringp = rdest; + strsep(&stringp, "/"); + where = strsep(&stringp, "/"); + if (!where) { + ERRORA("Destination %s requires an actual destination (Skypiax/device/destination)\n", + SKYPIAX_P_LOG, idest); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + strncpy(dstr, where + p->stripmsd, sizeof(dstr) - 1); + if (option_debug > 1) + DEBUGA_PBX("skypiax_call dialing idest: %s, timeout: %d, dstr: %s!\n", SKYPIAX_P_LOG, + idest, timeout, dstr); + + status = skypiax_skype_call(p, dstr, timeout); + if (status) { + WARNINGA("skypiax_call dialing failed: %d!\n", SKYPIAX_P_LOG, status); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + if (option_debug > 1) + DEBUGA_PBX("skypiax_call dialed idest: %s, timeout: %d, dstr: %s!\n", SKYPIAX_P_LOG, + idest, timeout, dstr); + + ast_setstate(p->owner, AST_STATE_DIALING); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +int skypiax_sound_boost(struct ast_frame *f, double boost) +{ +/* LUIGI RIZZO's magic */ + if (boost != 0) { /* scale and clip values */ + int i, x; + int16_t *ptr = (int16_t *) f->data; + for (i = 0; i < f->samples; i++) { + x = (ptr[i] * boost) / BOOST_SCALE; + if (x > 32767) { + x = 32767; + } else if (x < -32768) { + x = -32768; + } + ptr[i] = x; + } + } + return 0; +} + +/*! \brief Send audio frame to channel */ +int skypiax_write(struct ast_channel *c, struct ast_frame *f) +{ + struct skypiax_pvt *p = c->tech_pvt; + int sent; + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (p->owner && p->owner->_state != AST_STATE_UP) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; + } + if (p->playback_boost) + skypiax_sound_boost(f, p->playback_boost); + + sent = write(p->audioskypepipe[1], (short *) f->data, f->datalen); + //skypiax_sound_write(p, f); + + if (option_debug > 100) { + DEBUGA_SOUND("sent=%d\n", SKYPIAX_P_LOG, sent); + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +/*! \brief Fix up a channel: If a channel is consumed, this is called. + * Basically update any ->owner links */ +int skypiax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) +{ + struct skypiax_pvt *p = newchan->tech_pvt; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (!p) { + ERRORA("No pvt after masquerade. Strange things may happen\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + if (p->owner != oldchan) { + ERRORA("old channel wasn't %p but was %p\n", SKYPIAX_P_LOG, oldchan, p->owner); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + + p->owner = newchan; + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +struct ast_channel *skypiax_new(struct skypiax_pvt *p, int state, char *context) +{ + struct ast_channel *tmp; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + /* alloc a generic channel struct */ +#ifndef ASTERISK_VERSION_1_4 + tmp = ast_channel_alloc(1); +#else + //tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, ""); + //tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, i->amaflags, "Skypiax/%s", p->name); + tmp = + ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "Skypiax/%s", p->name); + +#endif /* ASTERISK_VERSION_1_4 */ + if (tmp) { + + /* give a name to the newly created channel */ +#ifndef ASTERISK_VERSION_1_4 + snprintf(tmp->name, sizeof(tmp->name), "Skypiax/%s", p->name); + tmp->type = skypiax_type; +#else /* ASTERISK_VERSION_1_4 */ + ast_string_field_build(tmp, name, "Skypiax/%s", p->name); +#endif /* ASTERISK_VERSION_1_4 */ + + DEBUGA_PBX("new channel: name=%s requested_state=%d\n", SKYPIAX_P_LOG, tmp->name, + state); + + /* fd for the channel to poll for incoming audio */ + tmp->fds[0] = p->skypiax_sound_capt_fd; + + /* audio formats managed */ + tmp->nativeformats = AST_FORMAT_SLINEAR; + tmp->readformat = AST_FORMAT_SLINEAR; + tmp->writeformat = AST_FORMAT_SLINEAR; + /* the technology description (eg. the interface type) of the newly created channel is the Skypiax's one */ + tmp->tech = &skypiax_tech; + /* the technology pvt (eg. the interface) of the newly created channel is this interface pvt */ + tmp->tech_pvt = p; + + /* copy this interface default context, extension, language to the newly created channel */ + if (strlen(p->context)) + strncpy(tmp->context, p->context, sizeof(tmp->context) - 1); + if (strlen(p->exten)) + strncpy(tmp->exten, p->exten, sizeof(tmp->exten) - 1); +#ifndef ASTERISK_VERSION_1_4 + if (strlen(p->language)) + strncpy(tmp->language, p->language, sizeof(tmp->language) - 1); +#else + if (strlen(p->language)) + ast_string_field_set(tmp, language, p->language); +#endif /* ASTERISK_VERSION_1_4 */ + /* copy the requested context (not necessarily the interface default) to the newly created channel */ + if (strlen(context)) + strncpy(tmp->context, context, sizeof(tmp->context) - 1); + + /* copy this interface default callerid in the newly created channel */ + ast_set_callerid(tmp, !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL, + !ast_strlen_zero(p->callid_name) ? p->callid_name : NULL, + !ast_strlen_zero(p->callid_number) ? p->callid_number : NULL); + + DEBUGA_PBX("callid_number=%s, callid_name=%s\n", SKYPIAX_P_LOG, p->callid_number, + p->callid_name); + + /* the owner of this interface pvt is the newly created channel */ + p->owner = tmp; + /* set the newly created channel state to the requested state */ + if (ast_setstate(tmp, state)) { + ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG); + //ast_dsp_free(p->dsp); + ast_channel_free(tmp); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + /* if the requested state is different from DOWN, let the pbx manage this interface (now part of the newly created channel) */ + if (state != AST_STATE_DOWN) { + DEBUGA_PBX("Try to start PBX on %s, state=%d\n", SKYPIAX_P_LOG, tmp->name, state); + if (ast_pbx_start(tmp)) { + ERRORA("Unable to start PBX on %s\n", SKYPIAX_P_LOG, tmp->name); + ast_channel_free(tmp); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + } + /* let's start the serial monitoring thread too, so we can have serial signaling */ + if (ast_pthread_create(&p->controldev_thread, NULL, skypiax_do_controldev_thread, p) < + 0) { + ERRORA("Unable to start controldev thread.\n", SKYPIAX_P_LOG); + ast_channel_free(tmp); + tmp = NULL; + } + DEBUGA_SERIAL("STARTED controldev_thread=%lu STOP=%lu NULL=%lu\n", SKYPIAX_P_LOG, + (unsigned long) p->controldev_thread, (unsigned long) AST_PTHREADT_STOP, + (unsigned long) AST_PTHREADT_NULL); + + /* add one to the usage count of Skypiax-type channels */ + LOKKA(&skypiax_usecnt_lock); + skypiax_usecnt++; + UNLOCKA(&skypiax_usecnt_lock); + ast_update_use_count(); + + /* return the newly created channel */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return tmp; + } + ERRORA("failed memory allocation for Skypiax channel\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; +} + +/*! + * \brief Load the module into Asterisk and start its threads + * + * This function register the module into Asterisk, + * create the interfaces for the channels, + * start the auxiliary threads for the interfaces, + * then start a monitor thread. The monitor thread + * will signal Asterisk when an interface receive a call. + * + * + * \return zero on success, -1 on error. + */ +int load_module(void) +{ + int i; + struct ast_config *cfg; + struct skypiax_pvt *tmp; + struct skypiax_pvt *p = NULL; +#ifdef ASTERISK_VERSION_1_6 + struct ast_flags config_flags = { 0 }; +#endif /* ASTERISK_VERSION_1_6 */ + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + ast_log(LOG_DEBUG, "ENTERING FUNC\n"); + } +#if defined(WANT_SKYPE_X11) || defined(__CYGWIN__) +#ifndef __CYGWIN__ + if (!XInitThreads()) + ast_log(LOG_ERROR, "Not initialized XInitThreads!\n"); +#endif /* __CYGWIN__ */ +#if 0 + ast_register_atexit(skypiax_skype_disconnect); + ast_register_application(skype2skypiaxapp, skype2skypiax, skype2skypiaxsynopsis, + skype2skypiaxdescrip); + ast_register_application(skypiax2skypeapp, skypiax2skype, skypiax2skypesynopsis, + skypiax2skypedescrip); +#endif +#endif /* defined(WANT_SKYPE_X11) || defined(__CYGWIN__) */ + + /* make sure we can register our channel type with Asterisk */ + i = ast_channel_register(&skypiax_tech); + if (i < 0) { + ERRORA("Unable to register channel type '%s'\n", SKYPIAX_P_LOG, skypiax_type); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + /* load skypiax.conf config file */ +#ifdef ASTERISK_VERSION_1_6 + cfg = ast_config_load(skypiax_config, config_flags); +#else + cfg = ast_config_load(skypiax_config); +#endif /* ASTERISK_VERSION_1_6 */ + if (cfg != NULL) { + char *ctg = NULL; + int is_first_category = 1; + while ((ctg = ast_category_browse(cfg, ctg)) != NULL) { + /* create one interface for each category in skypiax.conf config file, first one set the defaults */ + tmp = skypiax_mkif(cfg, ctg, is_first_category); + if (tmp) { + DEBUGA_PBX + ("Created channel Skypiax: skypiax.conf category '[%s]', channel name '%s'" + "\n", SKYPIAX_P_LOG, ctg, tmp->name); + /* add interface to skypiax_iflist */ + tmp->next = skypiax_iflist; + skypiax_iflist = tmp; + /* next one will not be the first ;) */ + if (is_first_category == 1) { + is_first_category = 0; + skypiax_console_active = tmp->name; + } + } else { + ERRORA("Unable to create channel Skypiax from skypiax.conf category '[%s]'\n", + SKYPIAX_P_LOG, ctg); + /* if error, unload config from memory and return */ + ast_config_destroy(cfg); + ast_channel_unregister(&skypiax_tech); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + /* do it for each category described in config */ + } + + /* we finished, unload config from memory */ + ast_config_destroy(cfg); + } else { + ERRORA("Unable to load skypiax_config skypiax.conf\n", SKYPIAX_P_LOG); + ast_channel_unregister(&skypiax_tech); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } +#ifndef ASTERISK_VERSION_1_6 + ast_cli_register_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry)); +#endif /* ASTERISK_VERSION_1_6 */ + /* start to monitor the interfaces (skypiax_iflist) for the first time */ + if (skypiax_restart_monitor()) { + ERRORA("skypiax_restart_monitor failed, BAD\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +/*! + * \brief Unload the module from Asterisk and shutdown its threads + * + * This function unregister the module from Asterisk, + * destroy the interfaces for the channels, + * shutdown the auxiliary threads for the interfaces, + * then shutdown its monitor thread. + * + * \return zero on success, -1 on error. + */ +int unload_module(void) +{ + struct skypiax_pvt *p = NULL, *p2 = NULL; + int res; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + /* unregister our channel type with Asterisk */ + ast_channel_unregister(&skypiax_tech); + ast_cli_unregister_multiple(myclis, sizeof(myclis) / sizeof(struct ast_cli_entry)); + +#if defined(WANT_SKYPE_X11) || defined(__CYGWIN__) +#ifndef __CYGWIN__ + //FIXME what to do? if (!XInitThreads()) + //FIXME what to do? ast_log(LOG_ERROR, "Not initialized XInitThreads!\n"); +#endif /* __CYGWIN__ */ +#if 0 + ast_unregister_atexit(skypiax_skype_disconnect); + ast_unregister_application(skype2skypiaxapp); + ast_unregister_application(skypiax2skypeapp); +#endif +#endif /* defined(WANT_SKYPE_X11) || defined(__CYGWIN__) */ + + /* lock the skypiax_monlock, kill the monitor thread, unlock the skypiax_monlock */ + LOKKA(&skypiax_monlock); + if (skypiax_monitor_thread && (skypiax_monitor_thread != AST_PTHREADT_NULL) + && (skypiax_monitor_thread != AST_PTHREADT_STOP)) { + if (pthread_cancel(skypiax_monitor_thread)) { + ERRORA("pthread_cancel failed, BAD\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + if (pthread_kill(skypiax_monitor_thread, SIGURG)) { + DEBUGA_PBX("pthread_kill failed\n", SKYPIAX_P_LOG); //maybe it just died + } +#ifndef __CYGWIN__ /* under cygwin, this seems to be not reliable, get stuck at times */ + if (pthread_join(skypiax_monitor_thread, NULL)) { + ERRORA("pthread_join failed, BAD\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } +#endif /* __CYGWIN__ */ + } + skypiax_monitor_thread = AST_PTHREADT_STOP; + UNLOCKA(&skypiax_monlock); + + if (skypiax_monitor_audio_thread && (skypiax_monitor_audio_thread != AST_PTHREADT_NULL) + && (skypiax_monitor_audio_thread != AST_PTHREADT_STOP)) { + + if (pthread_cancel(skypiax_monitor_audio_thread)) { + ERRORA("pthread_cancel skypiax_monitor_audio_thread failed, BAD\n", SKYPIAX_P_LOG); + } + if (pthread_kill(skypiax_monitor_audio_thread, SIGURG)) { + DEBUGA_PBX("pthread_kill skypiax_monitor_audio_thread failed, no problem\n", SKYPIAX_P_LOG); //maybe it just died + } + + if (pthread_join(skypiax_monitor_audio_thread, NULL)) { + ERRORA("pthread_join failed, BAD\n", SKYPIAX_P_LOG); + } + } + /* lock the skypiax_iflock, and go through the interfaces list (skypiax_iflist) */ + LOKKA(&skypiax_iflock); + p = skypiax_iflist; + while (p) { + /* for each interface in list */ + p2 = p->next; + /* shutdown the sound system, close sound fds, and if exist shutdown the sound managing threads */ + DEBUGA_SOUND("shutting down sound\n", SKYPIAX_P_LOG); + res = skypiax_sound_shutdown(p); + if (res == -1) { + ERRORA("Failed to shutdown sound\n", SKYPIAX_P_LOG); + } +#if 0 + /* if a dsp struct has been allocated, free it */ + if (p->dsp) { + ast_dsp_free(p->dsp); + p->dsp = NULL; + } +#endif + DEBUGA_PBX("freeing PVT\n", SKYPIAX_P_LOG); + /* free the pvt allocated memory */ + free(p); + /* next one, please */ + p = p2; + } + /* finished with the interfaces list, unlock the skypiax_iflock */ + UNLOCKA(&skypiax_iflock); + +#ifdef __CYGWIN__ + NOTICA("Sleping 5 secs, please wait...\n", SKYPIAX_P_LOG); + sleep(5); /* without this pause, for some unknown (to me) reason it crashes on cygwin */ +#endif /* __CYGWIN__ */ + NOTICA("Unloaded Skypiax Module\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +/*! + * \brief Return the count of active channels for this module + * + * \return the count of active channels for this module + */ +int usecount() +{ + int res; + static struct skypiax_pvt *p = &skypiax_log_struct; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } +/* lock the skypiax_usecnt lock */ + LOKKA(&skypiax_usecnt_lock); + /* retrieve the skypiax_usecnt */ + res = skypiax_usecnt; +/* unlock the skypiax_usecnt lock */ + UNLOCKA(&skypiax_usecnt_lock); + /* return the skypiax_usecnt */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return res; +} + +/*! + * \brief Return the textual description of the module + * + * \return the textual description of the module + */ +char *description() +{ + static struct skypiax_pvt *p = &skypiax_log_struct; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return (char *) skypiax_desc; +} + +/*! + * \brief Return the ASTERISK_GPL_KEY + * + * \return the ASTERISK_GPL_KEY + */ +char *key() +{ + struct skypiax_pvt *p = NULL; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + if (option_debug) + NOTICA("Returning Key\n", SKYPIAX_P_LOG); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return ASTERISK_GPL_KEY; +} + +/*! + * \brief Create and initialize one interface for the module + * \param cfg pointer to configuration data from skypiax.conf + * \param ctg pointer to a category name to be found in cfg + * \param is_first_category is this the first category in cfg + * + * This function create and initialize one interface for the module + * + * \return a pointer to the PVT structure of interface on success, NULL on error. + */ +struct skypiax_pvt *skypiax_mkif(struct ast_config *cfg, char *ctg, int is_first_category) +{ + struct skypiax_pvt *tmp; + struct ast_variable *v; + int res; + + int debug_all = 0; + int debug_at = 0; + int debug_fbus2 = 0; + int debug_serial = 0; + int debug_sound = 0; + int debug_pbx = 0; + int debug_skype = 0; + int debug_call = 0; + int debug_locks = 0; + int debug_monitorlocks = 0; + + ast_log(LOG_DEBUG, "ENTERING FUNC\n"); + /* alloc memory for PVT */ + tmp = malloc(sizeof(struct skypiax_pvt)); + if (tmp == NULL) { /* fail */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + ast_log(LOG_DEBUG, "EXITING FUNC\n"); + } + return NULL; + } + /* clear memory for PVT */ + memset(tmp, 0, sizeof(struct skypiax_pvt)); + + /* if we are reading the "first" category of the config file, take SELECTED values as defaults, overriding the values in skypiax_default */ + if (is_first_category == 1) { + /* for each variable in category, copy it in the skypiax_default struct */ + for (v = ast_variable_browse(cfg, ctg); v; v = v->next) { + M_START(v->name, v->value); + + M_STR("context", skypiax_default.context) + M_STR("language", skypiax_default.language) + M_STR("extension", skypiax_default.exten) + M_F("playback_boost", + skypiax_store_boost(v->value, &skypiax_default.playback_boost)) + M_F("capture_boost", + skypiax_store_boost(v->value, &skypiax_default.capture_boost)) + M_UINT("skypiax_dir_entry_extension_prefix", + skypiax_default.skypiax_dir_entry_extension_prefix) + M_END(;); + } + } + + /* initialize the newly created PVT from the skypiax_default values */ + *tmp = skypiax_default; + + /* the category name becomes the interface name */ + tmp->name = strdup(ctg); + + /* for each category in config file, "first" included, read in ALL the values */ + for (v = ast_variable_browse(cfg, ctg); v; v = v->next) { + M_START(v->name, v->value); + + M_BOOL("debug_all", debug_all) + M_BOOL("debug_at", debug_at) + M_BOOL("debug_fbus2", debug_fbus2) + M_BOOL("debug_serial", debug_serial) + M_BOOL("debug_sound", debug_sound) + M_BOOL("debug_pbx", debug_pbx) + M_BOOL("debug_skype", debug_skype) + M_BOOL("debug_call", debug_call) + M_BOOL("debug_locks", debug_locks) + M_BOOL("debug_monitorlocks", debug_monitorlocks) + M_BOOL("skype", tmp->skype) + M_STR("context", tmp->context) + M_STR("language", tmp->language) + M_STR("extension", tmp->exten) + 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_UINT("skypiax_dir_entry_extension_prefix", + tmp->skypiax_dir_entry_extension_prefix) + M_END(;); + } + + if (debug_all) { + skypiax_debug = skypiax_debug | DEBUG_ALL; + if (!option_debug) { + WARNINGA + ("DEBUG_ALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_ALL debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_ALL activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_fbus2) { + skypiax_debug = skypiax_debug | DEBUG_FBUS2; + if (!option_debug) { + WARNINGA + ("DEBUG_FBUS2 activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_FBUS2 debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_FBUS2 activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_serial) { + skypiax_debug = skypiax_debug | DEBUG_SERIAL; + if (!option_debug) { + WARNINGA + ("DEBUG_SERIAL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SERIAL debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_SERIAL activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_sound) { + skypiax_debug = skypiax_debug | DEBUG_SOUND; + if (!option_debug) { + WARNINGA + ("DEBUG_SOUND activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SOUND debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_SOUND activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_pbx) { + skypiax_debug = skypiax_debug | DEBUG_PBX; + if (!option_debug) { + WARNINGA + ("DEBUG_PBX activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_PBX debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_PBX activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_skype) { + skypiax_debug = skypiax_debug | DEBUG_SKYPE; + if (!option_debug) { + WARNINGA + ("DEBUG_SKYPE activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_SKYPE debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_SKYPE activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_call) { + skypiax_debug = skypiax_debug | DEBUG_CALL; + if (!option_debug) { + WARNINGA + ("DEBUG_CALL activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_CALL debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_CALL activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_locks) { + skypiax_debug = skypiax_debug | DEBUG_LOCKS; + if (!option_debug) { + WARNINGA + ("DEBUG_LOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_LOCKS debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_LOCKS activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (debug_monitorlocks) { + skypiax_debug = skypiax_debug | DEBUG_MONITORLOCKS; + if (!option_debug) { + WARNINGA + ("DEBUG_MONITORLOCKS activated, but option_debug is 0. You have to set debug level higher than zero to see some debugging output. Please use the command \"set debug 10\" or start Asterisk with \"-dddddddddd\" option for full DEBUG_MONITORLOCKS debugging output.\n", + SKYPIAX_TMP_LOG); + } else { + NOTICA("DEBUG_MONITORLOCKS activated. \n", SKYPIAX_TMP_LOG); + } + } + + if (option_debug > 1) { + DEBUGA_SOUND("playback_boost is %f\n", SKYPIAX_TMP_LOG, tmp->playback_boost); + DEBUGA_SOUND("capture_boost is %f\n", SKYPIAX_TMP_LOG, tmp->capture_boost); + } + /* if skype is true for this interface, let's check if another interface has skype true */ + if (tmp->skype) { + struct skypiax_pvt *p = NULL, *p2 = NULL; + /* lock the skypiax_iflock, maybe unneeded */ + LOKKA(&skypiax_iflock); + p = skypiax_iflist; + /* for each pvt in the interfaces list (skypiax_iflist) */ + while (p) { + p2 = p->next; + /* if another interface has skype true */ + if (p->skype) { + ERRORA + ("This interface (category '[%s]') has 'skype=yes' in config, but up in skypiax.conf config file the interface category '[%s]' has yet 'skype=yes'. Only one interface at time can support skype. I'm sure, I wrote it ;). Setting 'skype=no' for interface category '[%s] and continuing\n", + SKYPIAX_P_LOG, tmp->name, p->name, tmp->name); + /* set this interface's skype to false */ + tmp->skype = 0; + } + /* next interface, please */ + p = p2; + } + /* unlock the skypiax_iflock */ + UNLOCKA(&skypiax_iflock); + } +/* initialize the soundcard channels (input and output) used by this interface (a multichannel soundcard can be used by multiple interfaces), optionally starting the sound managing threads */ + res = skypiax_sound_init(tmp); + if (res == -1) { + ERRORA("Failed initializing sound device\n", SKYPIAX_TMP_LOG); + /* we failed, free the PVT */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } + res = pipe(tmp->AsteriskHandlesAst.fdesc); + if (res) { + ast_log(LOG_ERROR, "Unable to create skype pipe\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } + fcntl(tmp->AsteriskHandlesAst.fdesc[0], F_SETFL, O_NONBLOCK); + fcntl(tmp->AsteriskHandlesAst.fdesc[1], F_SETFL, O_NONBLOCK); + tmp->skype_thread = AST_PTHREADT_NULL; + if (tmp->skype) { + if (option_debug > 1) + ast_log(LOG_DEBUG, "TO BE started skype_thread=%lu STOP=%lu NULL=%lu\n", + (unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, + (unsigned long) AST_PTHREADT_NULL); +#ifdef __CYGWIN__ + if (ast_pthread_create + (&tmp->skype_thread, NULL, do_skypeapi_thread, &tmp->AsteriskHandlesAst) < 0) { + ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } +#else /* __CYGWIN__ */ +#ifdef WANT_SKYPE_X11 + if (option_debug > 1) + ast_log(LOG_DEBUG, "AsteriskHandlesfd: %d\n", tmp->AsteriskHandlesAst.fdesc[1]); + if (ast_pthread_create(&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); + } + free(tmp); + return NULL; + } +#endif /* WANT_SKYPE_X11 */ +#endif /* __CYGWIN__ */ + usleep(100000); //0.1 sec + if( tmp->skype_thread == AST_PTHREADT_NULL){ + ast_log(LOG_ERROR, "Unable to start skype_main thread.\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + free(tmp); + return NULL; + } + if (option_debug > 1) + ast_log(LOG_DEBUG, "STARTED skype_thread=%lu STOP=%lu NULL=%lu\n", + (unsigned long) tmp->skype_thread, (unsigned long) AST_PTHREADT_STOP, + (unsigned long) AST_PTHREADT_NULL); + } + + /* return the newly created skypiax_pvt */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_TMP_LOG); + } + return tmp; +} + +/*! \brief (Re)Start the module main monitor thread, watching for incoming calls on the interfaces */ +int skypiax_restart_monitor(void) +{ + static struct skypiax_pvt *p = &skypiax_log_struct; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + /* If we're supposed to be stopped -- stay stopped */ + if (skypiax_monitor_thread == AST_PTHREADT_STOP) { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; + } + LOKKA(&skypiax_monlock); + /* Do not seems possible to me that this function can be called by the very same monitor thread, but let's be paranoid */ + if (skypiax_monitor_thread == pthread_self()) { + UNLOCKA(&skypiax_monlock); + ERRORA("Cannot kill myself\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + /* if the monitor thread exists */ + if (skypiax_monitor_thread != AST_PTHREADT_NULL) { + /* Wake up the thread, it can be stuck waiting in a select or so */ + pthread_kill(skypiax_monitor_thread, SIGURG); + } else { + /* the monitor thread does not exists, start a new monitor */ + if (ast_pthread_create(&skypiax_monitor_thread, NULL, skypiax_do_monitor, NULL) < 0) { + UNLOCKA(&skypiax_monlock); + ERRORA("Unable to start monitor thread.\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + } + UNLOCKA(&skypiax_monlock); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +/*! \brief The skypiax monitoring thread + * \note This thread monitors all the skypiax interfaces that are not in a call + * (and thus do not have a separate thread) indefinitely + * */ +void *skypiax_do_monitor(void *data) +{ + fd_set rfds; + int res; + struct skypiax_pvt *p = NULL; + int max = -1; + struct timeval to; + time_t now_timestamp; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) { + ERRORA("Unable to set cancel type to deferred\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + + for (;;) { + pthread_testcancel(); + /* Don't let anybody kill us right away. Nobody should lock the interface list + and wait for the monitor list, but the other way around is okay. */ + PUSHA_UNLOCKA(&skypiax_monlock); + MONITORLOKKA(&skypiax_monlock); + /* Lock the interface list */ + PUSHA_UNLOCKA(&skypiax_iflock); + MONITORLOKKA(&skypiax_iflock); + /* Build the stuff we're going to select on, that is the skypiax_serial_fd of every + skypiax_pvt that does not have an associated owner channel. In the case of FBUS2 3310 + and in the case of PROTOCOL_NO_SERIAL we add the audio_fd as well, because there is not serial signaling of incoming calls */ + FD_ZERO(&rfds); + + time(&now_timestamp); + p = skypiax_iflist; + while (p) { + if (!p->owner) { + /* This interface needs to be watched, as it lacks an owner */ + + if (p->skype) { + if (FD_ISSET(p->AsteriskHandlesAst.fdesc[0], &rfds)) + ERRORA("Descriptor %d (AsteriskHandlesAst.fdesc[0]) appears twice ?\n", + SKYPIAX_P_LOG, p->AsteriskHandlesAst.fdesc[0]); + + if (p->AsteriskHandlesAst.fdesc[0] > 0) { + FD_SET(p->AsteriskHandlesAst.fdesc[0], &rfds); + if (p->AsteriskHandlesAst.fdesc[0] > max) + max = p->AsteriskHandlesAst.fdesc[0]; + + } + } + + } + /* next interface, please */ + p = p->next; + } + /* Okay, now that we know what to do, release the interface lock */ + MONITORUNLOCKA(&skypiax_iflock); + POPPA_UNLOCKA(&skypiax_iflock); + /* And from now on, we're okay to be killed, so release the monitor lock as well */ + MONITORUNLOCKA(&skypiax_monlock); + POPPA_UNLOCKA(&skypiax_monlock); + + /* you want me to die? */ + pthread_testcancel(); + + /* Wait for something to happen */ + to.tv_sec = 0; + to.tv_usec = 500000; /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */ + res = ast_select(max + 1, &rfds, NULL, NULL, &to); + + /* you want me to die? */ + pthread_testcancel(); + + /* Okay, select has finished. Let's see what happened. */ + + /* If there are errors... */ + if (res < 0) { + if (errno == EINTR) /* EINTR is just the select + being interrupted by a SIGURG, or so */ + continue; + else { + ERRORA("select returned %d: %s\n", SKYPIAX_P_LOG, res, strerror(errno)); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + } + + /* must not be killed while skypiax_iflist is locked */ + PUSHA_UNLOCKA(&skypiax_monlock); + MONITORLOKKA(&skypiax_monlock); + /* Alright, lock the interface list again, and let's look and see what has + happened */ + PUSHA_UNLOCKA(&skypiax_iflock); + MONITORLOKKA(&skypiax_iflock); + + p = skypiax_iflist; + for (; p; p = p->next) { + + if (p->skype) { + if (FD_ISSET(p->AsteriskHandlesAst.fdesc[0], &rfds)) { + res = skypiax_skype_read(p); + if (res == CALLFLOW_INCOMING_CALLID || res == CALLFLOW_INCOMING_RING) { + //ast_log(LOG_NOTICE, "CALLFLOW_INCOMING_RING SKYPE\n"); + DEBUGA_SKYPE("CALLFLOW_INCOMING_RING\n", SKYPIAX_P_LOG); + skypiax_new(p, AST_STATE_RING, p->context /* p->context */ ); + } + } + } + + } + MONITORUNLOCKA(&skypiax_iflock); + POPPA_UNLOCKA(&skypiax_iflock); + MONITORUNLOCKA(&skypiax_monlock); + POPPA_UNLOCKA(&skypiax_monlock); + pthread_testcancel(); + } +/* Never reached */ + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + +} + +/*! + * \brief Initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) + * \param p the skypiax_pvt of the interface + * + * This function initialize the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_init for ALSA, oss_init for OSS, winmm_init for Windows Multimedia, etc and return the result + * + * \return zero on success, -1 on error. + */ + +int skypiax_sound_init(struct skypiax_pvt *p) +{ + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return skypiax_skypeaudio_init(p); +} + +/*! + * \brief Shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces) + * \param p the skypiax_pvt of the interface + * + * This function shutdown the soundcard channels (input and output) used by one interface (a multichannel soundcard can be used by multiple interfaces). It simply pass its parameters to the right function for the sound system for which has been compiled, eg. alsa_shutdown for ALSA, oss_shutdown for OSS, winmm_shutdown for Windows Multimedia, etc and return the result + * + * \return zero on success, -1 on error. + */ + +int skypiax_sound_shutdown(struct skypiax_pvt *p) +{ + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + //return skypiax_portaudio_shutdown(p); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; +} + +/*! \brief Read audio frames from interface */ +struct ast_frame *skypiax_sound_read(struct skypiax_pvt *p) +{ + struct ast_frame *f = NULL; + int res; + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + res = skypiax_skypeaudio_read(p); + f = &p->read_frame; + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return f; +} + +/*! \brief Send audio frame to interface */ +int skypiax_sound_write(struct skypiax_pvt *p, struct ast_frame *f) +{ + int ret = -1; + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + ret = skypiax_skypeaudio_write(p, f); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return ret; +} + +/*! + * \brief This thread runs during a call, and monitor the interface serial port for signaling, like hangup, caller id, etc + * + */ +void *skypiax_do_controldev_thread(void *data) +{ + struct skypiax_pvt *p = data; + int res; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + DEBUGA_SERIAL("In skypiax_do_controldev_thread: started, p=%p\n", SKYPIAX_P_LOG, p); + + if (pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL)) { + ERRORA("Unable to set cancel type to deferred\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + + while (1) { + usleep(1000); + pthread_testcancel(); + if (p->skype) { + res = skypiax_skype_read(p); + if (res == CALLFLOW_INCOMING_HANGUP) { + if (option_debug) + DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); + if (p->owner) { + pthread_testcancel(); + ast_queue_control(p->owner, AST_CONTROL_HANGUP); + } + } + } + } + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + +} + +/************************************************/ + +/* LUIGI RIZZO's magic */ +/* + * store the boost factor + */ +#ifdef ASTERISK_VERSION_1_6 +void skypiax_store_boost(const char *s, double *boost) +#else +void skypiax_store_boost(char *s, double *boost) +#endif /* ASTERISK_VERSION_1_6 */ +{ + struct skypiax_pvt *p = NULL; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (sscanf(s, "%lf", boost) != 1) { + ERRORA("invalid boost <%s>\n", SKYPIAX_P_LOG, s); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return; + } + if (*boost < -BOOST_MAX) { + WARNINGA("boost %s too small, using %d\n", SKYPIAX_P_LOG, s, -BOOST_MAX); + *boost = -BOOST_MAX; + } else if (*boost > BOOST_MAX) { + WARNINGA("boost %s too large, using %d\n", SKYPIAX_P_LOG, s, BOOST_MAX); + *boost = BOOST_MAX; + } + *boost = exp(log(10) * *boost / 20) * BOOST_SCALE; + if (option_debug > 1) + DEBUGA_SOUND("setting boost %s to %f\n", SKYPIAX_P_LOG, s, *boost); +} + +/* + * returns a pointer to the descriptor with the given name + */ +struct skypiax_pvt *skypiax_console_find_desc(char *dev) +{ + struct skypiax_pvt *p = NULL; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + for (p = skypiax_iflist; p && strcmp(p->name, dev) != 0; p = p->next); + if (p == NULL) + WARNINGA("could not find <%s>\n", SKYPIAX_P_LOG, dev); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return p; +} +int skypiax_console_playback_boost(int fd, int argc, char *argv[]) +{ + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (argc > 2) { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" skypiax_console for playback_boost, please enter 'help skypiax_console'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + + if (argc == 1) { + ast_cli(fd, "playback_boost on the active skypiax_console, that is [%s], is: %5.1f\n", + skypiax_console_active, + 20 * log10(((double) p->playback_boost / (double) BOOST_SCALE))); + } else if (argc == 2) { + skypiax_store_boost(argv[1], &p->playback_boost); + + ast_cli(fd, + "playback_boost on the active skypiax_console, that is [%s], is now: %5.1f\n", + skypiax_console_active, + 20 * log10(((double) p->playback_boost / (double) BOOST_SCALE))); + } + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} +int skypiax_console_capture_boost(int fd, int argc, char *argv[]) +{ + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (argc > 2) { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" skypiax_console for capture_boost, please enter 'help skypiax_console'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + + if (argc == 1) { + ast_cli(fd, "capture_boost on the active skypiax_console, that is [%s], is: %5.1f\n", + skypiax_console_active, + 20 * log10(((double) p->capture_boost / (double) BOOST_SCALE))); + } else if (argc == 2) { + skypiax_store_boost(argv[1], &p->capture_boost); + + ast_cli(fd, + "capture_boost on the active skypiax_console, that is [%s], is now: %5.1f\n", + skypiax_console_active, + 20 * log10(((double) p->capture_boost / (double) BOOST_SCALE))); + } + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} + +int skypiax_console_hangup(int fd, int argc, char *argv[]) +{ + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (argc != 1) { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" skypiax_console for hanging up, please enter 'help skypiax_console'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + if (!p->owner) { + ast_cli(fd, "No call to hangup on the active skypiax_console, that is [%s]\n", + skypiax_console_active); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_FAILURE; + } + if (p->owner) + ast_queue_hangup(p->owner); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} + +int skypiax_console_dial(int fd, int argc, char *argv[]) +{ + char *s = NULL; + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (argc != 2) { + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" skypiax_console for dialing, please enter 'help skypiax_console'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + + if (p->owner) { /* already in a call */ + int i; + struct ast_frame f = { AST_FRAME_DTMF, 0 }; + + s = argv[1]; + /* send the string one char at a time */ + for (i = 0; i < strlen(s); i++) { + f.subclass = s[i]; + ast_queue_frame(p->owner, &f); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } else + ast_cli(fd, + "No call in which to dial on the \"current\" skypiax_console, that is [%s]\n", + skypiax_console_active); + if (s) + free(s); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} +int skypiax_console_set_active(int fd, int argc, char *argv[]) +{ + if (argc == 1) + ast_cli(fd, + "\"current\" skypiax_console is [%s]\n Enter 'skypiax_console show' to see the available interfaces.\n Enter 'skypiax_console interfacename' to change the \"current\" skypiax_console.\n", + skypiax_console_active); + else if (argc != 2) { + return RESULT_SHOWUSAGE; + } else { + struct skypiax_pvt *p; + if (strcmp(argv[1], "show") == 0) { + ast_cli(fd, "Available interfaces:\n"); + for (p = skypiax_iflist; p; p = p->next) + ast_cli(fd, " [%s]\n", p->name); + return RESULT_SUCCESS; + } + p = skypiax_console_find_desc(argv[1]); + if (p == NULL) + ast_cli(fd, "Interface [%s] do not exists!\n", argv[1]); + else { + skypiax_console_active = p->name; + ast_cli(fd, "\"current\" skypiax_console is now: [%s]\n", argv[1]); + } + } + return RESULT_SUCCESS; +} + +int skypiax_console_skypiax(int fd, int argc, char *argv[]) +{ + return RESULT_SHOWUSAGE; +} + +void *do_skypeapi_thread(void *obj) +{ + return skypiax_do_skypeapi_thread_func(obj); +} + +int dtmf_received(private_t *p, char *value){ + + struct ast_frame f2 = { AST_FRAME_DTMF, value[0], }; + DEBUGA_SKYPE("Received DTMF: %s\n", SKYPIAX_P_LOG, value); + ast_queue_frame(p->owner, &f2); + + return 0; + +} +int start_audio_threads(private_t *tech_pvt) { +#ifdef NOTDEF + 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(&tech_pvt->tcp_srv_thread, thd_attr, + skypiax_do_tcp_srv_thread, tech_pvt, + skypiax_module_pool); + DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + + 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(&tech_pvt->tcp_cli_thread, thd_attr, + skypiax_do_tcp_cli_thread, tech_pvt, + skypiax_module_pool); + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + switch_sleep(100000); + +#endif + + return 0; +} + +int new_inbound_channel(private_t *tech_pvt) { +#ifdef NOTDEF + switch_core_session_t *session = NULL; + switch_channel_t *channel = NULL; + + if ((session = + switch_core_session_request(skypiax_endpoint_interface, + NULL)) != 0) { + switch_core_session_add_stream(session, NULL); + channel = switch_core_session_get_channel(session); + skypiax_tech_init(tech_pvt, session); + + if ((tech_pvt->caller_profile = + switch_caller_profile_new(switch_core_session_get_pool(session), + "skypiax", tech_pvt->dialplan, + tech_pvt->callid_name, + tech_pvt->callid_number, NULL, NULL, + NULL, NULL, "mod_skypiax", + tech_pvt->context, + tech_pvt->destination)) != 0) { + char name[128]; + //switch_snprintf(name, sizeof(name), "skypiax/%s/%s", tech_pvt->name, tech_pvt->caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "skypiax/%s", tech_pvt->name); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, + tech_pvt->caller_profile); + } + switch_channel_set_state(channel, CS_INIT); + if (switch_core_session_thread_launch(session) != + SWITCH_STATUS_SUCCESS) { + ERRORA("Error spawning thread\n", SKYPIAX_P_LOG); + switch_core_session_destroy(&session); + } + } + switch_channel_mark_answered(channel); + + DEBUGA_SKYPE("Here\n", SKYPIAX_P_LOG); + +#endif + return 0; +} +int outbound_channel_answered(private_t *tech_pvt) { +#ifdef NOTDEF + switch_core_session_t *session = NULL; + switch_channel_t *channel = NULL; + + + if (strlen(tech_pvt->session_uuid_str)) { + session = switch_core_session_locate(tech_pvt->session_uuid_str); + } else { + ERRORA("No session???\n", SKYPIAX_P_LOG); + } + if (session) { + channel = switch_core_session_get_channel(session); + } else { + ERRORA("No session???\n", SKYPIAX_P_LOG); + } + if (channel) { + switch_channel_mark_answered(channel); + //DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id); + } else { + ERRORA("No channel???\n", SKYPIAX_P_LOG); + } + + switch_core_session_rwunlock(session); + DEBUGA_SKYPE("HERE!\n", SKYPIAX_P_LOG); + +#endif + + return 0; +} + +/************************************************/ +#ifdef ASTERISK_VERSION_1_4 +#ifndef AST_MODULE +#define AST_MODULE "chan_skypiax" +#endif +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Skypiax, Audio-Serial Driver"); +#endif /* ASTERISK_VERSION_1_4 */ + +/* rewriting end */ +/*******************************************************************************/ Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/cyg_no_pthread_kill.c ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/cyg_no_pthread_kill.c Sat Jan 31 07:51:01 2009 @@ -0,0 +1,14 @@ +#include <stdio.h> +#define PRINTMSGCYG + +extern int option_debug; +int cyg_no_pthreadkill(int thread, int sig); + +int cyg_no_pthreadkill(int thread, int sig){ +#ifdef PRINTMSGCYG + if(option_debug){ + printf("\n\nHere there would have been a pthread_kill() on thread [%-7lx], with sig=%d, but it has been substituted by this printf in file cyg_no_pthread_kill.c because CYGWIN does not support sending a signal to a one only thread :-(\n\n", (unsigned long int)thread, sig); + } +#endif// PRINTMSGCYG + return 0; + } Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.conf Sat Jan 31 07:51:01 2009 @@ -0,0 +1,63 @@ +;; +;; +; Skypiax Asterisk Driver +; +; Configuration file +; lines beginning with semicolon (" are ignored (commented out) +; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; +; The first interface (named skypeclient) +[skypeclient] +;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;; +; 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 +;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;; +; 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 ; + + Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax.h Sat Jan 31 07:51:01 2009 @@ -0,0 +1,412 @@ +//indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 +#ifndef _SKYPIAX_H_ +#define _SKYPIAX_H_ + +#ifndef SKYPIAX_SVN_VERSION +#define SKYPIAX_SVN_VERSION "????NO_REVISION???" +#endif + +#include <asterisk/version.h> /* needed here for conditional compilation on version.h */ + /* the following #defs are for LINUX */ +#ifndef __CYGWIN__ +#ifndef ASTERISK_VERSION_1_6 +#ifndef ASTERISK_VERSION_1_4 +#ifndef ASTERISK_VERSION_1_2 +#define ASTERISK_VERSION_1_4 +#if(ASTERISK_VERSION_NUM == 999999) +#undef ASTERISK_VERSION_1_4 +#elif(ASTERISK_VERSION_NUM < 10400) +#undef ASTERISK_VERSION_1_4 +#endif /* ASTERISK_VERSION_NUM == 999999 || ASTERISK_VERSION_NUM < 10400 */ +#endif /* ASTERISK_VERSION_1_2 */ +#endif /* ASTERISK_VERSION_1_4 */ +#endif /* ASTERISK_VERSION_1_6 */ +#ifdef ASTERISK_VERSION_1_2 +#undef ASTERISK_VERSION_1_4 +#endif /* ASTERISK_VERSION_1_2 */ +#ifdef ASTERISK_VERSION_1_6 +#define ASTERISK_VERSION_1_4 +#endif /* ASTERISK_VERSION_1_6 */ +#define SKYPIAX_SKYPE +#define WANT_SKYPE_X11 +#endif /* NOT __CYGWIN__ */ + /* the following #defs are for WINDOWS */ +#ifdef __CYGWIN__ +#undef ASTERISK_VERSION_1_4 +#undef ASTERISK_VERSION_1_6 +#define SKYPIAX_SKYPE +#undef WANT_SKYPE_X11 +#endif /* __CYGWIN__ */ + +/* INCLUDES */ +#ifdef ASTERISK_VERSION_1_6 +#include <asterisk.h> /* some asterisk-devel package do not contains asterisk.h, but seems that is needed for the 1.6 series, at least from trunk */ +#endif /* ASTERISK_VERSION_1_6 */ +#include <unistd.h> +#include <termios.h> +#include <fcntl.h> +#include <errno.h> +#include <math.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <string.h> +#include <sys/types.h> +#include <signal.h> +#include <ctype.h> +#ifndef ASTERISK_VERSION_1_4 +#include <stdlib.h> +#include <stdio.h> +#endif /* ASTERISK_VERSION_1_4 */ +#include <asterisk/frame.h> +#include <asterisk/channel.h> +#include <asterisk/module.h> +#include <asterisk/options.h> +#include <asterisk/pbx.h> +#include <asterisk/config.h> +#include <asterisk/cli.h> +#include <asterisk/causes.h> +#include <asterisk/endian.h> +#include <asterisk/lock.h> +#include <asterisk/devicestate.h> +#include <asterisk/file.h> +#include <asterisk/say.h> +#ifdef ASTERISK_VERSION_1_6 +#include <asterisk/astobj2.h> +#include <asterisk/paths.h> +#endif /* ASTERISK_VERSION_1_6 */ +#ifdef ASTERISK_VERSION_1_4 +#include <asterisk/stringfields.h> +#include <asterisk/abstract_jb.h> +#include <asterisk/logger.h> +#include <asterisk/utils.h> +#endif /* ASTERISK_VERSION_1_4 */ +#ifdef ASTERISK_VERSION_1_2 +#include <asterisk/utils.h> +#include <asterisk/logger.h> +#endif /* ASTERISK_VERSION_1_2 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +//#include "skypiax_spandsp.h" +#ifdef __CYGWIN__ +#include <windows.h> +#endif /* __CYGWIN__ */ +#ifdef WANT_SKYPE_X11 +#include <X11/Xlib.h> +#include <X11/Xlibint.h> +#include <X11/Xatom.h> +#endif /* WANT_SKYPE_X11 */ +#ifndef AST_DIGIT_ANYDIG +#define AST_DIGIT_ANYDIG "0123456789*#" +#else +#warning Please review Skypiax AST_DIGIT_ANYDIG +#endif +#ifndef _ASTERISK_H +#define AST_CONFIG_MAX_PATH 255 /* defined in asterisk.h, but some asterisk-devel package do not contains asterisk.h */ +extern char ast_config_AST_CONFIG_DIR[AST_CONFIG_MAX_PATH]; +int ast_register_atexit(void (*func) (void)); /* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */ +void ast_unregister_atexit(void (*func) (void)); /* in asterisk.h, but some asterisk-devel package do not contains asterisk.h */ +#endif + +/* DEFINITIONS */ +#define SAMPLERATE_SKYPIAX 8000 +#define SAMPLES_PER_FRAME SAMPLERATE_SKYPIAX/50 + +/* LUIGI RIZZO's magic */ +/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must + * be representable in 16 bits to avoid overflows. + */ +#define BOOST_SCALE (1<<9) +#define BOOST_MAX 40 /* slightly less than 7 bits */ +/* call flow from the device */ +#define CALLFLOW_CALL_IDLE AST_STATE_DOWN +#define CALLFLOW_INCOMING_RING AST_STATE_RING +#define CALLFLOW_CALL_DIALING AST_STATE_DIALING +#define CALLFLOW_CALL_LINEBUSY AST_STATE_BUSY +#define CALLFLOW_CALL_ACTIVE 300 +#define CALLFLOW_INCOMING_HANGUP 100 +#define CALLFLOW_CALL_RELEASED 101 +#define CALLFLOW_CALL_NOCARRIER 102 +#define CALLFLOW_CALL_INFLUX 103 +#define CALLFLOW_CALL_INCOMING 104 +#define CALLFLOW_CALL_FAILED 105 +#define CALLFLOW_CALL_NOSERVICE 106 +#define CALLFLOW_CALL_OUTGOINGRESTRICTED 107 +#define CALLFLOW_CALL_SECURITYFAIL 108 +#define CALLFLOW_CALL_NOANSWER 109 +#define CALLFLOW_STATUS_FINISHED 110 +#define CALLFLOW_STATUS_CANCELLED 111 +#define CALLFLOW_STATUS_FAILED 112 +#define CALLFLOW_STATUS_REFUSED 113 +#define CALLFLOW_STATUS_RINGING 114 +#define CALLFLOW_STATUS_INPROGRESS 115 +#define CALLFLOW_STATUS_UNPLACED 116 +#define CALLFLOW_STATUS_ROUTING 117 +#define CALLFLOW_STATUS_EARLYMEDIA 118 +#define AST_STATE_HANGUP_REQUESTED 200 + //FIXME CALLFLOW_INCOMING_CALLID to be removed +#define CALLFLOW_INCOMING_CALLID 1019 +/* debugging bitmask */ +#define DEBUG_SOUND 1 +#define DEBUG_SERIAL 2 +#define DEBUG_SKYPE 4 +#define DEBUG_AT 8 +#define DEBUG_FBUS2 16 +#define DEBUG_CALL 32 +#define DEBUG_LOCKS 64 +#define DEBUG_PBX 128 +#define DEBUG_MONITORLOCKS 256 +#define DEBUG_ALL DEBUG_SOUND|DEBUG_SERIAL|DEBUG_SKYPE|DEBUG_AT|DEBUG_FBUS2|DEBUG_CALL|DEBUG_PBX|DEBUG_LOCKS|DEBUG_MONITORLOCKS +/* wrappers for ast_log */ +#define DEBUGA_SOUND(...) if (skypiax_debug & DEBUG_SOUND) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SOUND %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_SERIAL(...) if (skypiax_debug & DEBUG_SERIAL) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SERIAL %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_SKYPE(...) if (skypiax_debug & DEBUG_SKYPE) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_SKYPE %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_AT(...) if (skypiax_debug & DEBUG_AT) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_AT %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_FBUS2(...) if (skypiax_debug & DEBUG_FBUS2) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_FBUS2 %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_CALL(...) if (skypiax_debug & DEBUG_CALL) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_CALL %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define DEBUGA_PBX(...) if (skypiax_debug & DEBUG_PBX) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_PBX %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define ERRORA(...) ast_log(LOG_ERROR, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][ERROR %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define NOTICA(...) ast_log(LOG_NOTICE, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][NOTICE %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +#define WARNINGA(...) ast_log(LOG_WARNING, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][WARNING %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ ); +/* macros for logging */ +#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_TMP_LOG tmp ? tmp->owner : NULL, (unsigned long)pthread_self(), __LINE__, tmp ? tmp->name ? tmp->name : "none" : "none", tmp ? tmp->owner ? tmp->owner->_state : -1 : -1, tmp ? tmp->interface_state : -1, tmp ? tmp->skype_callflow : -1 +/* logging wrappers for ast_mutex_lock and ast_mutex_unlock */ +#define LOKKA(x) if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n"); if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); +#define UNLOCKA(x) if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n"); if (skypiax_debug & DEBUG_LOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_LOCKS %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); +#define PUSHA_UNLOCKA(x) pthread_cleanup_push(skypiax_unlocka_log, (void *) x); +#define POPPA_UNLOCKA(x) pthread_cleanup_pop(0); +#define MONITORLOKKA(x) if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS %-5d][%-10s][%2d,%2d,%2d] going to lock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_lock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n"); if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS %-5d][%-10s][%2d,%2d,%2d] locked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); +#define MONITORUNLOCKA(x) if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS %-5d][%-10s][%2d,%2d,%2d] going to unlock %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); if (ast_mutex_unlock(x)) ast_log(LOG_ERROR, "ast_mutex_lock failed, BAD\n"); if (skypiax_debug & DEBUG_MONITORLOCKS) ast_log(LOG_DEBUG, "rev "SKYPIAX_SVN_VERSION "[%p|%-7lx][DEBUG_MONITORLOCKS %-5d][%-10s][%2d,%2d,%2d] unlocked %p (%s)\n", SKYPIAX_P_LOG, x, x == &skypiax_monlock ? "MONLOCK" : x == &skypiax_iflock ? "IFLOCK" : x == &skypiax_usecnt_lock ? "USECNT_LOCK" : "?????"); +/* macros used for config file parsing (luigi rizzo)*/ +#define M_BOOL(tag, dst) M_F(tag, (dst) = ast_true(__val) ) +#define M_END(x) x; +#define M_F(tag, f) if (!strcasecmp((__s), tag)) { f; } else +#ifdef ASTERISK_VERSION_1_6 +#define M_START(var, val) const char *__s = var; const char *__val = val; +#else +#define M_START(var, val) char *__s = var; char *__val = val; +#endif /* ASTERISK_VERSION_1_6 */ +#define M_STR(tag, dst) M_F(tag, ast_copy_string(dst, __val, sizeof(dst))) +#define M_UINT(tag, dst) M_F(tag, (dst) = strtoul(__val, NULL, 0) ) + +#define SKYPIAX_FRAME_SIZE 160 + +/* SKYPIAX INTERNAL STRUCTS */ +/*! + * \brief structure for exchanging messages with the skype client + */ +#ifdef WANT_SKYPE_X11 +struct AsteriskHandles { + Window skype_win; + Display *disp; + Window win; + int fdesc[2]; +}; +#else /* WANT_SKYPE_X11 */ +struct AsteriskHandles { + HWND win32_hInit_MainWindowHandle; + HWND win32_hGlobal_SkypeAPIWindowHandle; + int fdesc[2]; +}; +#endif /* WANT_SKYPE_X11 */ + +#ifndef WIN32 +struct SkypiaxHandles { + Window skype_win; + Display *disp; + Window win; + int api_connected; + int fdesc[2]; +}; +#else //WIN32 + +struct SkypiaxHandles { + HWND win32_hInit_MainWindowHandle; + HWND win32_hGlobal_SkypeAPIWindowHandle; + HINSTANCE win32_hInit_ProcessHandle; + char win32_acInit_WindowClassName[128]; + UINT win32_uiGlobal_MsgID_SkypeControlAPIAttach; + UINT win32_uiGlobal_MsgID_SkypeControlAPIDiscover; + int api_connected; + switch_file_t *fdesc[2]; +}; + +#endif //WIN32 + + +/*! + * \brief PVT structure for a skypiax interface (channel), created by skypiax_mkif + */ +struct skypiax_pvt { + char *name; /*!< \brief 'name' of the interface (channel) */ + int interface_state; /*!< \brief 'state' of the interface (channel) */ + struct ast_channel *owner; /*!< \brief channel we belong to, possibly NULL */ + struct skypiax_pvt *next; /*!< \brief Next interface (channel) in list */ + char context[AST_MAX_EXTENSION]; /*!< \brief default Asterisk dialplan context for this interface */ + char language[MAX_LANGUAGE]; /*!< \brief default Asterisk dialplan language for this interface */ + char exten[AST_MAX_EXTENSION]; /*!< \brief default Asterisk dialplan extension for this interface */ + int skypiax_sound_rate; /*!< \brief rate of the sound device, in Hz, eg: 8000 */ + int skypiax_sound_capt_fd; /*!< \brief file descriptor for sound capture dev */ + char callid_name[50]; + char callid_number[50]; + pthread_t controldev_thread; /*!< \brief serial control thread for this interface, running during the call */ + double playback_boost; + double capture_boost; + int stripmsd; + pthread_t skype_thread; + struct AsteriskHandles AsteriskHandlesAst; + struct SkypiaxHandles SkypiaxHandles; + char skype_call_id[512]; + int skype_call_ongoing; + char skype_friends[4096]; + char skype_fullname[512]; + char skype_displayname[512]; + int skype_callflow; /*!< \brief 'callflow' of the skype interface (as opposed to phone interface) */ + int skype; /*!< \brief config flag, bool, Skype support on this interface (0 if false, -1 if true) */ + int control_to_send; + int audiopipe[2]; + int audioskypepipe[2]; + pthread_t tcp_srv_thread; + pthread_t tcp_cli_thread; + short audiobuf[160]; + int audiobuf_is_loaded; + + //int phonebook_listing; + //int phonebook_querying; + //int phonebook_listing_received_calls; + + //int phonebook_first_entry; + //int phonebook_last_entry; + //int phonebook_number_lenght; + //int phonebook_text_lenght; + FILE *phonebook_writing_fp; + int skypiax_dir_entry_extension_prefix; +#ifdef WIN32 + unsigned short tcp_cli_port; + unsigned short tcp_srv_port; +#else + int tcp_cli_port; + int tcp_srv_port; +#endif + char X11_display[256]; + + struct ast_frame read_frame; + + char skype_user[256]; + char skype_password[256]; + char destination[256]; + char session_uuid_str[512 + 1]; +}; + +typedef struct skypiax_pvt private_t; +/* FUNCTIONS */ + +/* module helpers functions */ +int load_module(void); +int unload_module(void); +int usecount(void); +char *description(void); +char *key(void); + +/* chan_skypiax internal functions */ +void skypiax_unlocka_log(void *x); + +void *do_skypeapi_thread(void *data); +//int skypiax2skype(struct ast_channel *c, void *data); +//int skype2skypiax(struct ast_channel *c, void *data); +//void skypiax_skype_disconnect(void); +int skypiax_skype_write(struct skypiax_pvt *p, char *msg_to_skype); +int skypiax_skype_read(struct skypiax_pvt *p); +int skypiax_console_skype(int fd, int argc, char *argv[]); +#ifdef WANT_SKYPE_X11 +int X11_errors_handler(Display * dpy, XErrorEvent * err); +int skypiax_skype_send_message(struct SkypiaxHandles *SkypiaxHandles, + const char *message_P); +int skypiax_skype_present(struct SkypiaxHandles *SkypiaxHandles); +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); +#endif /* __CYGWIN__ */ + +/* CHAN_SKYPIAX.C */ +int skypiax_queue_control(struct ast_channel *chan, int control); +struct skypiax_pvt *skypiax_console_find_desc(char *dev); +int skypiax_serial_call(struct skypiax_pvt *p, char *dstr); + +/* FUNCTIONS */ +/* PBX interface functions */ +struct ast_channel *skypiax_request(const char *type, int format, void *data, int *cause); +int skypiax_answer(struct ast_channel *c); +int skypiax_hangup(struct ast_channel *c); +int skypiax_call(struct ast_channel *c, char *idest, int timeout); +struct ast_frame *skypiax_read(struct ast_channel *chan); +int skypiax_write(struct ast_channel *c, struct ast_frame *f); +int skypiax_fixup(struct ast_channel *oldchan, struct ast_channel *newchan); +#ifndef ASTERISK_VERSION_1_4 +int skypiax_indicate(struct ast_channel *c, int cond); +#else +int skypiax_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen); +#endif +int skypiax_devicestate(void *data); +#ifdef ASTERISK_VERSION_1_4 +int skypiax_senddigit_begin(struct ast_channel *ast, char digit); +int skypiax_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration); +#else /* ASTERISK_VERSION_1_4 */ +int skypiax_senddigit(struct ast_channel *ast, char digit); +#endif /* ASTERISK_VERSION_1_4 */ + +/* chan_skypiax internal functions */ + +struct skypiax_pvt *skypiax_mkif(struct ast_config *cfg, char *ctg, + int is_first_category); +struct ast_channel *skypiax_new(struct skypiax_pvt *p, int state, char *context); +int skypiax_restart_monitor(void); +void *skypiax_do_monitor(void *data); +int skypiax_sound_boost(struct ast_frame *f, double boost); +int skypiax_sound_init(struct skypiax_pvt *p); +int skypiax_sound_shutdown(struct skypiax_pvt *p); +struct ast_frame *skypiax_sound_read(struct skypiax_pvt *p); +int skypiax_sound_write(struct skypiax_pvt *p, struct ast_frame *f); +void *skypiax_do_controldev_thread(void *data); +#ifdef ASTERISK_VERSION_1_6 +void skypiax_store_boost(const char *s, double *boost); +#else +void skypiax_store_boost(char *s, double *boost); +#endif /* ASTERISK_VERSION_1_6 */ +int skypiax_console_set_active(int fd, int argc, char *argv[]); +int skypiax_console_hangup(int fd, int argc, char *argv[]); +int skypiax_console_playback_boost(int fd, int argc, char *argv[]); +int skypiax_console_capture_boost(int fd, int argc, char *argv[]); +int skypiax_console_skypiax(int fd, int argc, char *argv[]); +int skypiax_console_dial(int fd, int argc, char *argv[]); +int skypiax_skypeaudio_init(struct skypiax_pvt *p); +//struct ast_frame *skypiax_skypeaudio_read(struct skypiax_pvt *p); +int skypiax_skypeaudio_read(struct skypiax_pvt *p); +void *skypiax_do_tcp_srv_thread(void *data); +int skypiax_skypeaudio_write(struct skypiax_pvt *p, struct ast_frame *f); +void *skypiax_do_tcp_cli_thread(void *data); +int skypiax_skype_call(struct skypiax_pvt *p, char *idest, int timeout); +int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[]); + +void * skypiax_do_tcp_srv_thread_func(void *obj); +void * skypiax_do_tcp_cli_thread_func(void *obj); +void * skypiax_do_skypeapi_thread_func(void *obj); +int dtmf_received(private_t *tech_pvt, char *value); +int start_audio_threads(private_t *tech_pvt); +int new_inbound_channel(private_t *tech_pvt); +int outbound_channel_answered(private_t *tech_pvt); +int skypiax_skype_senddigit(struct skypiax_pvt *p, char digit); +#define SKYPIAX_STATE_DOWN 1 +#define SKYPIAX_STATE_RING 2 +#define SKYPIAX_STATE_DIALING 3 +#define SKYPIAX_STATE_BUSY 4 +#define SKYPIAX_STATE_UP 5 +#define SKYPIAX_STATE_RINGING 6 +#define SKYPIAX_STATE_PRERING 7 +#define SKYPIAX_STATE_HANGUP_REQUESTED 200 +#endif /* _SKYPIAX_H_ */ Added: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c Sat Jan 31 07:51:01 2009 @@ -0,0 +1,2099 @@ +#include "skypiax.h" + +#define skypiax_sleep usleep +#define skypiax_file_write switch_file_write +#define skypiax_file_read switch_file_read + +#define tech_pvt p + +#define SKYPIAX_DIR_CONFIG "directoriax.conf" + +extern int skypiax_debug; +//extern switch_memory_pool_t *skypiax_module_pool; +extern int option_debug; +//extern switch_endpoint_interface_t *skypiax_endpoint_interface; +extern int running; +extern char *skypiax_console_active; + +/* GLOBALS */ +int skypiax_dir_entry_extension=1; +/*************************************/ +#ifndef WIN32 +XErrorHandler old_handler = 0; +int xerror = 0; +#endif /* WIN32 */ +/*************************************/ + +void * skypiax_do_tcp_srv_thread_func(void *obj) +{ + 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; + 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; + unsigned int kill_cli_size; + short kill_cli_buff[SAMPLES_PER_FRAME]; + short totalbuf[SAMPLES_PER_FRAME]; + + if (option_debug > 100) { + DEBUGA_SKYPE("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + memset(&my_addr, 0, sizeof(my_addr)); + my_addr.sin_family = AF_INET; + my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */ + my_addr.sin_port = htons(tech_pvt->tcp_srv_port); + + if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + ERRORA("socket Error\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + + if (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) { + ERRORA("bind Error\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + + listen(s, 6); + + 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 (tech_pvt->interface_state != SKYPIAX_STATE_DOWN + && (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; + + if (!running) + break; + exit = 1; + + fdselect = fd; + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //2000 msec + to.tv_sec = 0; + + 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) { + + 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) { + a = 0; + for (i = 0; i < len / sizeof(short); i++) { + srv_out[a] = srv_in[i]; + i++; + a++; + } + + if (!tech_pvt->audiobuf_is_loaded) { + for (i = 0; i < (len / sizeof(short)) / 2; i++) { + tech_pvt->audiobuf[i] = srv_out[i]; + } + tech_pvt->audiobuf_is_loaded = 1; + } else { + unsigned int howmany; + + howmany = len / 2 / 2; + for (i = 0; i < howmany; i++) + totalbuf[i] = tech_pvt->audiobuf[i]; + + howmany = len / 2 / 2; + for (a = 0; a < howmany; a++) { + totalbuf[i] = srv_out[a]; + i++; + } + + howmany = len; + +#ifdef WIN32 + skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); +#else /* WIN32 */ + howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); +#endif /* WIN32 */ + tech_pvt->audiobuf_is_loaded = 0; + } + + } else if (len == 0) { + DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); + skypiax_sleep(1000); + } else { + ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + exit = 1; + break; + } + } 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)) { +#ifdef WIN32 + 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 (!tech_pvt->audiobuf_is_loaded) { + for (i = 0; i < (len / sizeof(short)); i++) { + tech_pvt->audiobuf[i] = srv_in[i]; + } + tech_pvt->audiobuf_is_loaded = 1; + } else { + unsigned int howmany = SAMPLES_PER_FRAME * sizeof(short); + + for (i = 0; i < (len / sizeof(short)); i++) + totalbuf[i] = tech_pvt->audiobuf[i]; + for (a = 0; a < (len / sizeof(short)); a++) { + totalbuf[i] = srv_in[a]; + i++; + } + +#ifdef WIN32 + skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); +#else /* WIN32 */ + howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); +#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); + } else { + ERRORA("SRV len=%d\n", SKYPIAX_P_LOG, len); + exit = 1; + break; + } + + } else { + ERRORA("SAMPLERATE_SKYPIAX can only be 8000 or 16000\n", SKYPIAX_P_LOG); + } + } else { + if (rt) + ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt); + skypiax_sleep(10000); + } + } +#ifdef WIN32 + 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); + skypiax_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + 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); + skypiax_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); +#else /* WIN32 */ + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + len = write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size); + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + len = write(tech_pvt->audioskypepipe[1], kill_cli_buff, kill_cli_size); + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + len = write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size); + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + 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 + closesocket(fd); +#endif + if (exit) + break; + } + + DEBUGA_SKYPE("server (I am it) GONE\n", SKYPIAX_P_LOG); +#ifndef WIN32 + close(s); +#else + closesocket(s); +#endif + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; +} +void * skypiax_do_tcp_cli_thread_func(void *obj) +{ + private_t *tech_pvt = obj; + int s; + struct sockaddr_in my_addr; + struct sockaddr_in remote_addr; + unsigned int got; +#ifdef WIN32 + unsigned int len; + unsigned int i; + unsigned int a; + int sin_size; + unsigned int fd; + short cli_out[SAMPLES_PER_FRAME * 2]; + short cli_in[SAMPLES_PER_FRAME]; +#else + int len; + int i; + int a; + unsigned int sin_size; + int fd; + short cli_out[SAMPLES_PER_FRAME * 2]; + short cli_in[SAMPLES_PER_FRAME]; +#endif /* WIN32 */ + + if (option_debug > 100) { + DEBUGA_SKYPE("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + memset(&my_addr, 0, sizeof(my_addr)); + my_addr.sin_family = AF_INET; + my_addr.sin_addr.s_addr = htonl(0x7f000001); /* use the localhost */ + my_addr.sin_port = htons(tech_pvt->tcp_cli_port); //FIXME configurable! + + if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + ERRORA("socket Error\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; + } + + if (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) { + ERRORA("bind Error\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } +#ifndef WIN32 + close(s); +#else + closesocket(s); +#endif + return NULL; + } + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + + listen(s, 6); + + 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 (tech_pvt->interface_state != SKYPIAX_STATE_DOWN + && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS + || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) { +#ifdef WIN32 + unsigned int fdselect; +#else + int fdselect; +#endif /* WIN32 */ + int rt; + fd_set fs; + struct timeval to; + + if (!running) + break; +#ifdef WIN32 + fdselect = fd; //cannot select on audioskypepipe, let's select on socket write +#else /* WIN32 */ + fdselect = tech_pvt->audioskypepipe[0]; +#endif /* WIN32 */ + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //2000 msec + to.tv_sec = 0; + +#ifdef WIN32 + rt = select(fdselect + 1, NULL, &fs, NULL, &to); //cannot select on audioskypepipe, let's select on socket write +#else /* WIN32 */ + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ + if (rt > 0) { + if ((SAMPLERATE_SKYPIAX - 8000) == 0) { + got = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 + skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); +#else /* WIN32 */ + got = read(tech_pvt->audioskypepipe[0], cli_in, got); +#endif /* WIN32 */ + + if (got > 0) { + a = 0; + for (i = 0; i < got / sizeof(short); i++) { + cli_out[a] = cli_in[i]; + a++; + cli_out[a] = cli_in[i]; + a++; + } + +#ifdef WIN32 + len = send(fd, (char *) cli_out, got * 2, 0); +#else /* WIN32 */ + len = send(fd, cli_out, got * 2, 0); +#endif /* WIN32 */ + if (len == 0) { + ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); + break; + } + } else { + skypiax_sleep(1000); + ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); + } + } else if (SAMPLERATE_SKYPIAX == 16000) { + got = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 + skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); +#else /* WIN32 */ + got = read(tech_pvt->audioskypepipe[0], cli_in, got); +#endif /* WIN32 */ + + if (got > 0) { + if (got != SAMPLES_PER_FRAME * sizeof(short)) + ERRORA("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); + +#ifdef WIN32 + len = send(fd, (char *) cli_in, got, 0); +#else /* WIN32 */ + len = send(fd, cli_in, got, 0); +#endif /* WIN32 */ + + if (len != got && len != -1) + DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); + + if (len == 0) { + ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); + break; + } + } else { + skypiax_sleep(1000); + ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); + } + } + + } else { + skypiax_sleep(1000); + if (rt) + ERRORA("select give us: %u\n", SKYPIAX_P_LOG, rt); + } + + } + DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); +#ifndef WIN32 + close(fd); +#else + closesocket(fd); +#endif + break; + } + + DEBUGA_SKYPE("client (I am it) GONE\n", SKYPIAX_P_LOG); +#ifndef WIN32 + close(s); +#else + closesocket(s); +#endif + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return NULL; +} + +int skypiax_skypeaudio_init(private_t * tech_pvt) +{ + +#ifdef WIN32 + switch_status_t rv; + rv = + switch_file_pipe_create(&tech_pvt->audiopipe[0], &tech_pvt->audiopipe[1], + skypiax_module_pool); + rv = + switch_file_pipe_create(&tech_pvt->audioskypepipe[0], &tech_pvt->audioskypepipe[1], + skypiax_module_pool); +#else /* WIN32 */ + if (pipe(tech_pvt->audiopipe)) { + fcntl(tech_pvt->audiopipe[0], F_SETFL, O_NONBLOCK); + fcntl(tech_pvt->audiopipe[1], F_SETFL, O_NONBLOCK); + } + if (pipe(tech_pvt->audioskypepipe)) { + fcntl(tech_pvt->audioskypepipe[0], F_SETFL, O_NONBLOCK); + fcntl(tech_pvt->audioskypepipe[1], F_SETFL, O_NONBLOCK); + } +#endif /* WIN32 */ + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +int skypiax_skypeaudio_read(private_t * tech_pvt) +{ + //private_t *p; + unsigned int samples; + int rt; +#ifndef WIN32 + int fdselect; + fd_set fs; + struct timeval to; +#endif /* WIN32 */ + +#ifdef WIN32 + rt = 1; +#else /* WIN32 */ + fdselect = tech_pvt->audiopipe[0]; + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //2000 msec + to.tv_sec = 0; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ + if (rt > 0) { + samples = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 + 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); +#endif /* WIN32 */ + + //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 (samples != SAMPLES_PER_FRAME * sizeof(short)) { + //if (samples) + //ERRORA("SRV PIPE READ=====> NOT GOOD samples=%u expected=%lu\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); + //assert(samples == SAMPLES_PER_FRAME * sizeof(short)); //do a crash, please + return 0; + } else { + /* A real frame */ + tech_pvt->read_frame.datalen = samples; + } + } else { + if (rt) + DEBUGA_SKYPE("select returned %d\n", SKYPIAX_P_LOG, rt); + //do nothing + } + return 1; +} + +#ifdef WIN32 + +enum { + SKYPECONTROLAPI_ATTACH_SUCCESS = 0, /* Client is successfully + attached and API window handle can be found + in wParam parameter */ + SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION = 1, /* Skype has acknowledged + connection request and is waiting + for confirmation from the user. */ + /* The client is not yet attached + * and should wait for SKYPECONTROLAPI_ATTACH_SUCCESS message */ + SKYPECONTROLAPI_ATTACH_REFUSED = 2, /* User has explicitly + denied access to client */ + SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE = 3, /* API is not available + at the moment. + For example, this happens when no user + is currently logged in. */ + /* Client should wait for + * SKYPECONTROLAPI_ATTACH_API_AVAILABLE + * broadcast before making any further */ + /* connection attempts. */ + SKYPECONTROLAPI_ATTACH_API_AVAILABLE = 0x8001 +}; + +char + *strsep(char **stringp, const char *delim) +{ + char *res; + + if (!stringp || !*stringp || !**stringp) + return (char *) 0; + + res = *stringp; + while (**stringp && !strchr(delim, **stringp)) + ++(*stringp); + + if (**stringp) { + **stringp = '\0'; + ++(*stringp); + } + + return res; +} + +LRESULT APIENTRY skypiax_skype_present(HWND hWindow, UINT uiMessage, WPARAM uiParam, + LPARAM ulParam) +{ + LRESULT lReturnCode; + int fIssueDefProc; + private_t *tech_pvt = NULL; + + lReturnCode = 0; + fIssueDefProc = 0; + tech_pvt = (private_t *) GetWindowLong(hWindow, GWL_USERDATA); + switch (uiMessage) { + case WM_CREATE: + tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams; + SetWindowLong(hWindow, GWL_USERDATA, (LONG) tech_pvt); + DEBUGA_SKYPE("got CREATE\n", SKYPIAX_P_LOG); + break; + case WM_DESTROY: + NOTICA("got DESTROY\n", SKYPIAX_P_LOG); + tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = NULL; + PostQuitMessage(0); + break; + case WM_COPYDATA: + if (tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle == (HWND) uiParam) { + unsigned int howmany; + char msg_from_skype[2048]; + + PCOPYDATASTRUCT poCopyData = (PCOPYDATASTRUCT) ulParam; + + memset(msg_from_skype, '\0', sizeof(msg_from_skype)); + strncpy(msg_from_skype, (const char *) poCopyData->lpData, + sizeof(msg_from_skype) - 2); + + howmany = strlen(msg_from_skype) + 1; + 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); + lReturnCode = 1; + } + break; + default: + if (tech_pvt && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { + if (uiMessage == + tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach) { + switch (ulParam) { + case SKYPECONTROLAPI_ATTACH_SUCCESS: + if (!tech_pvt->SkypiaxHandles.api_connected) { + DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); + tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; + tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = + tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle; + } + break; + case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: + DEBUGA_SKYPE + ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", + SKYPIAX_P_LOG); + skypiax_sleep(5000); + if (!tech_pvt->SkypiaxHandles.api_connected) { + SendMessage(HWND_BROADCAST, + tech_pvt->SkypiaxHandles. + win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, + 0); + } + break; + case SKYPECONTROLAPI_ATTACH_REFUSED: + ERRORA("Skype client refused to be connected by Skypiax!\n", SKYPIAX_P_LOG); + break; + case SKYPECONTROLAPI_ATTACH_NOT_AVAILABLE: + ERRORA("Skype API not (yet?) available\n", SKYPIAX_P_LOG); + break; + case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: + DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); + skypiax_sleep(5000); + if (!tech_pvt->SkypiaxHandles.api_connected) { + SendMessage(HWND_BROADCAST, + tech_pvt->SkypiaxHandles. + win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, + 0); + } + break; + default: + WARNINGA("GOT AN UNKNOWN SKYPE WINDOWS MSG\n", SKYPIAX_P_LOG); + } + lReturnCode = 1; + break; + } + } + fIssueDefProc = 1; + break; + } + if (fIssueDefProc) + lReturnCode = DefWindowProc(hWindow, uiMessage, uiParam, ulParam); + return (lReturnCode); +} + +int win32_Initialize_CreateWindowClass(private_t * tech_pvt) +{ + unsigned char *paucUUIDString; + RPC_STATUS lUUIDResult; + int fReturnStatus; + UUID oUUID; + + fReturnStatus = 0; + lUUIDResult = UuidCreate(&oUUID); + tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = + (HINSTANCE) OpenProcess(PROCESS_DUP_HANDLE, FALSE, GetCurrentProcessId()); + if (tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle != NULL + && (lUUIDResult == RPC_S_OK || lUUIDResult == RPC_S_UUID_LOCAL_ONLY)) { + if (UuidToString(&oUUID, &paucUUIDString) == RPC_S_OK) { + WNDCLASS oWindowClass; + + strcpy(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, "Skype-API-Skypiax-"); + strcat(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, + (char *) paucUUIDString); + + oWindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + oWindowClass.lpfnWndProc = (WNDPROC) & skypiax_skype_present; + oWindowClass.cbClsExtra = 0; + oWindowClass.cbWndExtra = 0; + oWindowClass.hInstance = tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle; + oWindowClass.hIcon = NULL; + oWindowClass.hCursor = NULL; + oWindowClass.hbrBackground = NULL; + oWindowClass.lpszMenuName = NULL; + oWindowClass.lpszClassName = tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName; + + if (RegisterClass(&oWindowClass) != 0) + fReturnStatus = 1; + + RpcStringFree(&paucUUIDString); + } + } + if (fReturnStatus == 0) + CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle), + tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL; + return (fReturnStatus); +} + +void win32_DeInitialize_DestroyWindowClass(private_t * tech_pvt) +{ + UnregisterClass(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, + tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle); + CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle), + tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL; +} + +int win32_Initialize_CreateMainWindow(private_t * tech_pvt) +{ + tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = + CreateWindowEx(WS_EX_APPWINDOW | WS_EX_WINDOWEDGE, + tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, "", + WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, + 128, 128, NULL, 0, tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle, + tech_pvt); + return (tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle != NULL ? 1 : 0); +} + +void win32_DeInitialize_DestroyMainWindow(private_t * tech_pvt) +{ + if (tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle != NULL) + DestroyWindow(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle), + tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = NULL; +} + +DWORD win32_dwThreadId; + +void * skypiax_do_skypeapi_thread_func(void *obj) +{ + /* create window class */ + /* create dummy/hidden window for processing messages */ + /* run message loop thread */ + /* do application control until exit */ + /* exit: send QUIT message to our own window */ + /* wait until thred terminates */ + /* destroy main window */ + /* destroy window class */ + + private_t *tech_pvt = obj; + + switch_file_pipe_create(&tech_pvt->SkypiaxHandles.fdesc[0], + &tech_pvt->SkypiaxHandles.fdesc[1], skypiax_module_pool); + tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach = + RegisterWindowMessage("SkypeControlAPIAttach"); + tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = + RegisterWindowMessage("SkypeControlAPIDiscover"); + + skypiax_sleep(2000000); + + if (tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 + && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { + if (win32_Initialize_CreateWindowClass(tech_pvt)) { + if (win32_Initialize_CreateMainWindow(tech_pvt)) { + if (SendMessage + (HWND_BROADCAST, + tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover, + (WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, 0) != 0) { + tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = + tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle; + while (1) { + MSG oMessage; + if (!running) + break; + while (GetMessage(&oMessage, 0, 0, 0)) { + TranslateMessage(&oMessage); + DispatchMessage(&oMessage); + } + } + } + win32_DeInitialize_DestroyMainWindow(tech_pvt); + } + win32_DeInitialize_DestroyWindowClass(tech_pvt); + } + } + + return NULL; +} + +#else /* NOT WIN32 */ + +int X11_errors_handler(Display * dpy, XErrorEvent * err) +{ + (void) dpy; + private_t *tech_pvt = NULL; + + xerror = err->error_code; + ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); + return 0; /* ignore the error */ +} + +static void X11_errors_trap(void) +{ + xerror = 0; + old_handler = XSetErrorHandler(X11_errors_handler); +} + +static int X11_errors_untrap(void) +{ + XSetErrorHandler(old_handler); + return (xerror != BadValue) && (xerror != BadWindow); +} + +int skypiax_skype_send_message(struct SkypiaxHandles *SkypiaxHandles, + const char *message_P) +{ + + Window w_P; + Display *disp; + Window handle_P; + int ok; + private_t *tech_pvt = NULL; + + w_P = SkypiaxHandles->skype_win; + disp = SkypiaxHandles->disp; + handle_P = SkypiaxHandles->win; + + Atom atom1 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False); + Atom atom2 = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False); + unsigned int pos = 0; + unsigned int len = strlen(message_P); + XEvent e; + + memset(&e, 0, sizeof(e)); + e.xclient.type = ClientMessage; + e.xclient.message_type = atom1; /* leading message */ + e.xclient.display = disp; + e.xclient.window = handle_P; + e.xclient.format = 8; + + X11_errors_trap(); + //XLockDisplay(disp); + do { + unsigned int i; + for (i = 0; i < 20 && i + pos <= len; ++i) + e.xclient.data.b[i] = message_P[i + pos]; + XSendEvent(disp, w_P, False, 0, &e); + + e.xclient.message_type = atom2; /* following messages */ + pos += i; + } while (pos <= len); + + XSync(disp, False); + ok = X11_errors_untrap(); + + if (!ok) + ERRORA("Sending message failed with status %d\n", SKYPIAX_P_LOG, xerror); + //XUnlockDisplay(disp); + + return 1; +} + +int skypiax_skype_present(struct SkypiaxHandles *SkypiaxHandles) +{ + Atom skype_inst = XInternAtom(SkypiaxHandles->disp, "_SKYPE_INSTANCE", True); + + Atom type_ret; + int format_ret; + unsigned long nitems_ret; + unsigned long bytes_after_ret; + unsigned char *prop; + int status; + private_t *tech_pvt = NULL; + + X11_errors_trap(); + //XLockDisplay(disp); + status = + XGetWindowProperty(SkypiaxHandles->disp, DefaultRootWindow(SkypiaxHandles->disp), + skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, + &nitems_ret, &bytes_after_ret, &prop); + //XUnlockDisplay(disp); + X11_errors_untrap(); + + /* sanity check */ + if (status != Success || format_ret != 32 || nitems_ret != 1) { + SkypiaxHandles->skype_win = (Window) - 1; + DEBUGA_SKYPE("Skype instance not found\n", SKYPIAX_P_LOG); + return 0; + } + + SkypiaxHandles->skype_win = *(const unsigned long *) prop & 0xffffffff; + DEBUGA_SKYPE("Skype instance found with id #%d\n", SKYPIAX_P_LOG, + (unsigned int) SkypiaxHandles->skype_win); + return 1; +} + +void skypiax_skype_clean_disp(void *data) +{ + + int *dispptr; + int disp; + private_t *tech_pvt = NULL; + + dispptr = data; + disp = *dispptr; + + if (disp) { + DEBUGA_SKYPE("to be destroyed disp %d\n", SKYPIAX_P_LOG, disp); + close(disp); + DEBUGA_SKYPE("destroyed disp\n", SKYPIAX_P_LOG); + } else { + DEBUGA_SKYPE("NOT destroyed disp\n", SKYPIAX_P_LOG); + } + DEBUGA_SKYPE("OUT destroyed disp\n", SKYPIAX_P_LOG); + skypiax_sleep(1000); +} + +void * skypiax_do_skypeapi_thread_func(void *obj) +{ + + private_t *tech_pvt = obj; + struct SkypiaxHandles *SkypiaxHandles; + char buf[512]; + Display *disp = NULL; + Window root = -1; + Window win = -1; + + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + + 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); + } + SkypiaxHandles = &tech_pvt->SkypiaxHandles; + disp = XOpenDisplay(tech_pvt->X11_display); + if (!disp) { + ERRORA("Cannot open X Display '%s', exiting skype thread\n", SKYPIAX_P_LOG, + tech_pvt->X11_display); + running=0; + return NULL; + } else { + DEBUGA_SKYPE("X Display '%s' opened\n", SKYPIAX_P_LOG, tech_pvt->X11_display); + } + + int xfd; + xfd = XConnectionNumber(disp); + fcntl(xfd, F_SETFD, FD_CLOEXEC); + + //FIXME pthread_cleanup_push(skypiax_skype_clean_disp, &xfd); + + SkypiaxHandles->disp = disp; + + if (skypiax_skype_present(SkypiaxHandles)) { + root = DefaultRootWindow(disp); + win = + XCreateSimpleWindow(disp, root, 0, 0, 1, 1, 0, + BlackPixel(disp, DefaultScreen(disp)), BlackPixel(disp, + DefaultScreen + (disp))); + + SkypiaxHandles->win = win; + + snprintf(buf, 512, "NAME skypiax"); + + if (!skypiax_skype_send_message(SkypiaxHandles, buf)) { + ERRORA + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", + SKYPIAX_P_LOG); + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; + return NULL; + } + + snprintf(buf, 512, "PROTOCOL 6"); + if (!skypiax_skype_send_message(SkypiaxHandles, buf)) { + ERRORA + ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", + SKYPIAX_P_LOG); + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; + return NULL; + } + + /* perform an events loop */ + XEvent an_event; + char buf[21]; /* can't be longer */ + char buffer[17000]; + char *b; + int i; + + b = buffer; + + while (1) { + XNextEvent(disp, &an_event); + if (!running) + break; + switch (an_event.type) { + case ClientMessage: + + if (an_event.xclient.format != 8) + break; + + for (i = 0; i < 20 && an_event.xclient.data.b[i] != '\0'; ++i) + buf[i] = an_event.xclient.data.b[i]; + + buf[i] = '\0'; + + strcat(buffer, buf); + + if (i < 20) { /* last fragment */ + unsigned int howmany; + + howmany = strlen(b) + 1; + + howmany = write(SkypiaxHandles->fdesc[1], b, howmany); + memset(buffer, '\0', 17000); + } + + break; + default: + break; + } + } + } else { + ERRORA + ("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", + SKYPIAX_P_LOG); + running=0; + return NULL; + } + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; + return NULL; + +} +#endif // WIN32 + +int skypiax_skype_write(private_t * tech_pvt, char *msg_to_skype) +{ +#ifdef WIN32 + static char acInputRow[1024]; + COPYDATASTRUCT oCopyData; +#else /* WIN32 */ + struct SkypiaxHandles *SkypiaxHandles; +#endif /* WIN32 */ + + DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPIAX_P_LOG, msg_to_skype); + +#ifdef WIN32 + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + sprintf(acInputRow, "%s", msg_to_skype); + if (option_debug > 100) + DEBUGA_SKYPE("acInputRow: |||%s||||\n", SKYPIAX_P_LOG, acInputRow); + /* send command to skype */ + oCopyData.dwData = 0; + oCopyData.lpData = acInputRow; + oCopyData.cbData = strlen(acInputRow) + 1; + if (oCopyData.cbData != 1) { + if (SendMessage + (tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle, WM_COPYDATA, + (WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, + (LPARAM) & oCopyData) == FALSE) { + ERRORA + ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax (Asterisk), then restart Skype from the menu, then launch Skypiax and try again.\n", + SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + } +#else /* WIN32 */ + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + SkypiaxHandles = &tech_pvt->SkypiaxHandles; + + if (!skypiax_skype_send_message(SkypiaxHandles, msg_to_skype)) { + ERRORA + ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax (Asterisk), then restart Skype from the menu, then launch Skypiax and try again.\n", + SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } +#endif /* WIN32 */ + + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; + +} + +int skypiax_skype_read(private_t * tech_pvt) +{ + + char read_from_pipe[4096]; + char messaggio[4096]; + char messaggio_2[4096]; + char *buf, obj[512] = "", id[512] = "", prop[512] = "", value[512] = "", *where; + char **stringp = NULL; + int rt; + int a; + unsigned int howmany; + unsigned int i; +#ifndef WIN32 + int fdselect; + fd_set fs; + struct timeval to; +#endif /* WIN32 */ + + if (option_debug > 100) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + memset(read_from_pipe, 0, 4096); + memset(messaggio, 0, 4096); + memset(messaggio_2, 0, 4096); + +#ifdef WIN32 + rt = 1; +#else /* WIN32 */ + fdselect = tech_pvt->SkypiaxHandles.fdesc[0]; + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //500 msec + to.tv_sec = 0; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ + + if (rt > 0) { + if (tech_pvt->SkypiaxHandles.fdesc[0]) { + howmany = sizeof(read_from_pipe); +#ifdef WIN32 + skypiax_file_read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, &howmany); +#else /* WIN32 */ + howmany = + read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, sizeof(read_from_pipe)); +#endif /* WIN32 */ + + a = 0; + for (i = 0; i < howmany; i++) { + messaggio[a] = read_from_pipe[i]; + a++; + + if (read_from_pipe[i] == '\0') { + + //DEBUGA_SKYPE("read_skype: howmany=%d, i=%d, a=%d, |||%s||| \n", SKYPIAX_P_LOG, howmany, i, a, messaggio); + DEBUGA_SKYPE("READING: |||%s||| \n", SKYPIAX_P_LOG, messaggio); + + if (!strcasecmp(messaggio, "ERROR 68")) { /* not yet protocol specified, + just authorized */ + DEBUGA_SKYPE + ("If I don't connect immediately, please give the Skype client authorization to be connected by Skypiax (and to not ask you again)\n", + SKYPIAX_P_LOG); + skypiax_sleep(1000000); + skypiax_skype_write(tech_pvt, "PROTOCOL 6"); + skypiax_sleep(10000); + return 0; + } + + if (!strncasecmp(messaggio, "ERROR 92 CALL", 12)) { + ERRORA("Skype got ERROR: |||%s|||, the number we called was not recognized\n", + SKYPIAX_P_LOG, messaggio); + tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED; + if (option_debug) + DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPIAX_P_LOG); + tech_pvt->skype_call_id[0] = '\0'; + + if (tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + return CALLFLOW_INCOMING_HANGUP; + } else { + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + } + } + + strncpy(messaggio_2, messaggio, sizeof(messaggio) - 1); + + buf = messaggio; + stringp = &buf; + where = strsep(stringp, " "); + if (!where) { + WARNINGA("Skype MSG without spaces: %s\n", SKYPIAX_P_LOG, messaggio); + } + + if (!strcasecmp(messaggio, "#333")) { + /* DEBUGA_SKYPE("Skype MSG: messaggio_2: %s, messaggio2[11]: %s\n", SKYPIAX_P_LOG, + * messaggio_2, &messaggio_2[11]); */ + memset(tech_pvt->skype_friends, 0, 4096); + strncpy(tech_pvt->skype_friends, &messaggio_2[11], 4095); + } + if (!strcasecmp(messaggio, "#222")) { + /* DEBUGA_SKYPE("Skype MSG: messaggio_2: %s, messaggio2[10]: %s\n", SKYPIAX_P_LOG, + * messaggio_2, &messaggio_2[10]); */ + memset(tech_pvt->skype_fullname, 0, 512); + strncpy(tech_pvt->skype_fullname, &messaggio_2[10], 511); + } + if (!strcasecmp(messaggio, "#765")) { + /* DEBUGA_SKYPE("Skype MSG: messaggio_2: %s, messaggio2[10]: %s\n", SKYPIAX_P_LOG, + * messaggio_2, &messaggio_2[10]); */ + memset(tech_pvt->skype_displayname, 0, 512); + strncpy(tech_pvt->skype_displayname, &messaggio_2[10], 511); + } + if (!strcasecmp(messaggio, "ERROR")) { + ERRORA("Skype got ERROR: |||%s|||\n", SKYPIAX_P_LOG, messaggio); + tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED; + if (option_debug) + DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPIAX_P_LOG); + tech_pvt->skype_call_id[0] = '\0'; + + if (tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + return CALLFLOW_INCOMING_HANGUP; + } else { + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + } + } + if (!strcasecmp(messaggio, "CURRENTUSERHANDLE")) { + strncpy(obj, where, sizeof(obj) - 1); + + where = strsep(stringp, " "); + + strncpy(id, where, sizeof(id) - 1); + + 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); + } + } + + if (!strcasecmp(messaggio, "USER")) { + strncpy(obj, where, sizeof(obj) - 1); + + where = strsep(stringp, " "); + + strncpy(id, where, sizeof(id) - 1); + + where = strsep(stringp, " "); + + strncpy(prop, where, sizeof(prop) - 1); + + if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) { + char msg_to_skype[256]; + DEBUGA_SKYPE("Skype MSG: messaggio: %s, obj: %s, id: %s, prop: %s!\n", + SKYPIAX_P_LOG, messaggio, obj, id, prop); + + //FIXME: TODO: allow authorization based on config param + sprintf(msg_to_skype, "SET USER %s ISAUTHORIZED TRUE", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + } + } + + if (!strcasecmp(messaggio, "MESSAGE")) { + strncpy(obj, where, sizeof(obj) - 1); + + where = strsep(stringp, " "); + + strncpy(id, where, sizeof(id) - 1); + + where = strsep(stringp, " "); + + strncpy(prop, where, sizeof(prop) - 1); + + if (!strcasecmp(prop, "STATUS")) { + + where = strsep(stringp, " "); + + strncpy(value, where, sizeof(value) - 1); + + if (!strcasecmp(value, "RECEIVED")) { + char msg_to_skype[256]; + DEBUGA_SKYPE + ("Skype MSG: messaggio: %s, obj: %s, id: %s, prop: %s value: %s!\n", + SKYPIAX_P_LOG, messaggio, obj, id, prop, value); + + //FIXME: TODO: allow authorization based on config param + sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + } + } else if (!strcasecmp(prop, "BODY")) { + char msg_to_skype[256]; + + DEBUGA_SKYPE("Skype MSG: messaggio: %s, obj: %s, id: %s, prop: %s!\n", + SKYPIAX_P_LOG, messaggio, obj, id, prop); + + //FIXME: TODO: on config param ??? + sprintf(msg_to_skype, "SET MESSAGE %s SEEN", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + } + + } + + if (!strcasecmp(messaggio, "CALL")) { + + strncpy(obj, where, sizeof(obj) - 1); + + where = strsep(stringp, " "); + + strncpy(id, where, sizeof(id) - 1); + + where = strsep(stringp, " "); + + strncpy(prop, where, sizeof(prop) - 1); + + where = strsep(stringp, " "); + + strncpy(value, where, sizeof(value) - 1); + + where = strsep(stringp, " "); + + 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"); + + if (!strcasecmp(prop, "PARTNER_HANDLE")) { + strncpy(tech_pvt->callid_number, value, + sizeof(tech_pvt->callid_number) - 1); + DEBUGA_SKYPE + ("the skype_call %s caller PARTNER_HANDLE (tech_pvt->callid_number) is: %s\n", + SKYPIAX_P_LOG, id, tech_pvt->callid_number); + return CALLFLOW_INCOMING_RING; + } + if (!strcasecmp(prop, "PARTNER_DISPNAME")) { + snprintf(tech_pvt->callid_name, sizeof(tech_pvt->callid_name) - 1, "%s%s%s", + value, where ? " " : "", where ? where : ""); + DEBUGA_SKYPE + ("the skype_call %s caller PARTNER_DISPNAME (tech_pvt->callid_name) is: %s\n", + SKYPIAX_P_LOG, id, tech_pvt->callid_name); + } + if (!strcasecmp(prop, "CONF_ID") && !strcasecmp(value, "0")) { + DEBUGA_SKYPE("the skype_call %s is NOT a conference call\n", SKYPIAX_P_LOG, + id); + if (tech_pvt->interface_state == SKYPIAX_STATE_DOWN) + tech_pvt->interface_state = SKYPIAX_STATE_PRERING; + } + if (!strcasecmp(prop, "CONF_ID") && strcasecmp(value, "0")) { + DEBUGA_SKYPE("the skype_call %s is a conference call\n", SKYPIAX_P_LOG, id); + if (tech_pvt->interface_state == SKYPIAX_STATE_DOWN) + tech_pvt->interface_state = SKYPIAX_STATE_PRERING; + } + + if (!strcasecmp(prop, "DTMF")) { + + DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); + + dtmf_received(tech_pvt, value); + } + + if (!strcasecmp(prop, "FAILUREREASON")) { + DEBUGA_SKYPE + ("Skype has FAILED on skype_call %s. Let's wait for the FAILED message.\n", + SKYPIAX_P_LOG, id); + } + if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) { + if (strcasecmp(id, tech_pvt->skype_call_id)) { + strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + if (option_debug > 1) + DEBUGA_SKYPE + ("We called a Skype contact and he answered us on skype_call: %s.\n", + SKYPIAX_P_LOG, id); + } + } + + if (!strcasecmp(prop, "STATUS")) { + + if (!strcasecmp(value, "RINGING")) { + char msg_to_skype[1024]; + if (tech_pvt->interface_state != SKYPIAX_STATE_DIALING) { + /* we are not calling out */ + + if (!strlen(tech_pvt->skype_call_id)) { //FIXME + /* we are not inside an active call */ + tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING; + tech_pvt->interface_state = SKYPIAX_STATE_RING; + /* no owner, no active call, let's answer */ + skypiax_skype_write(tech_pvt, "SET AGC OFF"); + skypiax_sleep(10000); + skypiax_skype_write(tech_pvt, "SET AEC OFF"); + skypiax_sleep(10000); + sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + skypiax_sleep(10000); + sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + skypiax_sleep(10000); + sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + if (option_debug) + DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", + SKYPIAX_P_LOG, id); + strncpy(tech_pvt->skype_call_id, id, + sizeof(tech_pvt->skype_call_id) - 1); + } else { + /* we're owned, we're in a call, let's refuse */ + sprintf(msg_to_skype, "ALTER CALL %s END HANGUP", id); + skypiax_skype_write(tech_pvt, msg_to_skype); + skypiax_sleep(10000); + DEBUGA_SKYPE + ("We have NOT answered a Skype RING on skype_call %s, because we are already in a skypiax call\n", + SKYPIAX_P_LOG, id); + + } + } else { + /* we are calling out */ + tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING; + tech_pvt->interface_state = SKYPIAX_STATE_RINGING; + //FIXME ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING); + strncpy(tech_pvt->skype_call_id, id, + sizeof(tech_pvt->skype_call_id) - 1); + DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", + SKYPIAX_P_LOG, id); + } + } else if (!strcasecmp(value, "EARLYMEDIA")) { + tech_pvt->skype_callflow = CALLFLOW_STATUS_EARLYMEDIA; + tech_pvt->interface_state = SKYPIAX_STATE_DIALING; + //FIXME ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING); + DEBUGA_SKYPE("Our remote party in skype_call %s is EARLYMEDIA\n", + SKYPIAX_P_LOG, id); + } else if (!strcasecmp(value, "MISSED")) { + DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id); + + } else if (!strcasecmp(value, "FINISHED")) { + //tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED; + if (option_debug) + DEBUGA_SKYPE("skype_call %s now is DOWN\n", SKYPIAX_P_LOG, id); + tech_pvt->skype_call_id[0] = '\0'; + + if (tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + //tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + return CALLFLOW_INCOMING_HANGUP; + } else { + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + } + + } else if (!strcasecmp(value, "CANCELLED")) { + tech_pvt->skype_callflow = CALLFLOW_STATUS_CANCELLED; + if (option_debug) + DEBUGA_SKYPE + ("we tried to call Skype on skype_call %s and Skype has now CANCELLED\n", + SKYPIAX_P_LOG, id); + tech_pvt->skype_call_id[0] = '\0'; + + if (tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + return CALLFLOW_INCOMING_HANGUP; + } else { + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + } + } else if (!strcasecmp(value, "FAILED")) { + tech_pvt->skype_callflow = CALLFLOW_STATUS_FAILED; + if (option_debug) + DEBUGA_SKYPE + ("we tried to call Skype on skype_call %s and Skype has now FAILED\n", + SKYPIAX_P_LOG, id); + tech_pvt->skype_call_id[0] = '\0'; + strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return CALLFLOW_INCOMING_HANGUP; + } else if (!strcasecmp(value, "REFUSED")) { + if (!strcasecmp(id, tech_pvt->skype_call_id)) { + /* this is the id of the call we are in, probably we generated it */ + tech_pvt->skype_callflow = CALLFLOW_STATUS_REFUSED; + if (option_debug) + DEBUGA_SKYPE + ("we tried to call Skype on skype_call %s and Skype has now REFUSED\n", + SKYPIAX_P_LOG, id); + strncpy(tech_pvt->skype_call_id, id, + sizeof(tech_pvt->skype_call_id) - 1); + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + tech_pvt->skype_call_id[0] = '\0'; + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return CALLFLOW_INCOMING_HANGUP; + } else { + /* we're here because were us that refused an incoming call */ + DEBUGA_SKYPE("we REFUSED skype_call %s\n", SKYPIAX_P_LOG, id); + + } + } else if (!strcasecmp(value, "ROUTING")) { + tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING; + tech_pvt->interface_state = SKYPIAX_STATE_DIALING; + strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id); + } else if (!strcasecmp(value, "UNPLACED")) { + tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED; + tech_pvt->interface_state = SKYPIAX_STATE_DIALING; + strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id); + } else if (!strcasecmp(value, "INPROGRESS")) { + char msg_to_skype[1024]; + tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS; + strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + tech_pvt->interface_state = SKYPIAX_STATE_UP; + if (option_debug > 1) + DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id); + + if (option_debug > 1) + DEBUGA_SKYPE("skype_call: %s SKYPIAX_CONTROL_ANSWER sent\n", + SKYPIAX_P_LOG, id); + + start_audio_threads(tech_pvt); + + sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id, + tech_pvt->tcp_srv_port); + skypiax_skype_write(tech_pvt, msg_to_skype); + skypiax_sleep(100000); + sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id, + tech_pvt->tcp_cli_port); + skypiax_skype_write(tech_pvt, msg_to_skype); + skypiax_sleep(100000); + + tech_pvt->skype_callflow = SKYPIAX_STATE_UP; + + if (!strlen(tech_pvt->session_uuid_str)) { + + DEBUGA_SKYPE("New Inbound Channel!\n", SKYPIAX_P_LOG); + + new_inbound_channel(tech_pvt); + } else { + + DEBUGA_SKYPE("Outbound Channel Answered!\n", SKYPIAX_P_LOG); + + outbound_channel_answered(tech_pvt); + } + + } else { + WARNINGA("skype_call: %s, STATUS: %s is not recognized\n", SKYPIAX_P_LOG, + id, value); + + } + } //STATUS + + } //CALL + + a = 0; + } //message end + } //read_from_pipe + + } + } + + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + return 0; +} + +int skypiax_skype_senddigit(private_t * tech_pvt, char digit) +{ + char msg_to_skype[1024]; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + DEBUGA_SKYPE("DIGIT received: %c\n", SKYPIAX_P_LOG, digit); + + sprintf(msg_to_skype, "SET CALL %s DTMF %c", tech_pvt->skype_call_id, digit); + + skypiax_skype_write(tech_pvt, msg_to_skype); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + +int skypiax_skype_call(private_t * tech_pvt, char *rdest, int timeout) +{ + char msg_to_skype[1024]; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + skypiax_sleep(5000); + DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); + skypiax_skype_write(tech_pvt, "SET AGC OFF"); + skypiax_sleep(10000); + skypiax_skype_write(tech_pvt, "SET AEC OFF"); + skypiax_sleep(10000); + + sprintf(msg_to_skype, "CALL %s", rdest); + if (skypiax_skype_write(tech_pvt, 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; + } + //FIXME ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING); + return 0; +} + +#if 0 +static switch_status_t channel_write_frame(switch_core_session_t * session, + switch_frame_t * frame, switch_io_flag_t flags, + int stream_id) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + unsigned int sent; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + if (!switch_test_flag(tech_pvt, TFLAG_IO)) { + ERRORA("CIAPA \n", SKYPIAX_P_LOG); + return SWITCH_STATUS_FALSE; + } +#ifdef BIGENDIAN + if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) { + switch_swap_linear(frame->data, (int) frame->datalen / 2); + } +#endif + + sent = frame->datalen; +#ifdef WIN32 + switch_file_write(tech_pvt->audioskypepipe[1], frame->data, &sent); +#else /* WIN32 */ + sent = write(tech_pvt->audioskypepipe[1], frame->data, sent); +#endif /* WIN32 */ + if (sent != frame->datalen && sent != -1) { + DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); + } + + return SWITCH_STATUS_SUCCESS; +} +#endif + + +int skypiax_skypeaudio_write(struct skypiax_pvt *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; +} +int skypiax_console_skype(int fd, int argc, char *argv[]) +{ + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + char skype_msg[1024]; + int i, a, c; + + if (argc == 1) { + return RESULT_SHOWUSAGE; + } + if (!p) { + ast_cli(fd, + "No \"current\" console for skypiax_skype, please enter 'help console'\n"); + return RESULT_SUCCESS; + } + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + if (!p->skype) { + ast_cli(fd, "The \"current\" console is not connected to a Skype client'\n"); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; + } + + memset(skype_msg, 0, sizeof(skype_msg)); + c = 0; + for (i = 1; i < argc; i++) { + for (a = 0; a < strlen(argv[i]); a++) { + skype_msg[c] = argv[i][a]; + c++; + if (c == 1022) + break; + } + if (i != argc - 1) { + skype_msg[c] = ' '; + c++; + } + if (c == 1023) + break; + } + skypiax_skype_write(p, skype_msg); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return RESULT_SUCCESS; +} +int skypiax_console_skypiax_dir_import(int fd, int argc, char *argv[]) +{ + //int res; + struct skypiax_pvt *p = skypiax_console_find_desc(skypiax_console_active); + //char list_command[64]; + char fn[256]; + char date[256] = ""; + time_t t; + char *configfile = SKYPIAX_DIR_CONFIG; + int add_to_skypiax_dir_conf = 1; + //int fromskype = 0; + //int fromcell = 0; + +#if 0 + if(directoriax_entry_extension){ + skypiax_dir_entry_extension=directoriax_entry_extension; + }else{ + ast_cli(fd, "No 'directoriax_entry_extension', you MUST have loaded directoriax.so\n"); + return RESULT_SUCCESS; + } +#endif + + if (argc != 2) + return RESULT_SHOWUSAGE; + if (!p) { + ast_cli(fd, "No \"current\" console ???, please enter 'help skypiax_console'\n"); + return RESULT_SUCCESS; + } + + if (!strcasecmp(argv[1], "add")) + add_to_skypiax_dir_conf = 1; + else if (!strcasecmp(argv[1], "replace")) + add_to_skypiax_dir_conf = 0; + else { + ast_cli(fd, "\n\nYou have neither specified 'add' nor 'replace'\n\n"); + return RESULT_SHOWUSAGE; + } + +#if 0 + if (!strcasecmp(argv[2], "fromskype")) + fromskype = 1; + else if (!strcasecmp(argv[2], "fromcell")) + fromcell = 1; + else { + ast_cli(fd, "\n\nYou have neither specified 'fromskype' nor 'fromcell'\n\n"); + return RESULT_SHOWUSAGE; + } + + if (fromcell) { + ast_cli(fd, + "Importing from cellphone is currently supported only on \"AT\" cellphones :( !\n"); + //fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + return RESULT_SUCCESS; + } + + if (fromskype) + if (!p->skype) { + ast_cli(fd, "Importing from skype is supported by skypiax_dir on chan_skypiax!\n"); + //fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + return RESULT_SUCCESS; + } + + if (fromcell || fromskype) + if (argc != 3) { + ast_cli(fd, + "\n\nYou don't have to specify a filename with 'fromcell' or with 'fromskype'\n\n"); + return RESULT_SHOWUSAGE; + } +#endif + + /*******************************************************************************************/ + + if (configfile[0] == '/') { + ast_copy_string(fn, configfile, sizeof(fn)); + } else { + snprintf(fn, sizeof(fn), "%s/%s", ast_config_AST_CONFIG_DIR, configfile); + } + if (option_debug) + NOTICA("Opening '%s'\n", SKYPIAX_P_LOG, fn); + time(&t); + ast_copy_string(date, ctime(&t), sizeof(date)); + + if (add_to_skypiax_dir_conf) + p->phonebook_writing_fp = fopen(fn, "a+"); + else + p->phonebook_writing_fp = fopen(fn, "w+"); + + if (p->phonebook_writing_fp) { + if (add_to_skypiax_dir_conf) { + if (option_debug) + NOTICA("Opened '%s' for appending \n", SKYPIAX_P_LOG, fn); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, ";! Update Date: %s", date); + fprintf(p->phonebook_writing_fp, ";! Updated by: %s, %d\n", __FILE__, __LINE__); + fprintf(p->phonebook_writing_fp, ";!\n"); + } else { + if (option_debug) + NOTICA("Opened '%s' for writing \n", SKYPIAX_P_LOG, fn); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, ";! Automatically generated configuration file\n"); + fprintf(p->phonebook_writing_fp, ";! Filename: %s (%s)\n", configfile, fn); + fprintf(p->phonebook_writing_fp, ";! Creation Date: %s", date); + fprintf(p->phonebook_writing_fp, ";! Generated by: %s, %d\n", __FILE__, __LINE__); + fprintf(p->phonebook_writing_fp, ";!\n"); + fprintf(p->phonebook_writing_fp, "[general]\n\n"); + fprintf(p->phonebook_writing_fp, "[default]\n"); + } + + /*******************************************************************************************/ + //if (fromskype) { + if (p->skype) { + WARNINGA + ("About to querying the Skype client 'Contacts', it may take some moments... Don't worry.\n", + SKYPIAX_P_LOG); + if (p->skype_thread != AST_PTHREADT_NULL) { + char msg_to_skype[1024]; + + p->skype_friends[0] = '\0'; + sprintf(msg_to_skype, "#333 SEARCH FRIENDS"); + if (skypiax_skype_write(p, msg_to_skype) < 0) { + return -1; + } + + int friends_count = 0; + while (p->skype_friends[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + friends_count++; + if (friends_count > 20000) { + return -1; /* FIXME */ + } + } + + } + + if (p->skype_thread != AST_PTHREADT_NULL) { + char msg_to_skype[1024]; + + if (p->skype_friends[0] != '\0') { + char *buf, *where; + char **stringp; + int skype_dir_file_written = 0; + + buf = p->skype_friends; + stringp = &buf; + where = strsep(stringp, ", "); + while (where) { + if (where[0] != '\0') { + /* + * So, we have the Skype username (the HANDLE, I think is called). + * But we want to call the names we see in the Skype contact list + * So, let's check the DISPLAYNAME (the end user modified contact name) + * Then, we check the FULLNAME (that appears as it was the DISPLAYNAME + * if the end user has not modify it) + * If we still have neither DISPLAYNAME nor FULLNAME, we'll use the + * Skipe username (the HANDLE) + */ + + p->skype_displayname[0] = '\0'; + sprintf(msg_to_skype, "#765 GET USER %s DISPLAYNAME", where); + skypiax_skype_write(p, msg_to_skype); + int displayname_count = 0; + while (p->skype_displayname[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + displayname_count++; + if (displayname_count > 20000) + return -1; /* FIXME */ + } + if (p->skype_displayname[0] != '\0') { + char *where2; + char sanitized[300]; + + sanitized[0] = '\0'; + + where2 = strstr(p->skype_displayname, "DISPLAYNAME "); + if (where2) { + + /* there can be some *smart* that makes a displayname + * that is different than first<space>last, */ + /* maybe initials, simbols, slashes, + * something smartish... let's check */ + + if (where2[12] != '\0') { + int i = 12; + int x = 0; + int spaces = 0; + int last_char_was_space = 0; + + for (i = 12; i < strlen(where2) && x < 299; i++) { + if (!isalnum(where2[i])) { + if (!isblank(where2[i])) { + /* bad char */ + continue; + } + /* is a space */ + if (last_char_was_space == 1) /* do not write 2 consecutive spaces */ + continue; + last_char_was_space = 1; + sanitized[x] = ' '; + x++; + continue; + } + /* is alphanum */ + last_char_was_space = 0; + sanitized[x] = where2[i]; + x++; + continue; + } + + sanitized[x] = '\0'; + if (spaces == 0) { + } + DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", + SKYPIAX_P_LOG, sanitized, where, &where2[12]); + } + + if (where2[12] != '\0') { + skypiax_dir_entry_extension++; + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + } + skype_dir_file_written = 1; + + } + } + } + p->skype_displayname[0] = '\0'; + + p->skype_fullname[0] = '\0'; + sprintf(msg_to_skype, "#222 GET USER %s FULLNAME", where); + skypiax_skype_write(p, msg_to_skype); + int fullname_count = 0; + while (p->skype_fullname[0] == '\0') { + /* FIXME needs a timeout, can't wait forever! + * eg. when skype is running but not connected! */ + usleep(100); + fullname_count++; + if (fullname_count > 20000) + return -1; /* FIXME */ + } + if (p->skype_fullname[0] != '\0') { + char *where2; + char sanitized[300]; + + where2 = strstr(p->skype_fullname, "FULLNAME "); + if (where2) { + + /* there can be some *smart* that makes a fullname + * that is different than first<space>last, */ + /* maybe initials, simbols, slashes, + * something smartish... let's check */ + + if (where2[9] != '\0') { + int i = 9; + int x = 0; + int spaces = 0; + int last_char_was_space = 0; + + for (i = 9; i < strlen(where2) && x < 299; i++) { + if (!isalnum(where2[i])) { + if (!isblank(where2[i])) { + /* bad char */ + continue; + } + /* is a space */ + if (last_char_was_space == 1) /* do not write 2 consecutive spaces */ + continue; + last_char_was_space = 1; + sanitized[x] = ' '; + x++; + continue; + } + /* alphanum */ + last_char_was_space = 0; + sanitized[x] = where2[i]; + x++; + continue; + } + + sanitized[x] = '\0'; + if (spaces == 0) { + } + DEBUGA_SKYPE("sanitized=|%s|, where=|%s|, where2=|%s|\n", + SKYPIAX_P_LOG, sanitized, where, &where2[9]); + } + + if (skype_dir_file_written == 0) { + skypiax_dir_entry_extension++; + if (where2[9] != '\0') { + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, sanitized, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + + } + + } else { + if (where[0] == '+' || isdigit(where[0])) { /* is a skypeout number */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKO,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, where, "no", + p->skypiax_dir_entry_extension_prefix, "2", + skypiax_dir_entry_extension, "yes", "not_specified"); + } else { /* is a skype name */ + fprintf(p->phonebook_writing_fp, + "%s => ,%sSKY,,,hidefromdir=%s|phonebook_direct_calling_ext=%d%s%.4d|phonebook_entry_fromskype=%s|phonebook_entry_owner=%s\n", + where, where, "no", + p->skypiax_dir_entry_extension_prefix, "1", + skypiax_dir_entry_extension, "yes", "not_specified"); + + } + } + } + + skype_dir_file_written = 0; + + } + + } + p->skype_fullname[0] = '\0'; + + } + where = strsep(stringp, ", "); + } + + p->skype_friends[0] = '\0'; + } + } + } else { + + ast_cli(fd, + "Skype not configured on the 'current' console, not importing from Skype client!\n"); + } + //} + /*******************************************************************************************/ + /*******************************************************************************************/ + } else { + ast_cli(fd, "\n\nfailed to open the skypiax_dir.conf configuration file: %s\n", fn); + ERRORA("failed to open the skypiax_dir.conf configuration file: %s\n", SKYPIAX_P_LOG, + fn); + return RESULT_FAILURE; + } + + fclose(p->phonebook_writing_fp); + //skypiax_dir_create_extensions(); + + return RESULT_SUCCESS; +}

1 0

[commit] r11576 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: gmaruzz Date: Sat Jan 31 03:25:47 2009 New Revision: 11576 Log: skypiax: moving switch specific things out of skypiax_protocol.c, and cosmetics Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Sat Jan 31 03:25:47 2009 @@ -706,6 +706,8 @@ uint32_t interface_id = 0, to = 0, max = 0; + tech_pvt = NULL; + for (param = switch_xml_child(myinterface, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -808,13 +810,16 @@ memset(&newconf, '\0', sizeof(newconf)); globals.SKYPIAX_INTERFACES[interface_id] = newconf; - DEBUGA_SKYPE("CONFIGURING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + + tech_pvt=&globals.SKYPIAX_INTERFACES[interface_id]; + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].interface_id, id); if (name) { switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].name, name); } else { switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].name, "N/A"); } + DEBUGA_SKYPE("CONFIGURING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); #ifdef WIN32 globals.SKYPIAX_INTERFACES[interface_id].tcp_cli_port = (unsigned short) atoi(tcp_cli_port); @@ -915,6 +920,8 @@ for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) { if (strlen(globals.SKYPIAX_INTERFACES[i].name)) { + tech_pvt = &globals.SKYPIAX_INTERFACES[i]; + DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].interface_id=%s\n", SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].interface_id); DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].X11_display=%s\n", @@ -1082,7 +1089,7 @@ skypiax_do_tcp_cli_thread, tech_pvt, skypiax_module_pool); DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); - skypiax_sleep(100000); + switch_sleep(100000); return 0; Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h Sat Jan 31 03:25:47 2009 @@ -245,7 +245,6 @@ int skypiax_skype_call(private_t * tech_pvt, char *idest, int timeout); int skypiax_skype_senddigit(private_t * tech_pvt, char digit); -#define skypiax_sleep switch_sleep void * skypiax_do_tcp_srv_thread_func(void *obj); void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj); 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 Jan 31 03:25:47 2009 @@ -1,5 +1,9 @@ #include "skypiax.h" +#define skypiax_sleep switch_sleep +#define skypiax_file_write switch_file_write +#define skypiax_file_read switch_file_read + extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; extern switch_endpoint_interface_t *skypiax_endpoint_interface; @@ -145,7 +149,7 @@ howmany = len; #ifdef WIN32 - switch_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); + skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); #else /* WIN32 */ howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); #endif /* WIN32 */ @@ -170,7 +174,7 @@ unsigned int howmany; howmany = len; - switch_file_write(tech_pvt->audiopipe[1], srv_in, &howmany); + skypiax_file_write(tech_pvt->audiopipe[1], srv_in, &howmany); #else /* WIN32 */ len = write(tech_pvt->audiopipe[1], srv_in, len); #endif /* WIN32 */ @@ -191,7 +195,7 @@ } #ifdef WIN32 - switch_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); + skypiax_file_write(tech_pvt->audiopipe[1], totalbuf, &howmany); #else /* WIN32 */ howmany = write(tech_pvt->audiopipe[1], totalbuf, howmany); #endif /* WIN32 */ @@ -222,14 +226,14 @@ } #ifdef WIN32 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); - switch_file_write(tech_pvt->audiopipe[1], kill_cli_buff, &kill_cli_size); + skypiax_file_write(tech_pvt->audiopipe[1], kill_cli_buff, &kill_cli_size); kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); - switch_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); + skypiax_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); tech_pvt->interface_state = SKYPIAX_STATE_DOWN; kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); - switch_file_write(tech_pvt->audiopipe[1], kill_cli_buff, &kill_cli_size); + skypiax_file_write(tech_pvt->audiopipe[1], kill_cli_buff, &kill_cli_size); kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); - switch_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); + skypiax_file_write(tech_pvt->audioskypepipe[1], kill_cli_buff, &kill_cli_size); #else /* WIN32 */ kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); len = write(tech_pvt->audiopipe[1], kill_cli_buff, kill_cli_size); @@ -357,7 +361,7 @@ if ((SAMPLERATE_SKYPIAX - 8000) == 0) { got = SAMPLES_PER_FRAME * sizeof(short); #ifdef WIN32 - switch_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); + skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); #else /* WIN32 */ got = read(tech_pvt->audioskypepipe[0], cli_in, got); #endif /* WIN32 */ @@ -387,7 +391,7 @@ } else if (SAMPLERATE_SKYPIAX == 16000) { got = SAMPLES_PER_FRAME * sizeof(short); #ifdef WIN32 - switch_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); + skypiax_file_read(tech_pvt->audioskypepipe[0], cli_in, &got); #else /* WIN32 */ got = read(tech_pvt->audioskypepipe[0], cli_in, got); #endif /* WIN32 */ @@ -495,7 +499,7 @@ if (rt > 0) { samples = SAMPLES_PER_FRAME * sizeof(short); #ifdef WIN32 - switch_file_read(tech_pvt->audiopipe[0], tech_pvt->read_frame.data, &samples); + 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); #endif /* WIN32 */ @@ -596,7 +600,7 @@ sizeof(msg_from_skype) - 2); howmany = strlen(msg_from_skype) + 1; - switch_file_write(tech_pvt->SkypiaxHandles.fdesc[1], msg_from_skype, &howmany); + 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); lReturnCode = 1; } @@ -778,8 +782,6 @@ } } - //switch_thread_exit(thread, SWITCH_STATUS_SUCCESS); - return NULL; } @@ -1134,7 +1136,7 @@ if (tech_pvt->SkypiaxHandles.fdesc[0]) { howmany = sizeof(read_from_pipe); #ifdef WIN32 - switch_file_read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, &howmany); + skypiax_file_read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, &howmany); #else /* WIN32 */ howmany = read(tech_pvt->SkypiaxHandles.fdesc[0], read_from_pipe, sizeof(read_from_pipe));

1 0

[commit] r11575 - freeswitch/trunk/src/include
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: mrene Date: Fri Jan 30 20:48:35 2009 New Revision: 11575 Log: add \remark to switch_ivr_uuid_bridge Modified: freeswitch/trunk/src/include/switch_ivr.h Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Jan 30 20:48:35 2009 @@ -466,6 +466,7 @@ \brief Bridge two existing sessions \param originator_uuid the uuid of the originator \param originatee_uuid the uuid of the originator + \remark Any custom state handlers on both channels will be deleted \return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uuid, const char *originatee_uuid);

1 0

[commit] r11574 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Jan '09

31 Jan '09

Author: brian Date: Fri Jan 30 18:16:27 2009 New Revision: 11574 Log: clean up arg vs expanded Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Jan 30 18:16:27 2009 @@ -1,3 +1,4 @@ + /* * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> @@ -592,7 +593,8 @@ if (ok) { switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (contains a variable)\n"); + abort(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname); } } switch_mutex_unlock(channel->profile_mutex); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 30 18:16:27 2009 @@ -1299,7 +1299,7 @@ log = switch_core_session_alloc(session, sizeof(*log)); log->app = switch_core_session_strdup(session, application_interface->interface_name); - log->arg = switch_core_session_strdup(session, arg); + log->arg = switch_core_session_strdup(session, expanded); for (lp = session->app_log; lp && lp->next; lp = lp->next); @@ -1311,13 +1311,13 @@ } switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); - switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, arg); + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded); switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded); switch_event_fire(&event); } @@ -1333,7 +1333,7 @@ const char *resp = switch_channel_get_variable(session->channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE); switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Response", resp ? resp : "_none_"); switch_event_fire(&event); }

1 0

[commit] r11573 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:46:00 2009 New Revision: 11573 Log: doh Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jan 30 17:46:00 2009 @@ -1224,7 +1224,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application(switch_core_session_t *session, const char *app, const char *arg) { switch_application_interface_t *application_interface; - char *expanded = NULL; if ((application_interface = switch_loadable_module_get_application_interface(app)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app); @@ -1252,7 +1251,7 @@ } } - switch_core_session_exec(session, application_interface, expanded); + switch_core_session_exec(session, application_interface, arg); UNPROTECT_INTERFACE(application_interface);

1 0

[commit] r11572 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Jan '09

30 Jan '09

Author: anthm Date: Fri Jan 30 17:43:12 2009 New Revision: 11572 Log: revert silence gen code for comparison Modified: freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Fri Jan 30 17:43:12 2009 @@ -201,6 +201,7 @@ } } +#if SILENCE_METHOD_ONE SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) { int16_t x; @@ -223,6 +224,31 @@ data++; } } +#else + +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) +{ + int16_t rnd = 0, rnd2, x; + uint32_t i; + int sum_rnd = 0; + + assert(divisor); + + rnd2 = (int16_t) (intptr_t) &data + switch_epoch_time_now(NULL); + + for (i = 0; i < samples; i++, sum_rnd = 0) { + for (x = 0; x < 10; x++) { + rnd += ((x + i) * rnd2); + sum_rnd += rnd; + } + switch_normalize_to_16bit(sum_rnd); + *data = (int16_t) ((int16_t) sum_rnd / (int) divisor); + + data++; + } +} + +#endif SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples) {

1 0