projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-try with finished
[oweals/gnunet.git]
/
src
/
util
/
test_os_network.c
diff --git
a/src/util/test_os_network.c
b/src/util/test_os_network.c
index ca57765da06844ba55791ed67881f309f58059ac..423e66f636c858580970fc829bc5a3ea70dc7cab 100644
(file)
--- a/
src/util/test_os_network.c
+++ b/
src/util/test_os_network.c
@@
-4,7
+4,7
@@
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version
2
, or (at your
+ by the Free Software Foundation; either version
3
, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
@@
-34,18
+34,21
@@
* (success).
*/
static int
* (success).
*/
static int
-proc (void *cls,
- const
char *name
,
-
int isDefault, const struct sockaddr *addr,
socklen_t addrlen)
+proc (void *cls,
const char *name, int isDefault, const struct sockaddr *addr,
+ const
struct sockaddr *broadcast_addr, const struct sockaddr *netmask
,
+ socklen_t addrlen)
{
int *ok = cls;
char buf[INET6_ADDRSTRLEN];
{
int *ok = cls;
char buf[INET6_ADDRSTRLEN];
+ if (NULL == addr)
+ return GNUNET_OK;
+
inet_ntop (addr->sa_family,
inet_ntop (addr->sa_family,
- (addr->sa_family ==
AF_INET) ?
- (void *) &((struct sockaddr_in *) addr)->sin_addr :
-
(void *) &((struct sockaddr_in6 *) addr)->sin6_addr
,
-
buf,
sizeof (buf));
+ (addr->sa_family ==
+ AF_INET) ? (void *) &((struct sockaddr_in *) addr)->sin_addr
+
: (void *) &((struct sockaddr_in6 *) addr)->sin6_addr, buf
,
+ sizeof (buf));
if ((0 == strcmp ("::1", buf)) || (0 == strcmp ("127.0.0.1", buf)))
*ok = 0;
return GNUNET_OK;
if ((0 == strcmp ("::1", buf)) || (0 == strcmp ("127.0.0.1", buf)))
*ok = 0;
return GNUNET_OK;