Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
eb91a08e
Commit
eb91a08e
authored
Jan 08, 2014
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor bug fix.
parent
f8175417
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
db/Node.pm.in
db/Node.pm.in
+11
-6
No files found.
db/Node.pm.in
View file @
eb91a08e
#
!/usr/bin/perl -wT
#
#
Copyright
(
c
)
2005
-
201
3
University
of
Utah
and
the
Flux
Group
.
#
Copyright
(
c
)
2005
-
201
4
University
of
Utah
and
the
Flux
Group
.
#
#
{{{
EMULAB
-
LICENSE
#
...
...
@@ -3412,11 +3412,16 @@ sub GetJailIP($;$)
print STDERR "*** GetJailIP: No control IP for $interface\n";
return undef;
}
my $tmp = ~inet_aton($CONTROL_NETMASK) & inet_aton($ctrlip);
$ipbase = unpack("N", $tmp);
if ($ipbase == 0 || $ipbase < 0 || $ipbase > 0x3fff) {
print STDERR "*** GetJailIP: Bad ipbase '
$
ipbase
' for $interface\n";
return undef;
if ($self->node_id() =~ /^(.*\D)(\d+)$/) {
$ipbase = $2;
}
else {
my $tmp = ~inet_aton($CONTROL_NETMASK) & inet_aton($ctrlip);
$ipbase = unpack("N", $tmp);
if ($ipbase == 0 || $ipbase < 0 || $ipbase > 0x3fff) {
print STDERR "*** GetJailIP: Bad ipbase '
$
ipbase
' for $interface\n";
return undef;
}
}
my $node_id = $self->node_id();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment