Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-Server
Commits
68aa51b6
Commit
68aa51b6
authored
Feb 14, 2003
by
Michael Smith
Browse files
Fix formatting of ip addresses so that v6 sockets are logged correctly.
svn path=/trunk/net/; revision=4345
parent
1644a6f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/net/sock.c
View file @
68aa51b6
...
...
@@ -668,15 +668,19 @@ int sock_accept(sock_t serversock, char *ip, int len)
ret
=
accept
(
serversock
,
(
struct
sockaddr
*
)
&
sa
,
&
slen
);
if
(
ret
>=
0
&&
ip
!=
NULL
)
{
/* inet_ntoa is not reentrant, we should protect this */
#ifdef HAVE_IPV6
if
(
inet_ntop
(
AF_INET
,
&
((
struct
sockaddr_in
*
)
&
sa
)
->
sin_addr
,
ip
,
len
)
<=
0
)
{
inet_ntop
(
AF_INET6
,
&
((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_addr
,
if
(((
struct
sockaddr_in
*
)
&
sa
)
->
sin_family
==
AF_INET
)
inet_ntop
(
AF_INET
,
&
((
struct
sockaddr_in
*
)
&
sa
)
->
sin_addr
,
ip
,
len
);
else
if
(((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_family
==
AF_INET6
)
inet_ntop
(
AF_INET6
,
&
((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_addr
,
ip
,
len
);
else
{
strncpy
(
ip
,
"ERROR"
,
len
-
1
);
ip
[
len
-
1
]
=
0
;
}
#else
/* inet_ntoa is not reentrant, we should protect this */
strncpy
(
ip
,
inet_ntoa
(
sa
.
sin_addr
),
len
);
#endif
sock_set_nolinger
(
ret
);
...
...
Write
Preview
Supports
Markdown
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