- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4143 - freeswitch/trunk/conf
by Freeswitch SVN 07 Feb '07

07 Feb '07

Author: anthm Date: Tue Feb 6 19:49:56 2007 New Revision: 4143 Modified: freeswitch/trunk/conf/default_context.xml Log: dft config update Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Tue Feb 6 19:49:56 2007 @@ -40,6 +40,14 @@   + <extension name="set_codec" continue="true"> + <condition field="source" expression="mod_portaudio"> + <action application="set" data="absolute_codec_string=PCMU"/> + <action application="set" data="export_vars=absolute_codec_string"/> + </condition> + </extension> + + <extension name="testmusic"> <condition field="destination_number" expression="^1234$">

1 0

[commit] r4141 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: anthm Date: Tue Feb 6 16:42:22 2007 New Revision: 4141 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix event_socket Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Feb 6 16:42:22 2007 @@ -523,6 +523,8 @@ struct api_command_struct *acs = (struct api_command_struct *) obj; switch_stream_handle_t stream = {0}; + char *reply, *freply = NULL; + switch_status_t status; if (switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! cannot get read lock.\n"); @@ -532,34 +534,38 @@ SWITCH_STANDARD_STREAM(stream); - if (stream.data) { - if (switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { - if (!stream.data) { - stream.write_function(&stream, "Command returned no output!\n"); - } - if (acs->bg) { - switch_event_t *event; - - if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-UUID", acs->uuid_str); - switch_event_add_body(event, stream.data); - switch_event_fire(&event); - } - } else { - switch_size_t len; - char buf[1024]; - len = strlen(stream.data); - snprintf(buf, sizeof(buf), "Content-Type: api/response\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", len); - len = strlen(buf); - switch_socket_send(acs->listener->sock, buf, &len); - len = strlen(stream.data); - switch_socket_send(acs->listener->sock, stream.data, &len); - } - } - free(stream.data); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - } + if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { + reply = stream.data; + } else { + freply = switch_mprintf("%s: Command not found!", acs->api_cmd); + reply = freply; + } + + if (!reply) { + reply = "Command returned no output!"; + } + + if (acs->bg) { + switch_event_t *event; + + if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-UUID", acs->uuid_str); + switch_event_add_body(event, reply); + switch_event_fire(&event); + } + } else { + switch_size_t len; + char buf[1024]; + len = strlen(reply); + snprintf(buf, sizeof(buf), "Content-Type: api/response\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", len); + len = strlen(buf); + switch_socket_send(acs->listener->sock, buf, &len); + len = strlen(reply); + switch_socket_send(acs->listener->sock, reply, &len); + } + + switch_safe_free(stream.data); + switch_safe_free(freply); switch_thread_rwlock_unlock(acs->listener->rwlock);

1 0

[commit] r4140 - in freeswitch/trunk/scripts/socket: . FreeSWITCH
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: anthm Date: Tue Feb 6 16:24:43 2007 New Revision: 4140 Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm freeswitch/trunk/scripts/socket/fs.pl Log: get fs.pl up to date Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Tue Feb 6 16:24:43 2007 @@ -112,7 +112,6 @@ for(;;) { $e = $self->readhash(.1); if ($e && !$e->{socketerror}) { - #print Dumper $e; push @{$self->{events}}, $e; } else { last; Modified: freeswitch/trunk/scripts/socket/fs.pl ============================================================================== --- freeswitch/trunk/scripts/socket/fs.pl (original) +++ freeswitch/trunk/scripts/socket/fs.pl Tue Feb 6 16:24:43 2007 @@ -6,8 +6,9 @@ my $fs = init FreeSWITCH::Client {-password => $password} or die "Error $@"; my $term = new Term::ReadLine "FreeSWITCH CLI"; -my $prompt = "FS>"; +my $prompt = "[mFreeSWITCH>"; my $OUT = $term->OUT .. \*STDOUT; +my $pid; my $log = shift; @@ -19,44 +20,38 @@ my $fs2 = init FreeSWITCH::Client {-password => $password} or die "Error $@"; - $fs2->cmd({ command => "log $log" }); + $fs2->sendmsg({ 'command' => "log $log" }); while (1) { my $reply = $fs2->readhash(undef); if ($reply->{socketerror}) { die "socket error"; } + if ($reply->{body}) { - print $reply->{body} . "\n"; - } elsif ($reply->{'reply-text'}) { - print $reply->{'reply-text'} . "\n"; - } + print $reply->{body}; + } } exit; } } - - while ( defined ($_ = $term->readline($prompt)) ) { - my $reply; - if ($_) { - my $reply = $fs->cmd({command => "api $_"}); + if ($_ =~ /exit/) { + last; + } + my $reply = $fs->command($_); if ($reply->{socketerror}) { $fs2->disconnect(); die "socket error"; } - if ($reply->{body}) { - print $reply->{body}; - } elsif ($reply->{'reply-text'}) { - print $reply->{'reply-text'}; - } - print "\n"; - if ($_ =~ /exit/) { - last; - } + print "$reply\n"; + } $term->addhistory($_) if /\S/; } +if ($pid) { + kill 9 => $pid; +}

1 0

[commit] r4139 - freeswitch/trunk/src
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 14:20:39 2007 New Revision: 4139 Modified: freeswitch/trunk/src/switch.c Log: vg default on windows, not otherwise. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Feb 6 14:20:39 2007 @@ -198,9 +198,9 @@ const char *err = NULL; // error value for return from freeswitch initialization #ifndef WIN32 int nf = 0; // TRUE if we are running in nofork mode - int vg = 1; // Allways TRUE on windows to not do apr_terminate + int vg = 0; // Allways TRUE on windows to not do apr_terminate #else - int vg = 0; // TRUE if we are running in vg mode + int vg = 1; // TRUE if we are running in vg mode #endif int nc = 0; // TRUE if we are running in noconsole mode FILE *f; // file handle to the pid file

1 0

[commit] r4138 - in freeswitch/trunk/src: include mod/applications/mod_bridgecall
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: anthm Date: Tue Feb 6 14:15:26 2007 New Revision: 4138 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Log: yes virginia, sip has shortcommings Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Feb 6 14:15:26 2007 @@ -270,7 +270,7 @@ SWITCH_DECLARE(int) switch_perform_regex(char *field, char *expression, pcre **new_re, int *ovector, uint32_t olen); SWITCH_DECLARE(void) switch_perform_substitution(pcre *re, int match_count, char *data, char *field_data, char *substituted, uint32_t len, int *ovector); -#define SWITCH_READ_ACCEPTABLE(status) status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK +#define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len); SWITCH_DECLARE(char *) switch_url_decode(char *s); SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Feb 6 14:15:26 2007 @@ -81,6 +81,25 @@ return; } else { if (no_media_bridge) { + switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); + switch_frame_t *read_frame; + + /* SIP won't let us redir media until the call has been answered #$^#%& so we will proxy any early media until they do */ + while(switch_channel_ready(caller_channel) && switch_channel_ready(peer_channel) && !switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + switch_status_t status = switch_core_session_read_frame(peer_session, &read_frame, -1, 0); + uint8_t bad = 1; + + if (SWITCH_READ_ACCEPTABLE(status) && switch_core_session_write_frame(session, read_frame, -1, 0) == SWITCH_STATUS_SUCCESS) { + bad = 0; + } + + if (bad) { + switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_channel_hangup(peer_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return; + } + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to point-to-point mode.\n"); switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE); switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE);

1 0

[commit] r4137 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 13:37:01 2007 New Revision: 4137 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: some more protection against printing null. 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 Tue Feb 6 13:37:01 2007 @@ -2048,7 +2048,9 @@ } set_local_sdp(tech_pvt, NULL, 0, NULL, 0); activate_rtp(tech_pvt); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ring SDP:\n%s\n", tech_pvt->local_sdp_str); + if (tech_pvt->local_sdp_str) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ring SDP:\n%s\n", tech_pvt->local_sdp_str); + } nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, @@ -2172,9 +2174,10 @@ } #endif } - - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, (char*) "%s", data); - free(data); + if (data) { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, (char*) "%s", data); + free(data); + } } @@ -2630,7 +2633,7 @@ if ((ci = switch_loadable_module_get_chat_interface(proto))) { ci->chat_send(SOFIA_CHAT_PROTO, from_addr, to_addr, "", msg, full_from); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto ? proto : "(none)"); } } @@ -3024,6 +3027,10 @@ switch_mutex_lock(mutex); } + if (!dbname) { + goto end; + } + if (!(db = switch_core_db_open_file(dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", dbname); goto end;

1 0

[commit] r4136 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 13:27:02 2007 New Revision: 4136 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: don't log NULL sdp string. 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 Tue Feb 6 13:27:02 2007 @@ -1630,9 +1630,11 @@ activate_rtp(tech_pvt); if (tech_pvt->nh) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP %s:\n%s\n", - switch_channel_get_name(channel), - tech_pvt->local_sdp_str); + if (tech_pvt->local_sdp_str) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP %s:\n%s\n", + switch_channel_get_name(channel), + tech_pvt->local_sdp_str); + } nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),

1 0

[commit] r4135 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 13:11:25 2007 New Revision: 4135 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: pass and decrement max_forwards across the bridge for sip Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Feb 6 13:11:25 2007 @@ -88,6 +88,7 @@ #define SWITCH_REMOTE_MEDIA_IP_VARIABLE "remote_media_ip" #define SWITCH_REMOTE_MEDIA_PORT_VARIABLE "remote_media_port" #define SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE "hangup_after_bridge" +#define SWITCH_MAX_FORWARDS_VARIABLE "max_forwards" #define SWITCH_SPEECH_KEY "speech" #define SWITCH_UUID_BRIDGE "uuid_bridge" 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 Tue Feb 6 13:11:25 2007 @@ -952,7 +952,10 @@ { char rpid[1024] = { 0 }; char alert_info[1024] = { 0 }; + char max_forwards[8] = { 0 }; char *alertbuf; + char *forwardbuf; + int forwardval; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -984,6 +987,11 @@ snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); } + if ((forwardbuf = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE))) { + forwardval = atoi(forwardbuf) - 1; + snprintf(max_forwards, sizeof(max_forwards) - 1, "%d", forwardval); + } + if (tech_choose_port(tech_pvt) != SWITCH_STATUS_SUCCESS) { return; } @@ -1046,9 +1054,11 @@ } holdstr = switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) ? "*" : ""; + nua_invite(tech_pvt->nh, TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), - TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), + TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), + TAG_IF(!switch_strlen_zero(max_forwards),SIPTAG_MAX_FORWARDS_STR(max_forwards)), //SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), @@ -4338,7 +4348,7 @@ if (sip->sip_max_forwards) { snprintf(uri, sizeof(uri), "%u", sip->sip_max_forwards->mf_count); - switch_channel_set_variable(channel, "max_forwards", uri); + switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, uri); } if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 6 13:11:25 2007 @@ -1660,6 +1660,10 @@ if ((val = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE))) { switch_channel_set_variable(peer_channel, SWITCH_B_SDP_VARIABLE, val); } + + if ((val = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE))) { + switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, val); + } if (switch_channel_test_flag(channel, CF_NOMEDIA)) { switch_channel_set_flag(peer_channel, CF_NOMEDIA);

1 0

[commit] r4134 - freeswitch/trunk/src
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 12:20:33 2007 New Revision: 4134 Modified: freeswitch/trunk/src/switch_xml.c Log: clarify error message. Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Feb 6 12:20:33 2007 @@ -1119,7 +1119,7 @@ switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); } } else { - *err = "Cannot Open XML Root!"; + *err = "Cannot Open log directory or XML Root!"; } if (hasmain) {

1 0

[commit] r4133 - freeswitch/trunk/src
by Freeswitch SVN 06 Feb '07

06 Feb '07

Author: mikej Date: Tue Feb 6 12:05:14 2007 New Revision: 4133 Modified: freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: add -conf, -db, and -log params to the binary to allow for running multiple copies of freeswitch concurrently on the same box. Please note that these params may change in the future. Patch from Bret McDanel. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Feb 6 12:05:14 2007 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> * Pawel Pierscionek <pawel(a)voiceworks.pl> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * switch.c -- Main @@ -206,6 +207,8 @@ pid_t pid = 0; // int x; // int die = 0; // + char *usageDesc; + int alt_dirs = 0; #ifdef WIN32 SERVICE_TABLE_ENTRY dispatchTable[] = @@ -213,9 +216,35 @@ { SERVICENAME, &service_main }, { NULL, NULL } }; + usageDesc = "these are the optional arguments you can pass to freeswitch\n" + "\t-service -- start freeswitch as a service, cannot be used if loaded as a console app\n" + "\t-install -- install freeswitch as a service\n" + "\t-uninstall -- remove freeswitch as a service\n" + "\t-hp -- enable high priority settings\n" + "\t-stop -- stop freeswitch\n" + "\t-nc -- do not output to a console and background\n" + "\t-conf [confdir] -- specify an alternate config dir\n" + "\t-log [logdir] -- specify an alternate log dir\n" + "\t-db [dbdir] -- specify an alternate db dir\n"; +#else + usageDesc = "these are the optional arguments you can pass to freeswitch\n" + "\t-help -- this message\n" + "\t-nf -- no forking\n" + "\t-hp -- enable high priority settings\n" + "\t-stop -- stop freeswitch\n" + "\t-nc -- do not output to a console and background\n" + "\t-vg -- enable valgrind mode\n" + "\t-conf [confdir] -- specify an alternate config dir\n" + "\t-log [logdir] -- specify an alternate log dir\n" + "\t-db [dbdir] -- specify an alternate db dir\n"; + #endif for (x = 1; x < argc; x++) { + if (argv[x] && !strcmp(argv[x], "-help")) { + printf("%s\n",usageDesc); + exit(0); + } #ifdef WIN32 if (x == 1) { if (argv[x] && !strcmp(argv[x], "-service")) { @@ -281,12 +310,54 @@ if (argv[x] && !strcmp(argv[x], "-vg")) { vg++; } + + if (argv[x] && !strcmp(argv[x], "-conf")) { + x++; + if (argv[x] && strlen(argv[x])) { + SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(argv[x])+1); + strcpy(SWITCH_GLOBAL_dirs.conf_dir,argv[x]); + alt_dirs++; + } else { + fprintf(stderr, "When using -conf you must specify a config directory\n"); + return 255; + } + } + + if (argv[x] && !strcmp(argv[x], "-log")) { + x++; + if (argv[x] && strlen(argv[x])) { + SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(argv[x])+1); + strcpy(SWITCH_GLOBAL_dirs.log_dir,argv[x]); + alt_dirs++; + } else { + fprintf(stderr, "When using -log you must specify a log directory\n"); + return 255; + } + } + + if (argv[x] && !strcmp(argv[x], "-db")) { + x++; + if (argv[x] && strlen(argv[x])) { + SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(argv[x])+1); + strcpy(SWITCH_GLOBAL_dirs.db_dir,argv[x]); + alt_dirs++; + } else { + fprintf(stderr, "When using -db you must specify a db directory\n"); + return 255; + } + } + } if (die) { return freeswitch_kill_background(); } + if (alt_dirs && alt_dirs !=3) { + fprintf(stderr, "You must use -conf, -log, and -db together\n"); + return 255; + } + if (nc) { signal(SIGHUP, handle_SIGHUP); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 6 12:05:14 2007 @@ -3936,9 +3936,9 @@ #else SWITCH_GLOBAL_dirs.base_dir = SWITCH_PREFIX_DIR; SWITCH_GLOBAL_dirs.mod_dir = SWITCH_MOD_DIR; - SWITCH_GLOBAL_dirs.conf_dir = SWITCH_CONF_DIR; - SWITCH_GLOBAL_dirs.log_dir = SWITCH_LOG_DIR; - SWITCH_GLOBAL_dirs.db_dir = SWITCH_DB_DIR; + if(!SWITCH_GLOBAL_dirs.conf_dir) SWITCH_GLOBAL_dirs.conf_dir = SWITCH_CONF_DIR; + if(!SWITCH_GLOBAL_dirs.log_dir) SWITCH_GLOBAL_dirs.log_dir = SWITCH_LOG_DIR; + if(!SWITCH_GLOBAL_dirs.db_dir) SWITCH_GLOBAL_dirs.db_dir = SWITCH_DB_DIR; SWITCH_GLOBAL_dirs.script_dir = SWITCH_SCRIPT_DIR; SWITCH_GLOBAL_dirs.htdocs_dir = SWITCH_HTDOCS_DIR; SWITCH_GLOBAL_dirs.grammar_dir = SWITCH_GRAMMAR_DIR;

1 0