From: minima Date: Sun, 25 Feb 2001 17:36:52 +0000 (+0000) Subject: added a not found message to sh/qrz X-Git-Tag: R_1_47_PRE1~7 X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=dc016a0633cdb15d29b9a71fdec2c230fbad201b;p=spider.git added a not found message to sh/qrz added some extra Net::Telnet options to client.pl --- diff --git a/cmd/show/qrz.pl b/cmd/show/qrz.pl index 9dd99818..4b05c7e0 100644 --- a/cmd/show/qrz.pl +++ b/cmd/show/qrz.pl @@ -39,6 +39,7 @@ foreach $l (@list) { } } $t->close; + push @out, $self->msg('e3', 'qrz.com', $call) unless @out; } else { push @out, $self->msg('e18', 'QRZ.com'); } diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 6b0bb554..779139fc 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -89,6 +89,7 @@ use vars qw(%channels %valid); logininfo => '9,Login info req,yesno', talklist => '0,Talk List,parray', cluster => '5,Cluster data', + isbasic => '9,Internal Connection', ); # object destruction diff --git a/perl/client.pl b/perl/client.pl index f153b589..ddf3fd3b 100755 --- a/perl/client.pl +++ b/perl/client.pl @@ -94,6 +94,7 @@ sub setmode $out_lineend = "\r\n"; } $/ = $mynl; + $out_lineend = $mynl; } # handle incoming messages @@ -235,6 +236,12 @@ sub doconnect $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 $!"; + 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') { diff --git a/perl/cluster.pl b/perl/cluster.pl index e66d45aa..995500ca 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -338,21 +338,23 @@ Msg->new_server("$clusteraddr", $clusterport, \&login); dbg('err', "load badwords: " . (BadWords::load or "Ok")); # prime some signals -$SIG{INT} = \&cease; -$SIG{TERM} = \&cease; -$SIG{HUP} = 'IGNORE'; -$SIG{CHLD} = sub { $zombies++ }; - -$SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); }; -$SIG{IO} = sub { dbg('err', "SIGIO received"); }; -$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE'; -$SIG{KILL} = 'DEFAULT'; # as if it matters.... - -# catch the rest with a hopeful message -for (keys %SIG) { - if (!$SIG{$_}) { -# dbg('chan', "Catching SIG $_"); - $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; +unless ($^O =~ /^MS/) { + $SIG{INT} = \&cease; + $SIG{TERM} = \&cease; + $SIG{HUP} = 'IGNORE'; + $SIG{CHLD} = sub { $zombies++ }; + + $SIG{PIPE} = sub { dbg('err', "Broken PIPE signal received"); }; + $SIG{IO} = sub { dbg('err', "SIGIO received"); }; + $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE'; + $SIG{KILL} = 'DEFAULT'; # as if it matters.... + + # catch the rest with a hopeful message + for (keys %SIG) { + if (!$SIG{$_}) { + # dbg('chan', "Catching SIG $_"); + $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; + } } }