January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11520 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 17:12:50 2009 New Revision: 11520 Log: skypiax: compiles on win32 Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c 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 Tue Jan 27 17:12:50 2009 @@ -476,6 +476,7 @@ private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; + char *rdest; switch_core_session_add_stream(*new_session, NULL); @@ -545,7 +546,6 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - char *rdest; rdest = strchr(caller_profile->destination_number, '/'); *rdest++ = '\0'; @@ -630,6 +630,7 @@ switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, skypiax_module_pool); if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { ERRORA("open of %s failed\n", SKYPIAX_P_LOG, cf); + running=0; return SWITCH_STATUS_TERM; } 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 Tue Jan 27 17:12:50 2009 @@ -778,7 +778,7 @@ } } - switch_thread_exit(thread, SWITCH_STATUS_SUCCESS); + //switch_thread_exit(thread, SWITCH_STATUS_SUCCESS); return NULL; }

1 0

[commit] r11519 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 17:00:57 2009 New Revision: 11519 Log: skypiax: moving switch specific things out of skypiax_protocol.c 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 Tue Jan 27 17:00:57 2009 @@ -545,7 +545,19 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - skypiax_skype_call(tech_pvt, caller_profile->destination_number, 30, *new_session); + char *rdest; + + rdest = strchr(caller_profile->destination_number, '/'); + *rdest++ = '\0'; + + + skypiax_skype_call(tech_pvt, rdest, 30); + + switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(*new_session), + sizeof(tech_pvt->session_uuid_str)); + caller_profile = tech_pvt->caller_profile; + caller_profile->destination_number = rdest; + switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h Tue Jan 27 17:00:57 2009 @@ -242,8 +242,7 @@ int skypiax_skype_write(private_t * tech_pvt, char *msg_to_skype); int skypiax_skype_read(private_t * tech_pvt); -int skypiax_skype_call(private_t * tech_pvt, char *idest, int timeout, - switch_core_session_t * session); +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 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 Tue Jan 27 17:00:57 2009 @@ -1684,13 +1684,11 @@ return 0; } -int skypiax_skype_call(private_t * tech_pvt, char *idest, int timeout, - switch_core_session_t * session) +int skypiax_skype_call(private_t * tech_pvt, char *rdest, int timeout) { - char *rdest; char msg_to_skype[1024]; //private_t *tech_pvt; - switch_caller_profile_t *caller_profile; + //switch_caller_profile_t *caller_profile; //tech_pvt = p; @@ -1698,10 +1696,6 @@ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } skypiax_sleep(5000); - - rdest = strchr(idest, '/'); - *rdest++ = '\0'; - DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); skypiax_skype_write(tech_pvt, "SET AGC OFF"); skypiax_sleep(10000); @@ -1717,11 +1711,6 @@ } return -1; } - switch_copy_string(tech_pvt->session_uuid_str, switch_core_session_get_uuid(session), - sizeof(tech_pvt->session_uuid_str)); - caller_profile = tech_pvt->caller_profile; - caller_profile->destination_number = rdest; - //FIXME ast_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_RINGING); return 0; }

1 0

[commit] r11518 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mikej Date: Tue Jan 27 16:59:00 2009 New Revision: 11518 Log: sofia-sip: fix gcc 4.3 build (FSBUILD-105) Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 27 16:59:00 2009 @@ -1 +1 @@ -Thur Jan 20 17:23:18 CST 2009 +Tue Jan 27 15:54:10 MST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Tue Jan 27 16:59:00 2009 @@ -211,17 +211,18 @@ issize_t sl_payload_print(FILE *stream, char const *prefix, sip_payload_t const *pl) { char *s = pl->pl_data, *end = pl->pl_data + pl->pl_len; - size_t n, total = 0, crlf = 1; + size_t n, total = 0, crlf = 1, actual; while (s < end && *s != '\0') { n = strncspn(s, end - s, "\r\n"); crlf = strnspn(s + n, end - s - n, "\r\n"); if (prefix) fputs(prefix, stream), total += strlen(prefix); - if (fwrite(s, 1, n + crlf, stream) < 0) - return -1; - s += n + crlf; - total += n + crlf; + actual = fwrite(s, 1, n + crlf, stream) ; + if (actual == 0) + return -1; + s += actual; + total += actual; } if (crlf == 0) fputs("\n", stream), total++;

1 0

[commit] r11517 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 15:59:00 2009 New Revision: 11517 Log: skypiax: moving switch specific things out of skypiax_protocol.c 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 Tue Jan 27 15:59:00 2009 @@ -293,7 +293,7 @@ tech_pvt->read_frame.flags = SFF_NONE; *frame = NULL; - if (skypiax_skypeaudio_read(tech_pvt) != SWITCH_STATUS_SUCCESS) { + if (!skypiax_skypeaudio_read(tech_pvt)) { ERRORA("skypiax_skypeaudio_read ERROR\n", SKYPIAX_P_LOG); @@ -861,7 +861,7 @@ SWITCH_THREAD_STACKSIZE); switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id]. skypiax_skypeapi_thread, skypiax_skypeapi_thread_attr, - skypiax_skypeapi_thread_func, + skypiax_do_skypeapi_thread, &globals.SKYPIAX_INTERFACES[interface_id], skypiax_module_pool); @@ -1013,6 +1013,23 @@ return SWITCH_STATUS_SUCCESS; } +void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, + void *obj) +{ + return skypiax_do_tcp_srv_thread_func(obj); +} +void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, + void *obj) +{ + return skypiax_do_tcp_cli_thread_func(obj); +} +void *SWITCH_THREAD_FUNC skypiax_do_skypeapi_thread(switch_thread_t * thread, + void *obj) +{ + return skypiax_do_skypeapi_thread_func(obj); +} + + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h Tue Jan 27 15:59:00 2009 @@ -237,7 +237,7 @@ void *SWITCH_THREAD_FUNC skypiax_skypeapi_thread_func(switch_thread_t * thread, void *obj); void skypiax_tech_init(private_t * tech_pvt, switch_core_session_t * session); -switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt); +int skypiax_skypeaudio_read(private_t * tech_pvt); int skypiax_skypeaudio_init(private_t * tech_pvt); int skypiax_skype_write(private_t * tech_pvt, char *msg_to_skype); int skypiax_skype_read(private_t * tech_pvt); @@ -245,3 +245,13 @@ int skypiax_skype_call(private_t * tech_pvt, char *idest, int timeout, switch_core_session_t * session); 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); + +void * skypiax_do_tcp_cli_thread_func(void *obj); +void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, void *obj); + +void * skypiax_do_skypeapi_thread_func(void *obj); +void *SWITCH_THREAD_FUNC skypiax_do_skypeapi_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 Tue Jan 27 15:59:00 2009 @@ -12,8 +12,7 @@ #endif /* WIN32 */ /*************************************/ -static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, - void *obj) +void * skypiax_do_tcp_srv_thread_func(void *obj) { private_t *tech_pvt = obj; int s; @@ -155,7 +154,7 @@ } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); - switch_sleep(1000); + skypiax_sleep(1000); } else { ERRORA("len=%d\n", SKYPIAX_P_LOG, len); exit = 1; @@ -205,7 +204,7 @@ } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); - switch_sleep(1000); + skypiax_sleep(1000); } else { ERRORA("SRV len=%d\n", SKYPIAX_P_LOG, len); exit = 1; @@ -218,7 +217,7 @@ } else { if (rt) ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt); - switch_sleep(10000); + skypiax_sleep(10000); } } #ifdef WIN32 @@ -263,8 +262,7 @@ } return NULL; } -static void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, - void *obj) +void * skypiax_do_tcp_cli_thread_func(void *obj) { private_t *tech_pvt = obj; int s; @@ -383,7 +381,7 @@ break; } } else { - switch_sleep(1000); + skypiax_sleep(1000); ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); } } else if (SAMPLERATE_SKYPIAX == 16000) { @@ -412,13 +410,13 @@ break; } } else { - switch_sleep(1000); + skypiax_sleep(1000); ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); } } } else { - switch_sleep(1000); + skypiax_sleep(1000); if (rt) ERRORA("select give us: %u\n", SKYPIAX_P_LOG, rt); } @@ -473,7 +471,7 @@ return 0; } -switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt) +int skypiax_skypeaudio_read(private_t * tech_pvt) { //private_t *p; unsigned int samples; @@ -508,7 +506,7 @@ //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 - //do nothing + return 0; } else { /* A real frame */ tech_pvt->read_frame.datalen = samples; @@ -516,8 +514,9 @@ } else { if (rt) DEBUGA_SKYPE("select returned %d\n", SKYPIAX_P_LOG, rt); + //do nothing } - return SWITCH_STATUS_SUCCESS; + return 1; } #ifdef WIN32 @@ -619,7 +618,7 @@ 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); - switch_sleep(5000); + skypiax_sleep(5000); if (!tech_pvt->SkypiaxHandles.api_connected) { SendMessage(HWND_BROADCAST, tech_pvt->SkypiaxHandles. @@ -636,7 +635,7 @@ break; case SKYPECONTROLAPI_ATTACH_API_AVAILABLE: DEBUGA_SKYPE("Skype API available\n", SKYPIAX_P_LOG); - switch_sleep(5000); + skypiax_sleep(5000); if (!tech_pvt->SkypiaxHandles.api_connected) { SendMessage(HWND_BROADCAST, tech_pvt->SkypiaxHandles. @@ -731,7 +730,7 @@ DWORD win32_dwThreadId; -void *SWITCH_THREAD_FUNC skypiax_skypeapi_thread_func(switch_thread_t * thread, void *obj) +void * skypiax_do_skypeapi_thread_func(void *obj) { /* create window class */ /* create dummy/hidden window for processing messages */ @@ -751,7 +750,7 @@ tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = RegisterWindowMessage("SkypeControlAPIDiscover"); - switch_sleep(2000000); + skypiax_sleep(2000000); if (tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0 && tech_pvt->SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover != 0) { @@ -909,10 +908,10 @@ DEBUGA_SKYPE("NOT destroyed disp\n", SKYPIAX_P_LOG); } DEBUGA_SKYPE("OUT destroyed disp\n", SKYPIAX_P_LOG); - switch_sleep(1000); + skypiax_sleep(1000); } -void *SWITCH_THREAD_FUNC skypiax_skypeapi_thread_func(switch_thread_t * thread, void *obj) +void * skypiax_do_skypeapi_thread_func(void *obj) { private_t *tech_pvt = obj; @@ -1156,9 +1155,9 @@ 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); - switch_sleep(1000000); + skypiax_sleep(1000000); skypiax_skype_write(tech_pvt, "PROTOCOL 6"); - switch_sleep(10000); + skypiax_sleep(10000); return 0; } @@ -1400,15 +1399,15 @@ tech_pvt->interface_state = SKYPIAX_STATE_RING; /* no owner, no active call, let's answer */ skypiax_skype_write(tech_pvt, "SET AGC OFF"); - switch_sleep(10000); + skypiax_sleep(10000); skypiax_skype_write(tech_pvt, "SET AEC OFF"); - switch_sleep(10000); + skypiax_sleep(10000); sprintf(msg_to_skype, "GET CALL %s PARTNER_DISPNAME", id); skypiax_skype_write(tech_pvt, msg_to_skype); - switch_sleep(10000); + skypiax_sleep(10000); sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id); skypiax_skype_write(tech_pvt, msg_to_skype); - switch_sleep(10000); + skypiax_sleep(10000); sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id); skypiax_skype_write(tech_pvt, msg_to_skype); if (option_debug) @@ -1420,7 +1419,7 @@ /* 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); - switch_sleep(10000); + 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); @@ -1552,15 +1551,15 @@ skypiax_do_tcp_cli_thread, tech_pvt, skypiax_module_pool); DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); - switch_sleep(100000); + skypiax_sleep(100000); 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); - switch_sleep(100000); + 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); - switch_sleep(100000); + skypiax_sleep(100000); } tech_pvt->skype_callflow = SKYPIAX_STATE_UP; @@ -1698,16 +1697,16 @@ if (option_debug > 10) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } - switch_sleep(5000); + skypiax_sleep(5000); rdest = strchr(idest, '/'); *rdest++ = '\0'; DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); skypiax_skype_write(tech_pvt, "SET AGC OFF"); - switch_sleep(10000); + skypiax_sleep(10000); skypiax_skype_write(tech_pvt, "SET AEC OFF"); - switch_sleep(10000); + skypiax_sleep(10000); sprintf(msg_to_skype, "CALL %s", rdest); if (skypiax_skype_write(tech_pvt, msg_to_skype) < 0) {

1 0

[commit] r11516 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: andrew Date: Tue Jan 27 15:39:29 2009 New Revision: 11516 Log: Cleanup after log/event handler process exit, fix event handler stuff to work again and do some minor tweaks Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Tue Jan 27 15:39:29 2009 @@ -605,20 +605,23 @@ } else if (!strncmp(atom, "nolog", MAXATOMLEN)) { if (switch_test_flag(listener, LFLAG_LOG)) { + void *pop; + /*purge the log queue */ + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); switch_clear_flag_locked(listener, LFLAG_LOG); } ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_log_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); listener->log_process.type = ERLANG_PID; - listener->log_process.pid = msg->from; + memcpy(&listener->log_process.pid, &msg->from, sizeof(erlang_pid)); listener->level = SWITCH_LOG_DEBUG; switch_set_flag(listener, LFLAG_LOG); ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_event_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); listener->event_process.type = ERLANG_PID; - listener->event_process.pid = msg->from; + memcpy(&listener->event_process.pid, &msg->from, sizeof(erlang_pid)); if (!switch_test_flag(listener, LFLAG_EVENTS)) { switch_set_flag_locked(listener, LFLAG_EVENTS); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Jan 27 15:39:29 2009 @@ -190,12 +190,13 @@ /* test all of the sessions attached to this event in case one of them should receive it as well */ + send_event_to_attached_sessions(l,event); if (!switch_test_flag(l, LFLAG_EVENTS)) { continue; } - + if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_epoch_time_now(NULL) - l->last_flush > l->timeout) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); remove_listener(l); @@ -210,6 +211,7 @@ send = 1; } } + if (send) { if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { @@ -397,7 +399,7 @@ /*int index = 3;*/ while (!(rep = (ei_x_buff *) switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str))) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response!\n"); return NULL; } i++; @@ -603,10 +605,11 @@ static void check_event_queue(listener_t *listener) { void* pop; + /* send out any pending crap in the event queue */ if (switch_test_flag(listener, LFLAG_EVENTS)) { if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - + switch_event_t *pevent = (switch_event_t *) pop; ei_x_buff ebuf; @@ -615,7 +618,7 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - ei_sendto(listener->ec, listener->sockfd, &listener->log_process, &ebuf); + ei_sendto(listener->ec, listener->sockfd, &listener->event_process, &ebuf); switch_mutex_unlock(listener->sock_mutex); ei_x_free(&ebuf); @@ -624,6 +627,50 @@ } } +static void handle_exit(listener_t *listener, erlang_pid *pid) +{ + session_elem_t *s; + + remove_binding(NULL, pid); /* TODO - why don't we pass the listener as the first argument? */ + if ((s = find_session_elem_by_pid(listener, pid))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Outbound session for %s exited unexpectedly!\n", + switch_core_session_get_uuid(s->session)); + /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ + remove_session_elem_from_listener(listener, s); + } + + if (listener->log_process.type == ERLANG_PID && !ei_compare_pids(&listener->log_process.pid, pid)) { + void *pop; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Log handler process for node %s exited\n", pid->node); + /*purge the log queue */ + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); + + if (switch_test_flag(listener, LFLAG_LOG)) { + switch_clear_flag_locked(listener, LFLAG_LOG); + } + } + + if (listener->event_process.type == ERLANG_PID && !ei_compare_pids(&listener->event_process.pid, pid)) { + void *pop; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Event handler process for node %s exited\n", pid->node); + /*purge the event queue */ + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS); + + if (switch_test_flag(listener, LFLAG_EVENTS)) { + uint8_t x = 0; + switch_clear_flag_locked(listener, LFLAG_EVENTS); + for (x = 0; x <= SWITCH_EVENT_ALL; x++) { + listener->event_list[x] = 0; + } + /* wipe the hash */ + switch_core_hash_destroy(&listener->event_hash); + switch_core_hash_init(&listener->event_hash, listener->pool); + } + } +} + static void listener_main_loop(listener_t *listener) { int status = 1; @@ -681,10 +728,7 @@ break; case ERL_EXIT : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial); - remove_binding(NULL, &msg.from); - /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ - remove_session_elem_from_listener(listener, find_session_elem_by_pid(listener, &msg.from)); - /* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */ + handle_exit(listener, &msg.from); break; default : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unexpected msg type %d\n", (int)(msg.msgtype)); @@ -1030,7 +1074,7 @@ while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); switch_core_session_rwunlock(session); remove_session_elem_from_listener(listener,session_element); return NULL;

1 0

[commit] r11515 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:32:15 2009 New Revision: 11515 Log: Add a couple comments to mod_skel Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Tue Jan 27 15:32:15 2009 @@ -32,12 +32,17 @@ */ #include <switch.h> +/* Prototypes */ //SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown); //SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime); - SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load); + +/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) + * Defines a switch_loadable_module_function_table_t and a static const char[] modname + */ SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, NULL, NULL); +/* Macro expands to: switch_status_t mod_skel_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load) { /* connect my internal structure to the blank pointer passed to me */ @@ -51,6 +56,7 @@ /* Called when the system shuts down + Macro expands to: switch_status_t mod_skel_shutdown() SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown) { return SWITCH_STATUS_SUCCESS; @@ -60,6 +66,7 @@ /* If it exists, this is called in it's own thread when the module-load completes If it returns anything but SWITCH_STATUS_TERM it will be called again automatically + Macro expands to: switch_status_t mod_skel_runtime() SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime) { while(looping)

1 0

[commit] r11514 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:19:40 2009 New Revision: 11514 Log: Add doxygen comments and const to switch_ivr_schedule_broadcast Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Jan 27 15:19:40 2009 @@ -107,6 +107,7 @@ \brief Wait for time to pass for a specified number of milliseconds \param session the session to wait for. \param ms the number of milliseconds + \param sync synchronize the channel's audio before waiting \param args arguements to pass for callbacks etc \return SWITCH_STATUS_SUCCESS if the channel is still up */ @@ -389,6 +390,7 @@ \param cid_name_override override the caller id name \param cid_num_override override the caller id number \param caller_profile_override override the entire calling caller profile + \param ovars variables to be set on the outgoing channel \param flags flags to pass \return SWITCH_STATUS_SUCCESS if bleg is a running session. \note bleg will be read locked which must be unlocked with switch_core_session_rwunlock() before losing scope @@ -524,7 +526,7 @@ \param flags flags to send to the request (SMF_ECHO_BRIDGED to send the broadcast to both sides of the call) \return the id of the task */ -SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, char *uuid, char *path, switch_media_flag_t flags); +SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, const char *uuid, const char *path, switch_media_flag_t flags); /*! \brief Signal the session to broadcast audio Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jan 27 15:19:40 2009 @@ -2147,7 +2147,7 @@ switch_ivr_broadcast(helper->uuid_str, helper->path, helper->flags); } -SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, char *uuid, char *path, switch_media_flag_t flags) +SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, const char *uuid, const char *path, switch_media_flag_t flags) { struct broadcast_helper *helper; size_t len = sizeof(*helper) + strlen(path) + 1;

1 0

[commit] r11513 - freeswitch/trunk/scripts/contrib/jmesquita/fsgui
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:15:40 2009 New Revision: 11513 Log: including esl.h is enough Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Tue Jan 27 15:15:40 2009 @@ -4,9 +4,6 @@ #include <QtGui> #include "esl.h" -#include "esl_event.h" -#include "esl_threadmutex.h" -#include "esl_config.h" class conn_event_handler : public QObject {

1 0

[commit] r11512 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 12:20:42 2009 New Revision: 11512 Log: skypiax: cosmetics Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.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 Tue Jan 27 12:20:42 2009 @@ -854,7 +854,7 @@ DEBUGA_SKYPE ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].context=%s\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].context); - NOTICA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + NOTICA("Trying to START interface_id=%d\n", SKYPIAX_P_LOG, interface_id); switch_threadattr_create(&skypiax_skypeapi_thread_attr, skypiax_module_pool); switch_threadattr_stacksize_set(skypiax_skypeapi_thread_attr, @@ -888,7 +888,7 @@ if(globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected){ NOTICA("STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); } else { - ERRORA("interface_id=%d has not been started\n", SKYPIAX_P_LOG, interface_id); + ERRORA("FAILED to start interface_id=%d\n", SKYPIAX_P_LOG, interface_id); break; }

1 0

[commit] r11511 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 12:11:30 2009 New Revision: 11511 Log: skypiax: report the svn version of skypiax as part of logging Modified: freeswitch/branches/gmaruzz/mod_skypiax/Makefile freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h Modified: freeswitch/branches/gmaruzz/mod_skypiax/Makefile ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/Makefile (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/Makefile Tue Jan 27 12:11:30 2009 @@ -1,4 +1,6 @@ MODNAME=mod_skypiax +SVNDEF := -D'SKYPIAX_SVN_VERSION="$(shell svnversion -n .)"' +LOCAL_CFLAGS += $(SVNDEF) LOCAL_LDFLAGS=-lX11 LOCAL_OBJS=skypiax_protocol.o include ../../../../build/modmake.rules Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax.h Tue Jan 27 12:11:30 2009 @@ -51,7 +51,10 @@ #define SAMPLERATE_SKYPIAX 16000 #define SAMPLES_PER_FRAME SAMPLERATE_SKYPIAX/50 + +#ifndef SKYPIAX_SVN_VERSION #define SKYPIAX_SVN_VERSION SWITCH_VERSION_REVISION +#endif /* SKYPIAX_SVN_VERSION */ typedef enum { TFLAG_IO = (1 << 0),

1 0