March 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7780 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: anthm Date: Mon Mar 3 20:23:55 2008 New Revision: 7780 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add accept-blind-auth Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Mon Mar 3 20:23:55 2008 @@ -71,6 +71,9 @@    + +  +   <param name="nonce-ttl" value="60"/> 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 Mon Mar 3 20:23:55 2008 @@ -129,7 +129,8 @@ PFLAG_SUPRESS_CNG = (1 << 12), PFLAG_TLS = (1 << 13), PFLAG_CHECKUSER = (1 << 14), - PFLAG_SECURE = (1 << 15) + PFLAG_SECURE = (1 << 15), + PFLAG_BLIND_AUTH = (1 << 16) } PFLAGS; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Mar 3 20:23:55 2008 @@ -1099,6 +1099,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_REG; } + } else if (!strcasecmp(var, "accept-blind-auth")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_BLIND_AUTH; + } } else if (!strcasecmp(var, "auth-all-packets")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_ALL; @@ -2374,7 +2378,7 @@ get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); - if ((profile->pflags & PFLAG_AUTH_CALLS) || sip->sip_proxy_authorization || sip->sip_authorization) { + if ((profile->pflags & PFLAG_AUTH_CALLS) || (!(profile->pflags & PFLAG_BLIND_AUTH) && (sip->sip_proxy_authorization || sip->sip_authorization))) { if (strcmp(network_ip, profile->sipip)) { if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) { if (v_event) {

1 0

[commit] r7779 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: anthm Date: Mon Mar 3 19:52:54 2008 New Revision: 7779 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Mar 3 19:52:54 2008 @@ -1507,8 +1507,8 @@ SWITCH_ADD_APP(app_interface, "strftime", NULL, NULL, strftime_function, NULL, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "phrase", "Say a Phrase", "Say a Phrase", phrase_function, "<macro_name>,<data>", SAF_NONE); SWITCH_ADD_APP(app_interface, "eval", "Do Nothing", "Do Nothing", eval_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set_name", "Name the channel", "Name the channel", set_name_function, "<name>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Mar 3 19:52:54 2008 @@ -712,13 +712,6 @@ goto end; } - if (msg->message_id == SWITCH_MESSAGE_INDICATE_ANSWER || msg->message_id == SWITCH_MESSAGE_INDICATE_PROGRESS) { - const char *var; - if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { - switch_set_flag_locked(tech_pvt, TFLAG_SECURE); - } - } - switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: { @@ -794,10 +787,26 @@ case SWITCH_MESSAGE_INDICATE_MEDIA: { - uint32_t count = 0; - + uint32_t count = 0, send_invite = 1; + switch_channel_clear_flag(channel, CF_PROXY_MODE); tech_pvt->local_sdp_str = NULL; + + if (!switch_channel_media_ready(channel)) { + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); + if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + status = SWITCH_STATUS_FALSE; + goto end; + } + send_invite = 0; + } + } + if (!switch_rtp_ready(tech_pvt->rtp_session)) { sofia_glue_tech_prepare_codecs(tech_pvt); if ((status = sofia_glue_tech_choose_port(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) { @@ -806,20 +815,22 @@ } } sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1); - sofia_glue_do_invite(session); - /* wait for rtp to start and first real frame to arrive */ - tech_pvt->read_frame.datalen = 0; - while (switch_test_flag(tech_pvt, TFLAG_IO) && switch_channel_get_state(channel) < CS_HANGUP && !switch_rtp_ready(tech_pvt->rtp_session)) { - if (++count > 1000) { - status = SWITCH_STATUS_FALSE; - goto end; - } - if (!switch_rtp_ready(tech_pvt->rtp_session)) { - switch_yield(1000); - continue; + if (send_invite) { + sofia_glue_do_invite(session); + /* wait for rtp to start and first real frame to arrive */ + tech_pvt->read_frame.datalen = 0; + while (switch_test_flag(tech_pvt, TFLAG_IO) && switch_channel_get_state(channel) < CS_HANGUP && !switch_rtp_ready(tech_pvt->rtp_session)) { + if (++count > 1000) { + status = SWITCH_STATUS_FALSE; + goto end; + } + if (!switch_rtp_ready(tech_pvt->rtp_session)) { + switch_yield(1000); + continue; + } + break; } - break; } } break; 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 Mon Mar 3 19:52:54 2008 @@ -1422,11 +1422,18 @@ uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; uint32_t rtp_hold_timeout_sec = tech_pvt->profile->rtp_hold_timeout_sec; char *timer_name; + const char *var; switch_assert(tech_pvt != NULL); switch_core_session_signal_lock(tech_pvt->session); + + if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { + switch_set_flag_locked(tech_pvt, TFLAG_SECURE); + } + + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) { status = SWITCH_STATUS_SUCCESS; goto end; Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon Mar 3 19:52:54 2008 @@ -137,8 +137,7 @@ while (switch_channel_get_state(session->channel) == CS_EXECUTE && extension->current_application) { char *expanded = NULL; - int nomedia = 0; - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Execute %s(%s)\n", switch_channel_get_name(session->channel), extension->current_application->application_name, switch_str_nil(extension->current_application->application_data)); if ((application_interface = switch_loadable_module_get_application_interface(extension->current_application->application_name)) == 0) { @@ -155,7 +154,6 @@ if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) { switch_ivr_media(session->uuid_str, SMF_NONE); - nomedia++; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n", extension->current_application->application_name, switch_channel_get_name(session->channel)); } else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) { @@ -189,12 +187,6 @@ goto top; } - if (nomedia) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Releasing media\n", - extension->current_application->application_name); - switch_ivr_nomedia(session->uuid_str, SMF_NONE); - } - extension->current_application = extension->current_application->next; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Mar 3 19:52:54 2008 @@ -496,7 +496,7 @@ switch_core_session_t *other_session; switch_event_t *event; - if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { + if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_clear_flag(channel, CF_ORIGINATOR); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); @@ -514,17 +514,10 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - assert (!switch_channel_test_flag(other_channel, CF_TRANSFER)); + if (switch_channel_get_state(other_channel) < CS_HANGUP) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } - if (!switch_channel_test_flag(other_channel, CF_TRANSFER)) { - if (switch_channel_test_flag(other_channel, CF_ANSWERED) && - switch_channel_get_state(other_channel) < CS_HANGUP && - switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); - } else { - switch_channel_set_state(other_channel, CS_EXECUTE); - } - } switch_core_session_rwunlock(other_session); }

1 0

[commit] r7778 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 18:13:12 2008 New Revision: 7778 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 3 18:13:12 2008 @@ -1023,7 +1023,10 @@ rtp_session->dtmf_data.out_digit = rdigit->digit; rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; + rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (rtp_session->dtmf_data.out_digit_sub_sofar >> 8); + rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sub_sofar; + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; if (rtp_session->timer.interval) { switch_core_timer_check(&rtp_session->timer); @@ -1721,7 +1724,6 @@ if (send) { send_msg->header.seq = htons(++rtp_session->seq); - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND)) { int sbytes = (int) bytes; err_status_t stat;

1 0

[commit] r7777 - in freeswitch/branches/anthonyl/spidermonkey-stuff: libs/xmlrpc-c src src/mod/directories/mod_ldap
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthonyl Date: Mon Mar 3 18:08:23 2008 New Revision: 7777 Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/directories/mod_ldap/mod_ldap.c freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c Log: god knows what i'm updating here , really it's best to ignore this commit Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/libs/xmlrpc-c/xmlrpc_amconfig.h.in ============================================================================== --- freeswitch/branches/anthonyl/spidermonkey-stuff/libs/xmlrpc-c/xmlrpc_amconfig.h.in (original) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/libs/xmlrpc-c/xmlrpc_amconfig.h.in Mon Mar 3 18:08:23 2008 @@ -81,5 +81,5 @@ /* Version number of package */ #undef VERSION -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/directories/mod_ldap/mod_ldap.c ============================================================================== --- freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/directories/mod_ldap/mod_ldap.c (original) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/src/mod/directories/mod_ldap/mod_ldap.c Mon Mar 3 18:08:23 2008 @@ -202,7 +202,53 @@ return SWITCH_STATUS_FALSE; } +static switch_status_t mod_ldap_append(switch_directory_handle_t *dh, char *dn, char *attr) +{ + int ret; + LDAPMod *attrsp[1]; + struct ldap_context *context; + + context = dh->private_info; + switch_assert(context != NULL); + + if (!context->entry) { + return SWITCH_STATUS_FALSE; + } + + attrs[0] = mod_ldap_convert(attr, strlen(attr)); + + if (!attrs[0]) + return SWITCH_STATUS_FALSE; + + attrs[1] = NULL; + + ret = ldap_add_ext_s(context->ld, dn, attrs[0], NULL, NULL); + return SWITCH_STATUS_FALSE; +} +/* + +Note: This is FUGLY right now !!!!!! do not think about using +for now just working on one attribute at a time inefficant and lame +the main problem with this is the whole mod_type deal and now this will all be passed as a string +objectClass = asj who knows + +*/ +static char *topObjectClasses[] = { "top", NULL }; +static LDAPMod * +mod_ldap_convert(int modop, char *attr, int vlen ) +{ + LDAPMod *pmods; + int i, j; + struct berval *bvp; + + pmods = malloc(sizeof(LDAPMod)); + if (!pmods) + return NULL; + pmods->mod_op = LDAP_MOD_ADD; + pmods->mod_type = "objectClass"; + pmods->mod_values = topObjectClasses; +} SWITCH_MODULE_LOAD_FUNCTION(mod_ldap_load) { switch_directory_interface_t *dir_interface; @@ -216,7 +262,7 @@ dir_interface->directory_query = mod_ldap_query; dir_interface->directory_next = mod_ldap_next; dir_interface->directory_next_pair = mod_ldap_next_pair; - + dir_interface->directory_append = mod_ldap_append; /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c ============================================================================== --- freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c (original) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c Mon Mar 3 18:08:23 2008 @@ -84,14 +84,10 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_core_directory_append(switch_directory_handle_t *dh) +SWITCH_DECLARE(switch_status_t) switch_core_directory_append(switch_directory_handle_t *dh, char *dn, char *attr) { switch_status_t status; - status = dh->directory_interface->directory_append(dh); - - if (switch_test_flag(dh, SWITCH_DIRECTORY_FLAG_FREE_POOL)) { - switch_core_destory_memory_poll(&dh->memory_poll); - } + status = dh->directory_interface->directory_append(dh, dn, attr); return status; }

1 0

[commit] r7776 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: mikej Date: Mon Mar 3 15:51:50 2008 New Revision: 7776 Modified: freeswitch/trunk/src/switch_core.c Log: initialize event engine and logs earlier Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 3 15:51:50 2008 @@ -726,6 +726,9 @@ switch_core_set_variable("local_ip_v6", guess_ip); switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir); + switch_log_init(runtime.memory_pool); + switch_event_init(runtime.memory_pool); + if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; @@ -803,10 +806,6 @@ runtime.console = stdout; } - switch_assert(runtime.memory_pool != NULL); - switch_log_init(runtime.memory_pool); - switch_event_init(runtime.memory_pool); - if (switch_test_flag((&runtime), SCF_USE_SQL)) { switch_core_sqldb_start(runtime.memory_pool); }

1 0

[commit] r7775 - in freeswitch/trunk/src: . include
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 14:32:42 2008 New Revision: 7775 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_xml.cpp Log: add reloadxml event Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 3 14:32:42 2008 @@ -988,6 +988,7 @@ SWITCH_EVENT_DEL_SCHEDULE - Something has been unscheduled SWITCH_EVENT_EXE_SCHEDULE - Something scheduled has been executed SWITCH_EVENT_RE_SCHEDULE - Something scheduled has been rescheduled + SWITCH_EVENT_RELOADXML - XML registry has been reloaded SWITCH_EVENT_ALL - All events at once </pre> @@ -1041,6 +1042,7 @@ SWITCH_EVENT_DEL_SCHEDULE, SWITCH_EVENT_EXE_SCHEDULE, SWITCH_EVENT_RE_SCHEDULE, + SWITCH_EVENT_RELOADXML, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 3 14:32:42 2008 @@ -126,6 +126,7 @@ "DEL_SCHEDULE", "EXE_SCHEDULE", "RE_SCHEDULE", + "RELOADXML", "ALL" }; Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Mon Mar 3 14:32:42 2008 @@ -1479,7 +1479,17 @@ } switch_mutex_unlock(XML_LOCK); - return errcnt == 0 ? switch_xml_root() : NULL; + if (errcnt == 0) { + switch_event_t *event; + if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) { + if (switch_event_fire(&event) != SWITCH_STATUS_SUCCESS) { + switch_event_destroy(&event); + } + } + return switch_xml_root(); + } + + return NULL; } SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err)

1 0

[commit] r7774 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 14:02:36 2008 New Revision: 7774 Modified: freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c Log: add patch from FSCORE-101 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Mar 3 14:02:36 2008 @@ -35,6 +35,55 @@ #include <switch_version.h> #define CMD_BUFLEN 1024; +/* + * store a strdup() of the string configured in XML + * bound to each of the 12 function key + */ +static char *console_fnkeys[12]; + +/* + * Load from console.conf XML file the section: + * <keybindings> + * <key name="1" value="show calls"/> + * </keybindings> + */ +static switch_status_t console_xml_config(void) +{ + char *cf = "switch.conf"; + switch_xml_t cfg, xml, settings, param; + + /* clear the keybind array */ + int i; + + for (i = 0; i < 12; i++) { + console_fnkeys[i] = NULL; + } + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "cli-keybindings"))) { + for (param = switch_xml_child(settings, "key"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + int i = atoi(var); + if ((i < 1) || (i > 12)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "keybind %s is invalid, range is from 1 to 12\n", var); + } else { + // Add the command to the fnkey array + console_fnkeys[i - 1] = switch_core_permanent_strdup(val); + } + } + } + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { switch_size_t nwrite; @@ -199,6 +248,67 @@ #include <histedit.h> static char prompt_str[512] = ""; +/* + * If a fnkey is configured then process the command + */ +static unsigned char console_fnkey_pressed(int i) { + char *c; + + assert((i > 0) && (i <= 12)); + + c = console_fnkeys[i-1]; + + // This new line is necessary to avoid output to begin after the ">" of the CLI's prompt + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE,"\n"); + + if (c == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "FUNCTION KEY F%d IS NOT BOUND, please edit switch.conf XML file\n", i); + return CC_REDISPLAY; + } + + switch_console_process(c); + + return CC_REDISPLAY; +} + +static unsigned char console_f1key(EditLine *el, int ch) { + return console_fnkey_pressed(1); +} +static unsigned char console_f2key(EditLine *el, int ch) { + return console_fnkey_pressed(2); +} +static unsigned char console_f3key(EditLine *el, int ch) { + return console_fnkey_pressed(3); +} +static unsigned char console_f4key(EditLine *el, int ch) { + return console_fnkey_pressed(4); +} +static unsigned char console_f5key(EditLine *el, int ch) { + return console_fnkey_pressed(5); +} +static unsigned char console_f6key(EditLine *el, int ch) { + return console_fnkey_pressed(6); +} +static unsigned char console_f7key(EditLine *el, int ch) { + return console_fnkey_pressed(7); +} +static unsigned char console_f8key(EditLine *el, int ch) { + return console_fnkey_pressed(8); +} +static unsigned char console_f9key(EditLine *el, int ch) { + return console_fnkey_pressed(9); +} +static unsigned char console_f10key(EditLine *el, int ch) { + return console_fnkey_pressed(10); +} +static unsigned char console_f11key(EditLine *el, int ch) { + return console_fnkey_pressed(11); +} +static unsigned char console_f12key(EditLine *el, int ch) { + return console_fnkey_pressed(12); +} + + char * prompt(EditLine *e) { if (*prompt_str == '\0') { gethostname(hostname, sizeof(hostname)); @@ -256,15 +366,53 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_memory_pool_t *pool; - + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); return; } - + el = el_init(__FILE__, switch_core_get_console(), switch_core_get_console(), switch_core_get_console()); el_set(el, EL_PROMPT, &prompt); el_set(el, EL_EDITOR, "emacs"); + /* AGX: Bind Keyboard function keys. This has been tested with: + * - linux console keyabord + * - putty.exe connected via ssh to linux + */ + /* Load/Init the config first */ + console_xml_config(); + /* Bind the functions to the key */ + el_set(el, EL_ADDFN, "f1-key", "F1 KEY PRESS", console_f1key ); + el_set(el, EL_ADDFN, "f2-key", "F2 KEY PRESS", console_f2key ); + el_set(el, EL_ADDFN, "f3-key", "F3 KEY PRESS", console_f3key ); + el_set(el, EL_ADDFN, "f4-key", "F4 KEY PRESS", console_f4key ); + el_set(el, EL_ADDFN, "f5-key", "F5 KEY PRESS", console_f5key ); + el_set(el, EL_ADDFN, "f6-key", "F6 KEY PRESS", console_f6key ); + el_set(el, EL_ADDFN, "f7-key", "F7 KEY PRESS", console_f7key ); + el_set(el, EL_ADDFN, "f8-key", "F8 KEY PRESS", console_f8key ); + el_set(el, EL_ADDFN, "f9-key", "F9 KEY PRESS", console_f9key ); + el_set(el, EL_ADDFN, "f10-key", "F10 KEY PRESS", console_f10key ); + el_set(el, EL_ADDFN, "f11-key", "F11 KEY PRESS", console_f11key ); + el_set(el, EL_ADDFN, "f12-key", "F12 KEY PRESS", console_f12key ); + + el_set(el, EL_BIND, "\033OP", "f1-key", NULL); + el_set(el, EL_BIND, "\033OQ", "f2-key", NULL); + el_set(el, EL_BIND, "\033OR", "f3-key", NULL); + el_set(el, EL_BIND, "\033OS", "f4-key", NULL); + + + el_set(el, EL_BIND, "\033[11~", "f1-key", NULL); + el_set(el, EL_BIND, "\033[12~", "f2-key", NULL); + el_set(el, EL_BIND, "\033[13~", "f3-key", NULL); + el_set(el, EL_BIND, "\033[14~", "f4-key", NULL); + el_set(el, EL_BIND, "\033[15~", "f5-key", NULL); + el_set(el, EL_BIND, "\033[17~", "f6-key", NULL); + el_set(el, EL_BIND, "\033[18~", "f7-key", NULL); + el_set(el, EL_BIND, "\033[19~", "f8-key", NULL); + el_set(el, EL_BIND, "\033[20~", "f9-key", NULL); + el_set(el, EL_BIND, "\033[21~", "f10-key", NULL); + el_set(el, EL_BIND, "\033[23~", "f11-key", NULL); + el_set(el, EL_BIND, "\033[24~", "f12-key", NULL); myhistory = history_init(); if (myhistory == 0) { @@ -275,7 +423,6 @@ hfile = switch_mprintf("%s%sfreeswitch.history", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR); assert(hfile != NULL); - history(myhistory, &ev, H_SETSIZE, 800); el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 3 14:02:36 2008 @@ -824,6 +824,16 @@ return SWITCH_STATUS_SUCCESS; } + +#ifdef SIGQUIT +static void handle_SIGQUIT(int sig) +{ + if (sig); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Quit!\n"); + return; +} +#endif + #ifdef SIGPIPE static void handle_SIGPIPE(int sig) { @@ -891,6 +901,9 @@ #ifdef SIGPIPE signal(SIGPIPE, handle_SIGPIPE); #endif +#ifdef SIGQUIT + signal(SIGQUIT, handle_SIGQUIT); +#endif #ifdef SIGPOLL signal(SIGPOLL, handle_SIGPOLL); #endif

1 0

[commit] r7773 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 13:05:07 2008 New Revision: 7773 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix FSCORE-104 Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Mar 3 13:05:07 2008 @@ -34,14 +34,27 @@ static const switch_state_handler_table_t originate_state_handlers; +static switch_status_t originate_on_hold(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + + while(switch_channel_get_state(channel) == CS_HOLD) { + switch_ivr_sleep(session, 10); + } + + /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring and hold states) */ + switch_channel_clear_state_handler(channel, &originate_state_handlers); + + return SWITCH_STATUS_FALSE; +} + static switch_status_t originate_on_ring(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); - /* put the channel in a passive state so we can loop audio to it */ - /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring state) */ - switch_channel_clear_state_handler(channel, &originate_state_handlers); + /* put the channel in a passive state until it is answered */ switch_channel_set_state(channel, CS_HOLD); + return SWITCH_STATUS_FALSE; } @@ -52,7 +65,7 @@ /*.on_hangup */ NULL, /*.on_loopback */ NULL, /*.on_transmit */ NULL, - /*.on_hold */ NULL + /*.on_hold */ originate_on_hold }; typedef enum {

1 0

[commit] r7772 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: mikej Date: Sun Mar 2 12:45:14 2008 New Revision: 7772 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak 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 Sun Mar 2 12:45:14 2008 @@ -767,7 +767,7 @@ ip_ptr = p + 9; } - if (!strncmp(ip_ptr, "0.0.0.0", 7) || switch_stristr("sendonly", tech_pvt->local_sdp_str)) { + if ((ip_ptr && !strncmp(ip_ptr, "0.0.0.0", 7)) || switch_stristr("sendonly", tech_pvt->local_sdp_str)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n"); return; }

1 0

[commit] r7771 - freeswitch/trunk/src
by Freeswitch SVN 02 Mar '08

02 Mar '08

Author: mikej Date: Sun Mar 2 12:42:24 2008 New Revision: 7771 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: msvc build fix (code before declaration) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Mar 2 12:42:24 2008 @@ -591,9 +591,9 @@ if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"variable string %d = [%s]\n", x, var_array[x]); char *inner_var_array[2] = { 0 }; int inner_var_count; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"variable string %d = [%s]\n", x, var_array[x]); if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) {

1 0