--- telnetbbs/telnetbbs.pl	2010/12/16 14:24:25	1.7
+++ telnetbbs/telnetbbs.pl	2010/12/20 20:51:39	1.11
@@ -6,7 +6,7 @@
 ##
 ##   Nicholas DeClario <nick@declario.com>
 ##   October 2009
-##	$Id: telnetbbs.pl,v 1.7 2010/12/16 14:24:25 nick Exp $
+##	$Id: telnetbbs.pl,v 1.11 2010/12/20 20:51:39 nick Exp $
 ##
 ################################################################################
 BEGIN {
@@ -44,13 +44,14 @@ my $port      = $opts{'port'}      || $c
 my $DISPLAY   = $cfg{'display'}    || ":0.0";
 my $BBS_NAME  = $cfg{'bbs_name'}   || "Hell's Dominion BBS";
 my $DBCONF    = $cfg{'dosbox_cfg'} || "/tmp/dosbox-__NODE__.conf";
-my $BBS_CMD   = $cfg{'bbs_cmd'}    || "DISPLAY=$DISPLAY /usr/bin/dosbox -conf ";
+my $BBS_CMD   = $cfg{'bbs_cmd'}    || "DISPLAY=__DISPLAY__ /usr/bin/dosbox -conf ";
 my $LOGGING   = $cfg{'logging'}    || 0;
 my $LOG       = $cfg{'log_path'}   || "/tmp/bbs.log";
 my $MAX_NODE  = $cfg{'nodes'}      || 1;
 my $DOSBOXT   = $cfg{'dosboxt'}    || "dosbox.conf.template";
 my $BASE_PORT = $cfg{'base_port'}  || 7000;
 my $LOCK_PATH = $cfg{'lock_path'}  || "/tmp";
+   $BBS_CMD   =~ s/__DISPLAY__/$DISPLAY/g;
 
 ##
 ## Check that we are 'root' 
@@ -105,8 +106,16 @@ while( 1 ) { sleep 1; }
 ## Sub-routines begin here
 ##
 ###############################################################################
-###############################################################################
 
+
+###############################################################################
+##
+## &logmsg( "string" );
+##
+##  This takes a string and prepends the process name, ID and timestamp
+##  to the message.  It then displays it to STDOUT and logs it if enabled.
+##
+###############################################################################
 sub logmsg 
 { 
 	my $message = "$0 $$ " . scalar( localtime( ) ) . ":@_\n";
@@ -116,6 +125,15 @@ sub logmsg
 
 
 ###############################################################################
+##
+## &display_config_and_options( %hash );
+##
+##  This will display via Data::Dumper a hash that is passed to it.
+##  If verbose is enabled it will got to STDOUT and if logging is enabled
+##  it will be logged.
+##
+##  This is called only once during startup.
+##
 ###############################################################################
 sub display_config_and_options
 {
@@ -163,17 +181,22 @@ sub startNetServer
 		##
 		my $node = 0;
 		my $lock_file = "";
-		foreach (1 .. $MAX_NODE)
+		my $cnt  = 0;
+		while ( ! $node && $cnt < $MAX_NODE )
 		{
-			next if ( -f $LOCK_PATH."/".$BBS_NAME."_node".$_.".lock" );
+			$cnt++;
+			$lock_file = $LOCK_PATH . "/" . $BBS_NAME . 
+				     "_node" . $cnt . ".lock";
+print "Checking for node lock: $lock_file\n";
+			next if ( -f $lock_file );
 
 			##
 			## Create node lock file
 			##
-			$lock_file = $LOCK_PATH."/".$BBS_NAME."_node".$_.".lock";
 			open LOCK, ">$lock_file";
 			close( LOCK );
-			$node = $BBS_NODE = $_;
+			$BBS_NODE = $node = $cnt;
+print "Using node: $node\n";
 		}
 
 		##
@@ -183,7 +206,7 @@ sub startNetServer
 			my @dbt = <DBT>;
 		close( DBT );
 		
-		my $bpn = $BASE_PORT + $BBS_NODE;
+		my $bpn = $BASE_PORT + $BBS_NODE - 1;
 		$DBCONF =~ s/__NODE__/$BBS_NODE/g;
 		open( DBC, ">$DBCONF" );
 		foreach( @dbt ) 
@@ -215,7 +238,7 @@ sub startNetServer
 		print "Welcome to $BBS_NAME!" . $EOL;
 
 		##
-		if ( ! $lock_file ) 
+		if ( ! $node ) 
 		{
 			print "No available nodes.  Try again later.".$EOL;
 			exit;
@@ -233,11 +256,15 @@ sub startNetServer
 			my $cmd = $BBS_CMD . $DBCONF;
 			system( $cmd );
 			print "Shutting down node $BBS_NODE\n";
+
 			##
 			## Remove Lock
 			##	
 			unlink( $lock_file );
 			unlink( $DBCONF );
+			close( $hostConnection );
+			close( $server );
+			kill( "TERM" => $bbsPID );
 			exit;
 		}
 
@@ -282,9 +309,9 @@ sub startNetServer
 		unlink( $DBCONF );
 	}
 	close( $hostConnection );
-	exit;
+	close( $server );
 
-#	close( $server );
+	exit;
 }
 
 ###############################################################################
@@ -434,6 +461,13 @@ sub processExists
 }
 
 ###############################################################################
+##
+## %config_hash = &fetchConfig( );
+##
+##  This reads in a file in the format of "key = value" and stores them
+## in to a hash of $hash{$key} = $value.  Lines starting with '#' are 
+## considered comments and ignored.
+##
 ###############################################################################
 sub fetchConfig 
 {
@@ -461,6 +495,13 @@ sub fetchConfig
 }
 
 ###############################################################################
+##
+## my $file = &fetchConfig( );
+##
+##  This function will look for 'telnetbbs.conf' or whatever was specified
+##  on the command line.  It will search the @paths below for the default
+##  filename if none is specifed.
+##
 ###############################################################################
 sub findConfig
 {