Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
25ad2c7a
Commit
25ad2c7a
authored
May 06, 2020
by
Olivier Crête
Committed by
Olivier Crête
May 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
interfaces: Use the private address detector from NiceAddress
parent
04ae880c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
36 deletions
+5
-36
agent/interfaces.c
agent/interfaces.c
+5
-36
No files found.
agent/interfaces.c
View file @
25ad2c7a
...
@@ -204,44 +204,13 @@ nice_interfaces_get_local_interfaces (void)
...
@@ -204,44 +204,13 @@ nice_interfaces_get_local_interfaces (void)
static
gboolean
static
gboolean
nice_interfaces_is_private_ip
(
const
struct
sockaddr
*
_
sa
)
nice_interfaces_is_private_ip
(
const
struct
sockaddr
*
sa
)
{
{
union
{
NiceAddress
niceaddr
;
const
struct
sockaddr
*
addr
;
const
struct
sockaddr_in
*
in
;
const
struct
sockaddr_in6
*
in6
;
}
sa
;
sa
.
addr
=
_sa
;
nice_address_init
(
&
niceaddr
);
nice_address_set_from_sockaddr
(
&
niceaddr
,
sa
);
if
(
sa
.
addr
->
sa_family
==
AF_INET
)
{
return
nice_address_is_private
(
&
niceaddr
);
/* 10.x.x.x/8 */
if
(
g_ntohl
(
sa
.
in
->
sin_addr
.
s_addr
)
>>
24
==
0x0A
)
return
TRUE
;
/* 172.16.0.0 - 172.31.255.255 = 172.16.0.0/10 */
if
(
g_ntohl
(
sa
.
in
->
sin_addr
.
s_addr
)
>>
20
==
0xAC1
)
return
TRUE
;
/* 192.168.x.x/16 */
if
(
g_ntohl
(
sa
.
in
->
sin_addr
.
s_addr
)
>>
16
==
0xC0A8
)
return
TRUE
;
/* 169.254.x.x/16 (for APIPA) */
if
(
g_ntohl
(
sa
.
in
->
sin_addr
.
s_addr
)
>>
16
==
0xA9FE
)
return
TRUE
;
}
else
if
(
sa
.
addr
->
sa_family
==
AF_INET6
)
{
/* fc00::/7 Unique local address (ULA) */
if
((
sa
.
in6
->
sin6_addr
.
s6_addr
[
0
]
&
0xFE
)
==
0xFC
)
return
TRUE
;
/* fe80::/10 link-local address */
if
(
(
sa
.
in6
->
sin6_addr
.
s6_addr
[
0
]
==
0xFE
)
&&
((
sa
.
in6
->
sin6_addr
.
s6_addr
[
1
]
&
0xC0
)
==
0x80
))
return
TRUE
;
}
return
FALSE
;
}
}
static
GList
*
static
GList
*
...
...
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