--- telnetbbs/telnetbbs.pl 2010/12/10 23:28:09 1.4 +++ telnetbbs/telnetbbs.pl 2010/12/14 20:32:49 1.6 @@ -6,15 +6,14 @@ ## ## Nicholas DeClario ## October 2009 -## $Id: telnetbbs.pl,v 1.4 2010/12/10 23:28:09 nick Exp $ +## $Id: telnetbbs.pl,v 1.6 2010/12/14 20:32:49 nick Exp $ ## ################################################################################ BEGIN { delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)}; $ENV{PATH} = "/bin:/usr/bin"; $|++; -# Flip this back on for more detailed error reporting -# $SIG{__DIE__} = sub { require Carp; Carp::confess(@_); } + $SIG{__DIE__} = sub { require Carp; Carp::confess(@_); } } use strict; @@ -30,30 +29,34 @@ use threads; use threads::shared; ## -## Fetch our command line options +## Fetch our command line and configuration options ## my %opts = &fetchOptions( ); -my $pidFile = "/var/run/telnetbbs.pid"; +my %cfg = &fetchConfig( ); my $EOL = "\015\012"; ## ## These will be moved in to a config file ## -my $DISPLAY = ":0.0"; -my $BBS_NAME = "Hell's Dominion BBS"; -my $BBS_NODE = 0; -my $DBCONF = "/tmp/dosbox-__NODE__.conf"; -my $BBS_CMD = "DISPLAY=$DISPLAY /usr/bin/dosbox -conf "; -my $LOG = "/var/log/bbs.log"; -my $MAX_NODE = 1; -my $DOSBOXT = "dosbox.conf.template"; -my $BASE_PORT = 5000; +my $BBS_NODE = 0; +my $pidFile = $cfg{'pidfile'} || "/tmp/telnetbbs.pid"; +my $port = $opts{'port'} || $cfg{'port'} || 23; +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 $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"; ## ## Check that we are 'root' ## die( "Must be root user to run this.\n" ) - if ( getpwuid( $> ) ne "root" ); + if ( getpwuid( $> ) ne "root" && $port < 1023 ); ## ## Check for a PID @@ -74,10 +77,16 @@ local $SIG{HUP} = $SIG{INT} = $SIG{TERM ## ## Open the Log ## -#open LOG, ">>$LOG"; +open LOG, ">>$LOG" if ( $LOGGING ); &logmsg( "Starting telnetbbs server" ); ## +## Display running information +## +&display_config_and_options( \%opts, "Options" ); +&display_config_and_options( \%cfg, "Configuration" ); + +## ## Start the network server ## my $netThread = threads->create( \&startNetServer( ) ); @@ -98,7 +107,27 @@ while( 1 ) { sleep 1; } ############################################################################### ############################################################################### -sub logmsg { print "$0 $$ ", scalar localtime, ":@_\n" } +sub logmsg +{ + my $message = "$0 $$ " . scalar( localtime( ) ) . ":@_\n"; + print STDOUT $message; + print LOG $message if ( $LOGGING ); +} + + +############################################################################### +############################################################################### +sub display_config_and_options +{ + my $hr = shift || 0; + my $name = shift || "Unknown"; + my $title = "Displaying $name\n"; + + return $hr if ( ! $hr ); + + print LOG $title . Dumper( $hr ) if ( $LOGGING ); + print STDOUT $title . Dumper( $hr ) if ( $opts{'verbose'}); +} ############################################################################### ## startNetServer( ); @@ -111,7 +140,6 @@ sub startNetServer { my $hostConnection; my $childPID; - my $port = $opts{'port'} || 23; my @nodes = ( ); my $server = IO::Socket::INET->new( @@ -134,17 +162,21 @@ sub startNetServer ## Find the next available node ## my $node = 0; + my $lock_file = ""; foreach (1 .. $MAX_NODE) { - next if ( $node ); - if ( ! $nodes[$_] ) - { - $node = $BBS_NODE = $_; - $nodes[$node]++; - } - } +print "Searching for lock: " . $LOCK_PATH."/".$BBS_NAME."_node".$_.".lock\n"; + next if ( -f $LOCK_PATH."/".$BBS_NAME."_node".$_.".lock" ); -print STDOUT "Node Status: \n" . Dumper( @nodes ); + ## + ## Create node lock file + ## + $lock_file = $LOCK_PATH."/".$BBS_NAME."_node".$_.".lock"; + open LOCK, ">$lock_file"; + close( LOCK ); + $node = $BBS_NODE = $_; + } +print "Using lock: " . $LOCK_PATH."/".$BBS_NAME."_node".$node.".lock\n"; ## ## Create our dosbox config @@ -175,21 +207,23 @@ print STDOUT "Node Status: \n" . Dumper( } defined( $childPID ) || die( "Cannot fork: $!\n" ); + select $hostConnection; + ## ## Default file descriptor to the client and turn on autoflush ## $hostConnection->autoflush( 1 ); - print $hostConnection "Welcome to $BBS_NAME!" . $EOL; + print "Welcome to $BBS_NAME!" . $EOL; ## - if ( ! $BBS_NODE ) + if ( ! $lock_file ) { - print $hostConnection "No available nodes. Try again later.".$EOL; + print "No available nodes. Try again later.".$EOL; exit; } - print $hostConnection "Starting BBS on node $BBS_NODE...$EOL"; + print "Starting BBS on node $BBS_NODE...$EOL"; ## ## Launch BBS via dosbox @@ -197,8 +231,15 @@ print STDOUT "Node Status: \n" . Dumper( my $bbsPID = fork( ); if ( $bbsPID ) { + select STDOUT; my $cmd = $BBS_CMD . $DBCONF; - exec( $cmd ); + system( $cmd ); + print "Shutting down node $BBS_NODE\n"; + ## + ## Remove Lock + ## + unlink( $lock_file ); + unlink( $DBCONF ); exit; } @@ -229,7 +270,6 @@ print STDOUT "Node Status: \n" . Dumper( print $hostConnection $byte; } $nodes[$BBS_NODE] = 0; -print "Post-Disconnect Node Status: \n" . Dumper( @nodes ); kill( "TERM" => $kidpid ); } else @@ -262,13 +302,15 @@ sub shutdown { my $signame = shift || 0; + select STDOUT; + &logmsg( "$0: Shutdown (SIG$signame) received.\n" ) if( $signame ); ## ## Close Log ## - close( LOG ); + close( LOG ) if ( $LOGGING ); ## ## Remove the PID @@ -384,6 +426,48 @@ sub processExists return 0; } +############################################################################### +############################################################################### +sub fetchConfig +{ + my %conf = ( ); + my $cf = &findConfig; + + if ( $cf ) + { + open( CONF, "<$cf" ) or die ( "Error opening $cf: $!\n" ); + while( ) + { + next if ( $_ =~ m/^#/ ); + if ( $_ =~ m/(.*?)=(.*)/ ) + { + my $k = $1; my $v = $2; + $k =~ s/\s+//; + $v =~ s/\s+//; + $conf{$k} = $v; + } + } + close( CONF ); + } + + return %conf; +} + +############################################################################### +############################################################################### +sub findConfig +{ + my $cf = 0; + my @paths = qw| ./ ./.telnetbbs /etc /usr/local/etc |; + + foreach ( @paths ) + { + my $fn = $_ . "/telnetbbs.conf"; + return $fn if ( -f $fn ); + } + + return $cf; +} ############################################################################### ## @@ -399,6 +483,7 @@ sub fetchOptions { "help|?" => \$opts{'help'}, "man" => \$opts{'man'}, "port:i" => \$opts{'port'}, + "verbose" => \$opts{'verbose'}, ) || &pod2usage( ); &pod2usage( ) if defined $opts{'help'}; &pod2usage( { -verbose => 2, -input => \*DATA } ) if defined $opts{'man'};