Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
rockchip_libcore
Commits
cebe8968
Commit
cebe8968
authored
15 years ago
by
Android (Google) Code Review
Browse files
Options
Download
Plain Diff
Merge change I72b1f303
* changes: Add a comment.
parents
820172a7
b6317957
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
...tive/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
+4
-0
No files found.
luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
View file @
cebe8968
...
...
@@ -358,6 +358,10 @@ static const sockaddr* convertIpv4ToMapped(int fd,
memset
(
sin6
,
0
,
sizeof
(
*
sin6
));
sin6
->
sin6_family
=
AF_INET6
;
sin6
->
sin6_port
=
sin
->
sin_port
;
// TODO: mapUnspecified was introduced because kernels < 2.6.31 don't allow
// you to bind to ::ffff:0.0.0.0. When we move to something >= 2.6.31, we
// should make the code behave as if mapUnspecified were always true, and
// remove the parameter.
if
(
sin
->
sin_addr
.
s_addr
!=
0
||
mapUnspecified
)
{
memset
(
&
(
sin6
->
sin6_addr
.
s6_addr
[
10
]),
0xff
,
2
);
}
...
...
This diff is collapsed.
Click to expand it.
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