@@ -125,18 +125,24 @@ struct sock_args {
/* ESP in UDP encap test */
int use_xfrm;
};
static int server_mode;
-static unsigned int prog_timeout = 5;
+static unsigned int prog_timeout_ms = 5000;
static unsigned int interactive;
static int iter = 1;
static char *msg = "Hello world!";
static int msglen;
static int quiet;
static int try_broadcast = 1;
+static void set_timeval_ms(struct timeval *tv, unsigned long ms)
+{
+ tv->tv_sec = ms / 1000;
+ tv->tv_usec = (ms % 1000) * 1000;
+}
+
static char *timestamp(char *timebuf, int buflen)
{
time_t now;
now = time(NULL);
@@ -566,10 +572,29 @@ static int str_to_uint(const char *str, int min, int max, unsigned int *value)
}
return -1;
}
+/* parse seconds with a decimal point as miliseconds */
+static int str_to_msec(const char *str, unsigned int *value)
+{
+ float float_value;
+ char *end;
+
+ float_value = strtof(str, &end);
+
+ /* entire string should be consumed by conversion
+ * and value should be between min and max
+ */
+ if (((*end == '\0') || (*end == '\n')) && (end != str)) {
+ *value = float_value * 1000;
+ return 0;
+ }
+
+ return -1;
+}
+
static int resolve_devices(struct sock_args *args)
{
if (args->dev) {
args->ifindex = get_ifidx(args->dev);
if (args->ifindex < 0) {
@@ -1165,11 +1190,11 @@ static void set_recv_attr(int sd, int version)
}
static int msg_loop(int client, int sd, void *addr, socklen_t alen,
struct sock_args *args)
{
- struct timeval timeout = { .tv_sec = prog_timeout }, *ptval = NULL;
+ struct timeval timeout, *ptval = NULL;
fd_set rfds;
int nfds;
int rc;
if (args->type != SOCK_STREAM)
@@ -1182,13 +1207,15 @@ static int msg_loop(int client, int sd, void *addr, socklen_t alen,
if (client) {
if (send_msg(sd, addr, alen, args))
return 1;
}
if (!interactive) {
+ if (!prog_timeout_ms)
+ set_timeval_ms(&timeout, 5000);
+ else
+ set_timeval_ms(&timeout, prog_timeout_ms);
ptval = &timeout;
- if (!prog_timeout)
- timeout.tv_sec = 5;
}
}
nfds = interactive ? MAX(fileno(stdin), sd) + 1 : sd + 1;
while (1) {
@@ -1479,11 +1506,11 @@ static void ipc_write(int fd, int message)
}
static int do_server(struct sock_args *args, int ipc_fd)
{
/* ipc_fd = -1 if no parent process to signal */
- struct timeval timeout = { .tv_sec = prog_timeout }, *ptval = NULL;
+ struct timeval timeout, *ptval = NULL;
unsigned char addr[sizeof(struct sockaddr_in6)] = {};
socklen_t alen = sizeof(addr);
int lsd, csd = -1;
fd_set rfds;
@@ -1501,12 +1528,14 @@ static int do_server(struct sock_args *args, int ipc_fd)
args->dev = args->server_dev;
args->expected_dev = args->expected_server_dev;
if (resolve_devices(args) || validate_addresses(args))
goto err_exit;
- if (prog_timeout)
+ if (prog_timeout_ms) {
+ set_timeval_ms(&timeout, prog_timeout_ms);
ptval = &timeout;
+ }
if (args->has_grp)
lsd = msock_server(args);
else
lsd = lsock_init(args);
@@ -1584,20 +1613,22 @@ static int do_server(struct sock_args *args, int ipc_fd)
return 1;
}
static int wait_for_connect(int sd)
{
- struct timeval _tv = { .tv_sec = prog_timeout }, *tv = NULL;
+ struct timeval _tv, *tv = NULL;
fd_set wfd;
int val = 0, sz = sizeof(val);
int rc;
FD_ZERO(&wfd);
FD_SET(sd, &wfd);
- if (prog_timeout)
+ if (prog_timeout_ms) {
+ set_timeval_ms(&_tv, prog_timeout_ms);
tv = &_tv;
+ }
rc = select(FD_SETSIZE, NULL, &wfd, NULL, tv);
if (rc == 0) {
log_error("connect timed out\n");
return -2;
@@ -1945,12 +1976,11 @@ int main(int argc, char *argv[])
return 1;
}
args.port = (unsigned short) tmp;
break;
case 't':
- if (str_to_uint(optarg, 0, INT_MAX,
- &prog_timeout) != 0) {
+ if (str_to_msec(optarg, &prog_timeout_ms) != 0) {
fprintf(stderr, "Invalid timeout\n");
return 1;
}
break;
case 'D':
@@ -2091,11 +2121,11 @@ int main(int argc, char *argv[])
"Fork after listen only supported for server mode\n");
return 1;
}
if (interactive) {
- prog_timeout = 0;
+ prog_timeout_ms = 0;
msg = NULL;
}
if (both_mode) {
if (pipe(fd) < 0) {
This allows tests to be faster Signed-off-by: Leonard Crestez <cdleonard@gmail.com> --- tools/testing/selftests/net/nettest.c | 52 +++++++++++++++++++++------ 1 file changed, 41 insertions(+), 11 deletions(-)