Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
Kulya
OpnSense
Commits
7100fedb
Commit
7100fedb
authored
Dec 02, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(util.inc) php7 fix ip_in_subnet()
parent
8067e9bd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
util.inc
src/etc/inc/util.inc
+6
-3
No files found.
src/etc/inc/util.inc
View file @
7100fedb
...
@@ -1168,11 +1168,14 @@ function ip_in_subnet($addr,$subnet)
...
@@ -1168,11 +1168,14 @@ function ip_in_subnet($addr,$subnet)
{
{
if
(
is_ipaddrv6
(
$addr
))
{
if
(
is_ipaddrv6
(
$addr
))
{
return
(
Net_IPv6
::
isInNetmask
(
$addr
,
$subnet
));
return
(
Net_IPv6
::
isInNetmask
(
$addr
,
$subnet
));
}
else
{
/* XXX: Maybe check for IPv4 */
}
else
if
(
is_ipaddrv4
(
$addr
))
{
list
(
$ip
,
$mask
)
=
explode
(
'/'
,
$subnet
);
list
(
$ip
,
$mask
)
=
explode
(
'/'
,
$subnet
);
if
(
is_ipaddrv4
(
$ip
)
&&
$mask
<=
32
)
{
$mask
=
(
0xffffffff
<<
(
32
-
$mask
))
&
0xffffffff
;
$mask
=
(
0xffffffff
<<
(
32
-
$mask
))
&
0xffffffff
;
return
((
ip2long
(
$addr
)
&
$mask
)
==
(
ip2long
(
$ip
)
&
$mask
));
return
((
ip2long
(
$addr
)
&
$mask
)
==
(
ip2long
(
$ip
)
&
$mask
));
}
}
}
return
false
;
}
}
function
is_private_ip
(
$iptocheck
)
function
is_private_ip
(
$iptocheck
)
...
...
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