projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct some english
[spider.git]
/
perl
/
Msg.pm
diff --git
a/perl/Msg.pm
b/perl/Msg.pm
index 8be2fc1bf071d39dd464907de8397da7fdd27891..3f52e39dfe8057d4fb202f364be81eb36567ceb3 100644
(file)
--- a/
perl/Msg.pm
+++ b/
perl/Msg.pm
@@
-11,6
+11,13
@@
package Msg;
use strict;
package Msg;
use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
use IO::Select;
use IO::Socket;
use DXDebug;
use IO::Select;
use IO::Socket;
use DXDebug;
@@
-80,7
+87,7
@@
sub new
$noconns++;
$noconns++;
- dbg(
'connll', "Connection created ($noconns)"
);
+ dbg(
"Connection created ($noconns)") if isdbg('connll'
);
return bless $conn, $class;
}
return bless $conn, $class;
}
@@
-122,11
+129,11
@@
sub conns
if (ref $pkg) {
$call = $pkg->{call} unless $call;
return undef unless $call;
if (ref $pkg) {
$call = $pkg->{call} unless $call;
return undef unless $call;
- dbg(
'connll', "changing $pkg->{call} to $call") if
exists $pkg->{call} && $call ne $pkg->{call};
+ dbg(
"changing $pkg->{call} to $call") if isdbg('connll') &&
exists $pkg->{call} && $call ne $pkg->{call};
delete $conns{$pkg->{call}} if exists $pkg->{call} && exists $conns{$pkg->{call}} && $pkg->{call} ne $call;
$pkg->{call} = $call;
$ref = $conns{$call} = $pkg;
delete $conns{$pkg->{call}} if exists $pkg->{call} && exists $conns{$pkg->{call}} && $pkg->{call} ne $call;
$pkg->{call} = $call;
$ref = $conns{$call} = $pkg;
- dbg(
'connll', "Connection $pkg->{cnum} $call stored"
);
+ dbg(
"Connection $pkg->{cnum} $call stored") if isdbg('connll'
);
} else {
$ref = $conns{$call};
}
} else {
$ref = $conns{$call};
}
@@
-199,7
+206,7
@@
sub disconnect {
delete $conns{$call} if $ref && $ref == $conn;
}
$call ||= 'unallocated';
delete $conns{$call} if $ref && $ref == $conn;
}
$call ||= 'unallocated';
- dbg(
'connll', "Connection $conn->{cnum} $call disconnected"
);
+ dbg(
"Connection $conn->{cnum} $call disconnected") if isdbg('connll'
);
unless ($main::is_win) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
unless ($main::is_win) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
@@
-427,7
+434,7
@@
sub new_client {
$conn->disconnect();
}
} else {
$conn->disconnect();
}
} else {
- dbg(
'err', "Msg: error on accept ($!)"
);
+ dbg(
"Msg: error on accept ($!)") if isdbg('err'
);
}
}
}
}
@@
-536,7
+543,7
@@
sub DESTROY
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
- dbg(
'connll', "Connection $conn->{cnum} $call [$host $port] being destroyed"
);
+ dbg(
"Connection $conn->{cnum} $call [$host $port] being destroyed") if isdbg('connll'
);
$noconns--;
}
$noconns--;
}