# $Id$
#
+require 5.004;
# search local then perl directories
BEGIN {
use Msg;
use DXVars;
use DXDebug;
-use DXUser;
use IO::File;
use IO::Socket;
use IPC::Open2;
$conn->send_now("Z$call|bye...\n");
}
$stdout->flush if $stdout;
- kill(15, $pid) if $pid;
+ if ($pid) {
+ dbg('connect', "killing $pid");
+ kill(9, $pid);
+ }
sleep(1);
exit(0);
}
{
$SIG{CHLD} = \&sig_chld;
$waitedpid = wait;
+ dbg('connect', "caught $pid");
}
$line =~ s/\n/\r/og if $mode == 1;
#my $p = qq($line$snl);
if ($buffered) {
- if (length $outqueue >= 128) {
+ if (length $outqueue >= $client_buffer_lth) {
print $stdout $outqueue;
$outqueue = "";
}
$mode = $line; # set echo mode from cluster
my $term = POSIX::Termios->new;
$term->getattr(fileno($sock));
- $term->setflag( &POSIX::ISIG );
+ $term->setiflag( 0 );
+ $term->setoflag( 0 );
$term->setattr(fileno($sock), &POSIX::TCSANOW );
}
} elsif ($sort eq 'I') {
my ($host, $port) = split /\s+/, $line;
$port = 23 if !$port;
- if ($port == 23) {
- $sock = new Net::Telnet (Timeout => $timeout);
+# if ($port == 23) {
+ $sock = new Net::Telnet (Timeout => $timeout, Port => $port);
$sock->option_callback(\&optioncb);
$sock->output_record_separator('');
$sock->option_log('option_log');
$sock->dump_log('dump');
$sock->option_accept(Wont => TELOPT_ECHO);
$sock->open($host) or die "Can't connect to $host port $port $!";
- } else {
- $sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
- or die "Can't connect to $host port $port $!";
-
- }
+# } else {
+# $sock = IO::Socket::INET->new(PeerAddr => "$host:$port", Proto => 'tcp')
+# or die "Can't connect to $host port $port $!";
+# }
} elsif ($sort eq 'ax25' || $sort eq 'prog') {
my @args = split /\s+/, $line;
$rfh = new IO::File;
sub timeout
{
dbg('connect', "timed out after $timeout seconds");
- cease(10);
+ cease(0);
}
$mode = 2; # 1 - \n = \r as EOL, 2 - \n = \n, 0 - transparent
$call = ""; # the callsign being used
-@stdoutq = (); # the queue of stuff to send out to the user
$conn = 0; # the connection object for the cluster
$lastbit = ""; # the last bit of an incomplete input line
$mynl = "\n"; # standard terminator
$lasttime = time; # lasttime something happened on the interface
-$outqueue = ""; # the output queue length
+$outqueue = ""; # the output queue
+$client_buffer_lth = 200; # how many characters are buffered up on outqueue
$buffered = 1; # buffer output
$savenl = ""; # an NL that has been saved from last time
$timeout = 60; # default timeout for connects
$rfh = 0;
$wfh = 0;
+$waitedpid = 0;
#
# deal with args
$SIG{'TERM'} = \&sig_term;
$SIG{'HUP'} = 'IGNORE';
$SIG{'CHLD'} = \&sig_chld;
+$SIG{'ALRM'} = \&timeout;
dbgadd('connect');
my $user;
my $s;
+ if (-e "$data/issue") {
+ open(I, "$data/issue") or die;
+ local $/ = undef;
+ $issue = <I>;
+ close(I);
+ $issue = s/\n/\r/og if $mode == 1;
+ local $/ = $nl;
+ $stdout->print($issue) if $issue;
+ }
+
+
+ use DXUser;
+
DXUser->init($userfn);
+ # allow a login from an existing user. I could create a user but
+ # I want to check for valid callsigns and I don't have the
+ # necessary info / regular expression yet
for ($state = 0; $state < 2; ) {
alarm($timeout);
if ($state == 0) {
$stdout->print('login: ');
$stdout->flush();
- local $/ = $mode == 1 ? "\r" : "\n";
+ local $\ = $nl;
$s = $stdin->getline();
chomp $s;
+ $s =~ s/\s+//og;
+ $s =~ s/-\d+$//o; # no ssids!
+ cease(0) unless $s gt ' ';
$call = uc $s;
$user = DXUser->get($call);
$state = 1;
} elsif ($state == 1) {
$stdout->print('password: ');
$stdout->flush();
- local $/ = $mode == 1 ? "\r" : "\n";
+ local $\ = $nl;
$s = $stdin->getline();
chomp $s;
$state = 2;
- cease(0) if !$user || ($user->passwd && $user->passwd ne $s);
+ if (!$user || ($user->passwd && $user->passwd ne $s)) {
+ $stdout->print("sorry...$nl");
+ cease(0);
+ }
}
}
}
+# handle callsign and connection type firtling
+sub doclient
+{
+ my $line = shift;
+ my @f = split /\s+/, $line;
+ $call = uc $f[0] if $f[0];
+ $csort = $f[1] if $f[1];
+}
+
# is this an out going connection?
if ($connsort eq "connect") {
my $mcall = lc $call;
open(IN, "$cpath/$mcall") or cease(2);
@in = <IN>;
close IN;
-
- # alarm($timeout);
+
+ alarm($timeout);
for (@in) {
chomp;
doconnect($1, $2) if /^\s*co\w*\s+(\w+)\s+(.*)$/io;
doabort($1) if /^\s*a\w*\s+(.*)/io;
dotimeout($1) if /^\s*t\w*\s+(\d+)/io;
- dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;
+ dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;
+ if (/\s*cl\w+\s+(.*)/io) {
+ doclient($1);
+ last;
+ }
}
- dbg('connect', "Connected to $call, starting normal protocol");
+ dbg('connect', "Connected to $call ($csort), starting normal protocol");
dbgsub('connect');
# if we get here we are connected
# close W;
$stdin = $rfh;
$stdout = $wfh;
- $csort = 'telnet' if $sort eq 'prog';
+ $csort = 'telnet' if $csort eq 'prog';
} elsif ($csort eq 'telnet') {
# open(STDIN, "<&$sock");
# open(STDOUT, ">&$sock");
projects / spider.git / blobdiff