Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
fd133237
Commit
fd133237
authored
17 years ago
by
Kai Blin
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ws2_32: Handle IPv6 in WSAStringToAddress.
parent
bf6a96ca
Loading
Loading
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+2
-0
2 additions, 0 deletions
configure
configure.ac
+1
-0
1 addition, 0 deletions
configure.ac
dlls/ws2_32/socket.c
+35
-4
35 additions, 4 deletions
dlls/ws2_32/socket.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
41 additions
and
4 deletions
configure
+
2
−
0
View file @
fd133237
...
...
@@ -15826,6 +15826,7 @@ fi
for ac_func in \
...
...
@@ -15857,6 +15858,7 @@ for ac_func in \
gettid \
gettimeofday \
getuid \
inet_pton \
kqueue \
lstat \
memmove \
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
0
View file @
fd133237
...
...
@@ -1151,6 +1151,7 @@ AC_CHECK_FUNCS(\
gettid \
gettimeofday \
getuid \
inet_pton \
kqueue \
lstat \
memmove \
...
...
This diff is collapsed.
Click to expand it.
dlls/ws2_32/socket.c
+
35
−
4
View file @
fd133237
...
...
@@ -4457,7 +4457,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
switch
(
AddressFamily
)
{
case
AF_INET
:
case
WS_
AF_INET
:
{
struct
in_addr
inetaddr
;
...
...
@@ -4494,8 +4494,9 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
break
;
}
case
AF_INET6
:
case
WS_
AF_INET6
:
{
struct
in6_addr
inetaddr
;
/* If lpAddressLength is too small, tell caller the size we need */
if
(
*
lpAddressLength
<
sizeof
(
SOCKADDR_IN6
))
{
...
...
@@ -4503,8 +4504,38 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
res
=
WSAEFAULT
;
break
;
}
FIXME
(
"We don't support IPv6 yet.
\n
"
);
res
=
WSAEINVAL
;
#ifdef HAVE_INET_PTON
memset
(
lpAddress
,
0
,
sizeof
(
SOCKADDR_IN6
));
((
LPSOCKADDR_IN6
)
lpAddress
)
->
sin6_family
=
WS_AF_INET6
;
/* This one is a bit tricky. An IPv6 address contains colons, so the
* check from IPv4 doesn't work like that. However, IPv6 addresses that
* contain a port are written with braces like [fd12:3456:7890::1]:12345
* so what we will do is to look for ']', check if the next char is a
* colon, and if it is, parse the port as in IPv4. */
ptrPort
=
strchr
(
workBuffer
,
']'
);
if
(
ptrPort
&&
*
(
++
ptrPort
)
==
':'
)
{
((
LPSOCKADDR_IN6
)
lpAddress
)
->
sin6_port
=
(
WS_u_short
)
atoi
(
ptrPort
+
1
);
*
ptrPort
=
'\0'
;
}
else
{
((
LPSOCKADDR_IN6
)
lpAddress
)
->
sin6_port
=
0
;
}
if
(
inet_pton
(
AF_INET6
,
workBuffer
,
&
inetaddr
)
>
0
)
{
memcpy
(
&
((
LPSOCKADDR_IN6
)
lpAddress
)
->
sin6_addr
,
&
inetaddr
,
sizeof
(
struct
in6_addr
));
res
=
0
;
}
else
#endif
/* HAVE_INET_PTON */
res
=
WSAEINVAL
;
break
;
}
default:
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
fd133237
...
...
@@ -240,6 +240,9 @@
/* Define to 1 if you have the `inet_network' function. */
#undef HAVE_INET_NETWORK
/* Define to 1 if you have the `inet_pton' function. */
#undef HAVE_INET_PTON
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment