Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gostnops
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wei.xuan
gostnops
Commits
53b2063d
Commit
53b2063d
authored
Aug 06, 2020
by
watermelo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mod: modify net function name
parent
d1d4b373
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
31 deletions
+32
-31
net.go
net/net.go
+10
-9
net_test.go
net/net_test.go
+22
-22
No files found.
net/net.go
View file @
53b2063d
...
...
@@ -33,8 +33,9 @@ var (
)
const
(
AnyhostValue
=
"0.0.0.0"
// Ipv4SplitCharacter use for slipt Ipv4
Ipv4SplitCharacter
=
"."
// Ipv6SplitCharacter use for slipt Ipv6
Ipv6SplitCharacter
=
":"
)
...
...
@@ -184,17 +185,17 @@ func ListenOnUDPRandomPort(ip string) (*net.UDPConn, error) {
return
net
.
ListenUDP
(
"udp4"
,
&
localAddr
)
}
// MatchI
p
is used to determine whether @pattern and @host:@port match, It's supports subnet/range
func
MatchI
p
(
pattern
,
host
,
port
string
)
bool
{
// MatchI
P
is used to determine whether @pattern and @host:@port match, It's supports subnet/range
func
MatchI
P
(
pattern
,
host
,
port
string
)
bool
{
// if the pattern is subnet format, it will not be allowed to config port param in pattern.
if
strings
.
Contains
(
pattern
,
"/"
)
{
_
,
subnet
,
_
:=
net
.
ParseCIDR
(
pattern
)
return
subnet
!=
nil
&&
subnet
.
Contains
(
net
.
ParseIP
(
host
))
}
return
matchI
p
Range
(
pattern
,
host
,
port
)
return
matchI
P
Range
(
pattern
,
host
,
port
)
}
func
matchI
p
Range
(
pattern
,
host
,
port
string
)
bool
{
func
matchI
P
Range
(
pattern
,
host
,
port
string
)
bool
{
if
pattern
==
""
||
host
==
""
{
log
.
Print
(
"Illegal Argument pattern or hostName. Pattern:"
+
pattern
+
", Host:"
+
host
)
return
false
...
...
@@ -249,9 +250,9 @@ func matchIpRange(pattern, host, port string) bool {
log
.
Print
(
"There is wrong format of ip Address: "
+
mask
[
i
])
return
false
}
min
:=
getNumOfI
p
Segment
(
rangeNumStrs
[
0
],
isIpv4
)
max
:=
getNumOfI
p
Segment
(
rangeNumStrs
[
1
],
isIpv4
)
ip
:=
getNumOfI
p
Segment
(
ipAddress
[
i
],
isIpv4
)
min
:=
getNumOfI
P
Segment
(
rangeNumStrs
[
0
],
isIpv4
)
max
:=
getNumOfI
P
Segment
(
rangeNumStrs
[
1
],
isIpv4
)
ip
:=
getNumOfI
P
Segment
(
ipAddress
[
i
],
isIpv4
)
if
ip
<
min
||
ip
>
max
{
return
false
}
...
...
@@ -303,7 +304,7 @@ func getPatternHostAndPort(pattern string, isIpv4 bool) []string {
return
result
}
func
getNumOfI
p
Segment
(
ipSegment
string
,
isIpv4
bool
)
int
{
func
getNumOfI
P
Segment
(
ipSegment
string
,
isIpv4
bool
)
int
{
if
isIpv4
{
ipSeg
,
_
:=
strconv
.
Atoi
(
ipSegment
)
return
ipSeg
...
...
net/net_test.go
View file @
53b2063d
...
...
@@ -89,79 +89,79 @@ func TestListenOnUDPRandomPort(t *testing.T) {
}
func
TestMatchIpIpv4Equal
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"192.168.0.1:8080"
,
"192.168.0.1"
,
"8080"
)
flag
:=
MatchI
P
(
"192.168.0.1:8080"
,
"192.168.0.1"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
"192.168.0.1"
,
"8080"
)
flag
=
MatchI
P
(
"*"
,
"192.168.0.1"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
"192.168.0.1"
,
""
)
flag
=
MatchI
P
(
"*"
,
"192.168.0.1"
,
""
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*.*.*.*"
,
"192.168.0.1"
,
"8080"
)
flag
=
MatchI
P
(
"*.*.*.*"
,
"192.168.0.1"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
""
,
""
)
flag
=
MatchI
P
(
"*"
,
""
,
""
)
assert
.
False
(
t
,
flag
)
}
func
TestMatchIpIpv4Subnet
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"206.0.68.0/23"
,
"206.0.68.123"
,
"8080"
)
flag
:=
MatchI
P
(
"206.0.68.0/23"
,
"206.0.68.123"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"206.0.68.0/23"
,
"207.0.69.123"
,
"8080"
)
flag
=
MatchI
P
(
"206.0.68.0/23"
,
"207.0.69.123"
,
"8080"
)
assert
.
False
(
t
,
flag
)
}
func
TestMatchIpIpv4Range
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"206.*.68.0"
,
"206.0.68.0"
,
"8080"
)
flag
:=
MatchI
P
(
"206.*.68.0"
,
"206.0.68.0"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"206.*.68.0"
,
"206.0.69.0"
,
"8080"
)
flag
=
MatchI
P
(
"206.*.68.0"
,
"206.0.69.0"
,
"8080"
)
assert
.
False
(
t
,
flag
)
flag
=
MatchI
p
(
"206.0.68-69.0"
,
"206.0.68.0"
,
"8080"
)
flag
=
MatchI
P
(
"206.0.68-69.0"
,
"206.0.68.0"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"206.0.68-69.0"
,
"206.0.70.0"
,
"8080"
)
flag
=
MatchI
P
(
"206.0.68-69.0"
,
"206.0.70.0"
,
"8080"
)
assert
.
False
(
t
,
flag
)
}
func
TestMatchIpIpv6Equal
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"[1fff:0:a88:85a3::ac1f]:8080"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
flag
:=
MatchI
P
(
"[1fff:0:a88:85a3::ac1f]:8080"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
flag
=
MatchI
P
(
"*"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
"1fff:0:a88:85a3::ac1f"
,
""
)
flag
=
MatchI
P
(
"*"
,
"1fff:0:a88:85a3::ac1f"
,
""
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*.*.*.*"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
flag
=
MatchI
P
(
"*.*.*.*"
,
"1fff:0:a88:85a3::ac1f"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"*"
,
""
,
""
)
flag
=
MatchI
P
(
"*"
,
""
,
""
)
assert
.
False
(
t
,
flag
)
}
func
TestMatchIpIpv6Subnet
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"1fff:0:a88:85a3::ac1f/64"
,
"1fff:0000:0a88:85a3:0000:0000:0000:0000"
,
"8080"
)
flag
:=
MatchI
P
(
"1fff:0:a88:85a3::ac1f/64"
,
"1fff:0000:0a88:85a3:0000:0000:0000:0000"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"1fff:0:a88:85a3::ac1f/64"
,
"2fff:0000:0a88:85a3:0000:0000:0000:0000"
,
"8080"
)
flag
=
MatchI
P
(
"1fff:0:a88:85a3::ac1f/64"
,
"2fff:0000:0a88:85a3:0000:0000:0000:0000"
,
"8080"
)
assert
.
False
(
t
,
flag
)
}
func
TestMatchIpIpv6Range
(
t
*
testing
.
T
)
{
flag
:=
MatchI
p
(
"234e:0:4567:0:0:0:3d:*"
,
"234e:0:4567:0:0:0:3d:4"
,
"8080"
)
flag
:=
MatchI
P
(
"234e:0:4567:0:0:0:3d:*"
,
"234e:0:4567:0:0:0:3d:4"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"234e:0:4567:0:0:0:3d:*"
,
"234e:0:4567:0:0:0:2d:4"
,
"8080"
)
flag
=
MatchI
P
(
"234e:0:4567:0:0:0:3d:*"
,
"234e:0:4567:0:0:0:2d:4"
,
"8080"
)
assert
.
False
(
t
,
flag
)
flag
=
MatchI
p
(
"234e:0:4567:0:0:0:3d:1-2"
,
"234e:0:4567:0:0:0:3d:1"
,
"8080"
)
flag
=
MatchI
P
(
"234e:0:4567:0:0:0:3d:1-2"
,
"234e:0:4567:0:0:0:3d:1"
,
"8080"
)
assert
.
True
(
t
,
flag
)
flag
=
MatchI
p
(
"234e:0:4567:0:0:0:3d:1-2"
,
"234e:0:4567:0:0:0:3d:3"
,
"8080"
)
flag
=
MatchI
P
(
"234e:0:4567:0:0:0:3d:1-2"
,
"234e:0:4567:0:0:0:3d:3"
,
"8080"
)
assert
.
False
(
t
,
flag
)
}
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