projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trying to port statvfs call to BSD
[oweals/gnunet.git]
/
src
/
util
/
test_connection_timeout.c
diff --git
a/src/util/test_connection_timeout.c
b/src/util/test_connection_timeout.c
index 2580ae30a779034dde7fb6e1f9d8859030330574..c1d9c4c4d4b36b6ff05cf6bdfd2a889ef4c464da 100644
(file)
--- a/
src/util/test_connection_timeout.c
+++ b/
src/util/test_connection_timeout.c
@@
-37,6
+37,8
@@
static struct GNUNET_CONNECTION_Handle *lsock;
static struct GNUNET_NETWORK_Handle *ls;
static struct GNUNET_NETWORK_Handle *ls;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
/**
* Create and initialize a listen socket for the server.
/**
* Create and initialize a listen socket for the server.
@@
-51,15
+53,20
@@
open_listen_socket ()
struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ sa.sin_len = sizeof (sa);
+#endif
+ sa.sin_family = AF_INET;
sa.sin_port = htons (PORT);
sa.sin_port = htons (PORT);
- desc = GNUNET_NETWORK_socket_
socket
(AF_INET, SOCK_STREAM, 0);
+ desc = GNUNET_NETWORK_socket_
create
(AF_INET, SOCK_STREAM, 0);
GNUNET_assert (desc != NULL);
GNUNET_assert (desc != NULL);
- if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
+ if (GNUNET_NETWORK_socket_setsockopt
+ (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_NETWORK_socket_bind
(desc,
- (const struct sockaddr*) &sa,
-
sizeof (sa)) >= 0
);
+ GNUNET_assert (GNUNET_NETWORK_socket_bind
+ (desc, (const struct sockaddr *) &sa,
+
sizeof (sa)) == GNUNET_OK
);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
@@
-76,8
+83,8
@@
send_kilo (void *cls, size_t size, void *buf)
#endif
GNUNET_assert (buf == NULL);
*ok = 0;
#endif
GNUNET_assert (buf == NULL);
*ok = 0;
- GNUNET_CONNECTION_destroy (lsock);
- GNUNET_CONNECTION_destroy (csock);
+ GNUNET_CONNECTION_destroy (lsock
, GNUNET_YES
);
+ GNUNET_CONNECTION_destroy (csock
, GNUNET_YES
);
return 0;
}
#if VERBOSE
return 0;
}
#if VERBOSE
@@
-88,9
+95,9
@@
send_kilo (void *cls, size_t size, void *buf)
GNUNET_assert (NULL !=
GNUNET_CONNECTION_notify_transmit_ready (csock,
GNUNET_assert (NULL !=
GNUNET_CONNECTION_notify_transmit_ready (csock,
- 1024,
- GNUNET_TIME_UNIT_SECONDS,
- &send_kilo, cls));
+
1024,
+
GNUNET_TIME_UNIT_SECONDS,
+
&send_kilo, cls));
return 1024;
}
return 1024;
}
@@
-102,14
+109,14
@@
task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
ls = open_listen_socket ();
lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0);
GNUNET_assert (lsock != NULL);
ls = open_listen_socket ();
lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0);
GNUNET_assert (lsock != NULL);
- csock = GNUNET_CONNECTION_create_from_connect (tc->sched,
-
"localhost", PORT, 1024);
+ csock = GNUNET_CONNECTION_create_from_connect (tc->sched,
cfg,
+ "localhost", PORT, 1024);
GNUNET_assert (csock != NULL);
GNUNET_assert (NULL !=
GNUNET_CONNECTION_notify_transmit_ready (csock,
GNUNET_assert (csock != NULL);
GNUNET_assert (NULL !=
GNUNET_CONNECTION_notify_transmit_ready (csock,
- 1024,
- GNUNET_TIME_UNIT_SECONDS,
- &send_kilo, cls));
+
1024,
+
GNUNET_TIME_UNIT_SECONDS,
+
&send_kilo, cls));
}
}
@@
-123,7
+130,11
@@
check_timeout ()
int ok;
ok = 1;
int ok;
ok = 1;
+ cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ "resolver", "HOSTNAME", "localhost");
GNUNET_SCHEDULER_run (&task_timeout, &ok);
GNUNET_SCHEDULER_run (&task_timeout, &ok);
+ GNUNET_CONFIGURATION_destroy (cfg);
return ok;
}
return ok;
}