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
Toggle navigation
Open sidebar
p2p
go-cidranger
Commits
6a720386
Commit
6a720386
authored
Sep 21, 2017
by
Yulin Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix index out of range panic when finding ip from trie with single ip network, referencing #4
parent
e27c5f9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
0 deletions
+49
-0
trie.go
trie.go
+3
-0
trie_test.go
trie_test.go
+46
-0
No files found.
trie.go
View file @
6a720386
...
...
@@ -149,6 +149,9 @@ func (p *prefixTrie) containingNetworks(number rnet.NetworkNumber) ([]RangerEntr
if
p
.
hasEntry
()
{
results
=
[]
RangerEntry
{
p
.
entry
}
}
if
p
.
targetBitPosition
()
<
0
{
return
results
,
nil
}
bit
,
err
:=
p
.
targetBitFromIP
(
number
)
if
err
!=
nil
{
return
nil
,
err
...
...
trie_test.go
View file @
6a720386
...
...
@@ -193,6 +193,52 @@ func TestPrefixTrieRemove(t *testing.T) {
}
}
func
TestToReplicateIssue
(
t
*
testing
.
T
)
{
cases
:=
[]
struct
{
version
rnet
.
IPVersion
inserts
[]
string
ip
net
.
IP
networks
[]
string
name
string
}{
{
rnet
.
IPv4
,
[]
string
{
"192.168.0.1/32"
},
net
.
ParseIP
(
"192.168.0.1"
),
[]
string
{
"192.168.0.1/32"
},
"basic containing network for /32 mask"
,
},
{
rnet
.
IPv6
,
[]
string
{
"a::1/128"
},
net
.
ParseIP
(
"a::1"
),
[]
string
{
"a::1/128"
},
"basic containing network for /128 mask"
,
},
}
for
_
,
tc
:=
range
cases
{
t
.
Run
(
tc
.
name
,
func
(
t
*
testing
.
T
)
{
trie
:=
newPrefixTree
(
tc
.
version
)
for
_
,
insert
:=
range
tc
.
inserts
{
_
,
network
,
_
:=
net
.
ParseCIDR
(
insert
)
err
:=
trie
.
Insert
(
NewBasicRangerEntry
(
*
network
))
assert
.
NoError
(
t
,
err
)
}
expectedEntries
:=
[]
RangerEntry
{}
for
_
,
network
:=
range
tc
.
networks
{
_
,
net
,
_
:=
net
.
ParseCIDR
(
network
)
expectedEntries
=
append
(
expectedEntries
,
NewBasicRangerEntry
(
*
net
))
}
contains
,
err
:=
trie
.
Contains
(
tc
.
ip
)
assert
.
NoError
(
t
,
err
)
assert
.
True
(
t
,
contains
)
networks
,
err
:=
trie
.
ContainingNetworks
(
tc
.
ip
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
expectedEntries
,
networks
)
})
}
}
type
expectedIPRange
struct
{
start
net
.
IP
end
net
.
IP
...
...
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