projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send only to commandmode users that are addressed
[spider.git]
/
perl
/
AMsg.pm
diff --git
a/perl/AMsg.pm
b/perl/AMsg.pm
index f1a7112f5c2159e735d91525358d256ee7f7a0f0..4738403a5bf2d2b1f6aee333ac8709ce3c1208c5 100644
(file)
--- a/
perl/AMsg.pm
+++ b/
perl/AMsg.pm
@@
-22,10
+22,8
@@
use Thingy;
use Thingy::Hello;
use vars qw($VERSION $BRANCH);
use Thingy::Hello;
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
use vars qw(@ISA $deftimeout);
use vars qw(@ISA $deftimeout);
@@
-71,7
+69,7
@@
sub dequeue
# this is the first stage that we have a callsign
# do we have a hello?
$msg =~ s/[\r\n]+$//;
# this is the first stage that we have a callsign
# do we have a hello?
$msg =~ s/[\r\n]+$//;
- if ($msg =~ m{
RT,[0-9A-F,]+|HELLO
}) {
+ if ($msg =~ m{
|HELLO,
}) {
# a possibly valid HELLO line, process it
$conn->new_channel($msg);
}
# a possibly valid HELLO line, process it
$conn->new_channel($msg);
}
@@
-128,7
+126,6
@@
sub new_client {
$conn->{outbound} = 0;
$conn->{state} = 'WH'; # wait for return authorize
my $thing = $conn->{lastthing} = Thingy::Hello->new();
$conn->{outbound} = 0;
$conn->{state} = 'WH'; # wait for return authorize
my $thing = $conn->{lastthing} = Thingy::Hello->new();
-
$thing->send($conn, 'Aranea');
dbg("-> D $conn->{peerhost} $thing->{Aranea}") if isdbg('chan');
}
$thing->send($conn, 'Aranea');
dbg("-> D $conn->{peerhost} $thing->{Aranea}") if isdbg('chan');
}
@@
-172,7
+169,7
@@
sub new_channel
# set up the basic channel info
# is there one already connected to me - locally?
my $user = DXUser->get_current($call);
# set up the basic channel info
# is there one already connected to me - locally?
my $user = DXUser->get_current($call);
- my $dxchan = DXChannel
->
get($call);
+ my $dxchan = DXChannel
::
get($call);
if ($dxchan) {
if ($main::bumpexisting && $call ne $main::mycall) {
my $ip = $conn->{peerhost} || 'unknown';
if ($dxchan) {
if ($main::bumpexisting && $call ne $main::mycall) {
my $ip = $conn->{peerhost} || 'unknown';