projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix eph_dup
[spider.git]
/
perl
/
Thingy
/
Dx.pm
diff --git
a/perl/Thingy/Dx.pm
b/perl/Thingy/Dx.pm
index 9b7a181becf7da0cfceece21e28600f1c0935ee9..c4d969a03aceedab799905c57c1a7b35d725fce3 100644
(file)
--- a/
perl/Thingy/Dx.pm
+++ b/
perl/Thingy/Dx.pm
@@
-11,10
+11,8
@@
use strict;
package Thingy::Dx;
use vars qw($VERSION $BRANCH);
package Thingy::Dx;
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 DXChannel;
use DXDebug;
use DXChannel;
use DXDebug;
@@
-86,7
+84,7
@@
sub gen_DXCommandmode
if ($dxchan->{ve7cc}) {
$buf = VE7CC::dx_spot($dxchan, $thing->{spotdata});
} else {
if ($dxchan->{ve7cc}) {
$buf = VE7CC::dx_spot($dxchan, $thing->{spotdata});
} else {
- $buf =
$dxchan->format_dx_spot(
$thing->{spotdata});
+ $buf =
Spot::format_dx_spot($dxchan,
$thing->{spotdata});
$buf .= "\a\a" if $dxchan->{beep};
$buf =~ s/\%5E/^/g;
}
$buf .= "\a\a" if $dxchan->{beep};
$buf =~ s/\%5E/^/g;
}
@@
-142,11
+140,11
@@
sub out_filter
my $thing = shift;
my $dxchan = shift;
my $thing = shift;
my $dxchan = shift;
- # global spot filtering on
IN
PUT
- if ($dxchan->{
in
spotsfilter}) {
- my ($filter, $hops) = $dxchan->{
in
spotsfilter}->it($thing->{spotdata});
+ # global spot filtering on
OUT
PUT
+ if ($dxchan->{spotsfilter}) {
+ my ($filter, $hops) = $dxchan->{spotsfilter}->it($thing->{spotdata});
unless ($filter) {
unless ($filter) {
- dbg("PCPROT: Rejected by
in
put spot filter") if isdbg('chanerr');
+ dbg("PCPROT: Rejected by
out
put spot filter") if isdbg('chanerr');
return;
}
$thing->{hops} = $hops if $hops;
return;
}
$thing->{hops} = $hops if $hops;