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
/
Aranea.pm
diff --git
a/perl/Aranea.pm
b/perl/Aranea.pm
index e31b7984ffcb59914dc9bdb63a2bdfbffd65633b..7765af34fead427e39b4e7a12b2c95324994147d 100644
(file)
--- a/
perl/Aranea.pm
+++ b/
perl/Aranea.pm
@@
-272,12
+272,14
@@
sub formathead
my $hop = shift;
my $user = shift;
my $group = shift;
my $hop = shift;
my $user = shift;
my $group = shift;
+ my $touser = shift;
my $s = "$mycall,$dts,$hop";
$s .= ",$user" if $user;
if ($group) {
$s .= "," unless $user;
$s .= ",$group" if $group;
my $s = "$mycall,$dts,$hop";
$s .= ",$user" if $user;
if ($group) {
$s .= "," unless $user;
$s .= ",$group" if $group;
+ $s .= ",$touser" if $touser;
}
return $s;
}
}
return $s;
}
@@
-287,9
+289,10
@@
sub genheader
my $mycall = shift;
my $to = shift;
my $from = shift;
my $mycall = shift;
my $to = shift;
my $from = shift;
+ my $touser = shift;
my $date = ((($dayno << 1) | $ntpflag) << 18) | ($main::systime % 86400);
my $date = ((($dayno << 1) | $ntpflag) << 18) | ($main::systime % 86400);
- my $r = formathead($mycall, sprintf('%6X%04X', $date, $seqno), 0, $from, $to);
+ my $r = formathead($mycall, sprintf('%6X%04X', $date, $seqno), 0, $from, $to
, $touser
);
$seqno++;
$seqno = 0 if $seqno > 0x0ffff;
return $r;
$seqno++;
$seqno = 0 if $seqno > 0x0ffff;
return $r;
@@
-342,9
+345,11
@@
sub genmsg
my ($name) = uc ref $thing;
$name =~ /::(\w+)$/;
$name = $1;
my ($name) = uc ref $thing;
$name =~ /::(\w+)$/;
$name = $1;
+ my $group = $thing->{group};
my $head = genheader($thing->{origin},
my $head = genheader($thing->{origin},
- ($thing->{group} || $thing->{touser} || $thing->{tonode}),
- ($thing->{user} || $thing->{fromuser} || $thing->{fromnode})
+ $group,
+ ($thing->{user} || $thing->{fromuser} || $thing->{fromnode}),
+ $thing->{touser}
);
my $data = uc $name . ',';
);
my $data = uc $name . ',';
@@
-371,7
+376,7
@@
sub input
my ($head, $data) = split /\|/, $line, 2;
return unless $head && $data;
my ($head, $data) = split /\|/, $line, 2;
return unless $head && $data;
- my ($origin, $dts, $hop, $user, $group) = split /,/, $head;
+ my ($origin, $dts, $hop, $user, $group
, $tocall
) = split /,/, $head;
return if DXDupe::check("Ara,$origin,$dts", $dupeage);
my $err;
$err .= "incomplete header," unless $origin && $dts && defined $hop;
return if DXDupe::check("Ara,$origin,$dts", $dupeage);
my $err;
$err .= "incomplete header," unless $origin && $dts && defined $hop;
@@
-380,11
+385,10
@@
sub input
# validate it further
$err .= "missing cmd or data," unless $cmd && $data;
$err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
# validate it further
$err .= "missing cmd or data," unless $cmd && $data;
$err .= "invalid command ($cmd)," unless $cmd =~ /^[A-Z][A-Z0-9]*$/;
- my ($gp, $tus) = split /:/, $group, 2 if $group;
$err .= "from me," if $origin eq $main::mycall;
$err .= "from me," if $origin eq $main::mycall;
- $err .= "invalid group ($g
p)," if $gp && $gp !~ /^[
A-Z0-9]{2,}$/;
- $err .= "invalid tocall ($t
us)," if $tus && !is_callsign($tus
);
+ $err .= "invalid group ($g
roup)," if $group && $group !~ /^[-
A-Z0-9]{2,}$/;
+ $err .= "invalid tocall ($t
ocall)," if $tocall && !is_callsign($tocall
);
$err .= "invalid fromcall ($user)," if $user && !is_callsign($user);
my $class = 'Thingy::' . ucfirst(lc $cmd);
$err .= "invalid fromcall ($user)," if $user && !is_callsign($user);
my $class = 'Thingy::' . ucfirst(lc $cmd);
@@
-401,14
+405,14
@@
sub input
$thing = $class->new();
# reconstitute the header but wth hop increased by one
$thing = $class->new();
# reconstitute the header but wth hop increased by one
- $head = formathead($origin, $dts, ++$hop, $user, $group);
+ $head = formathead($origin, $dts, ++$hop, $user, $group
, $tocall
);
$thing->{Aranea} = "$head|$data";
# store useful data
$thing->{origin} = $origin;
$thing->{time} = $t;
$thing->{Aranea} = "$head|$data";
# store useful data
$thing->{origin} = $origin;
$thing->{time} = $t;
- $thing->{group} = $g
p if $g
p;
- $thing->{touser} = $t
us if $tus
;
+ $thing->{group} = $g
roup if $grou
p;
+ $thing->{touser} = $t
ocall if $tocall
;
$thing->{user} = $user if $user;
$thing->{hopsaway} = $hop;
$thing->{user} = $user if $user;
$thing->{hopsaway} = $hop;