}
use Msg;
+use IntMsg;
use DXVars;
use DXDebug;
use DXUtil;
# terminate a child
sub sig_chld
{
- $SIG{CHLD} = \&sig_chld;
- $waitedpid = wait;
- dbg('connect', "caught $pid");
+ unless ($^O =~ /^MS/i) {
+ $SIG{CHLD} = \&sig_chld;
+ $waitedpid = wait;
+ dbg('connect', "caught $waitedpid");
+ }
}
{
if ($mode == 1) {
$mynl = "\r";
+ $out_lineend = "\r";
} else {
$mynl = "\n";
+ $out_lineend = "\r\n";
}
$/ = $mynl;
+ $out_lineend = $mynl;
}
# handle incoming messages
if ($buffered) {
if (length $outqueue >= $client_buffer_lth) {
print $stdout $outqueue;
+ pop @echo while (@echo > $maxecho);
+ push @echo, $outqueue;
$outqueue = "";
}
$outqueue .= "$savenl$line$snl";
} elsif ($sort eq 'B') {
if ($buffered && $outqueue) {
print $stdout $outqueue;
+ pop @echo while(@echo > $maxecho);
+ push @echo, $outqueue;
$outqueue = "";
}
$buffered = $line; # set buffered or unbuffered
unshift @lines, ($lastbit . $first) if ($first);
foreach $first (@lines) {
# print "send_now $call $first\n";
+ next if grep {$_ eq $first } @echo;
$conn->send_later("I$call|$first");
}
$lastbit = $buf;
$sock->output_record_separator('');
$sock->option_accept(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO);
$sock->open($host) or die "Can't connect to $host port $port $!";
- $sock->binmode(1);
+ if ($port == 23) {
+ $sock->telnetmode(1);
+ $sock->option_send(Dont => TELOPT_ECHO, Wont => TELOPT_ECHO) if $port == 23;
+ } else {
+ $sock->telnetmode(0);
+ }
+ $sock->binmode(0);
$mode = 3;
} elsif ($sort eq 'ax25' || $sort eq 'prog') {
my @args = split /\s+/, $line;
$timeout = $val;
}
+sub dolineend
+{
+ my $val = shift;
+ $out_lineend = $val;
+ $out_lineend =~ s/\\r/\r/g;
+ $out_lineend =~ s/\\n/\n/g;
+ dbg('connect', "lineend set to $val ");
+ $out_lineend = $mynl unless $out_lineend;
+}
+
sub dochat
{
my ($expect, $send) = @_;
$line =~ s/\r/\n/g;
chomp;
}
- dbg('connect', "received \"$line\"");
+ dbg('connect', map { "received \"$_\"" } split /\n/, $line);
if ($abort && $line =~ /$abort/i) {
dbg('connect', "aborted on /$abort/");
cease(11);
}
if ($send) {
if ($csort eq 'telnet') {
+# local $\ = $out_lineend;
$sock->print("$send\n");
} elsif ($csort eq 'ax25') {
- local $\ = "\r";
+ local $\ = $out_lineend;
$wfh->print("$send");
}
dbg('connect', "sent \"$send\"");
$timeout = 60; # default timeout for connects
$abort = ""; # the current abort string
$cpath = "$root/connect"; # the basic connect directory
+$maxecho = 5; # length of max echo queue
$pid = 0; # the pid of the child program
$csort = ""; # the connection type
$sock = 0; # connection socket
+$out_lineend = $mynl; # connection lineending (used for outgoing connects)
$stdin = *STDIN;
$stdout = *STDOUT;
$stdout->autoflush(1);
-$SIG{'INT'} = \&sig_term;
-$SIG{'TERM'} = \&sig_term;
-$SIG{'HUP'} = \&sig_term;
-$SIG{'CHLD'} = \&sig_chld;
-$SIG{'ALRM'} = \&timeout;
+unless ($^O =~ /^MS/i) {
+ $SIG{'INT'} = \&sig_term;
+ $SIG{'TERM'} = \&sig_term;
+ $SIG{'HUP'} = \&sig_term;
+ $SIG{'CHLD'} = \&sig_chld;
+}
dbgadd('connect');
$s =~ s/\s+//og;
$s =~ s/-\d+$//o; # no ssids!
cease(0) unless $s && $s gt ' ';
- unless (iscallsign($s)) {
+ unless (is_callsign($s)) {
$stdout->print("Sorry, $s is an invalid callsign");
cease(0);
}
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;
+ dolineend($1) if /^\s*[Ll]\w*\s+\'((?:\\[rn])+)\'/;
dochat($1, $2) if /^\s*\'(.*)\'\s+\'(.*)\'/io;
+
if (/^\s*cl\w+\s+(.*)/io) {
doclient($1);
last;
setmode();
# adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections
+$call =~ s/-0$//; # strip off -0 as this is equiv to just call on its own
my ($scall, $ssid) = split /-/, $call;
$ssid = undef unless $ssid && $ssid =~ /^\d+$/;
if ($ssid) {
}
-$conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
+$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
open IN, "$data/offline" or die;
for (;;) {
my $t;
- Msg->event_loop(1, 1);
+ Msg->event_loop(1, 0.1);
$t = time;
if ($t > $lasttime) {
if ($outqueue) {