aboutsummaryrefslogtreecommitdiff
path: root/src/nat/nat_test.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-07 15:06:33 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-07 15:06:33 +0000
commite6b9f7bb2febff33140dd3cb0ea96bed09a05346 (patch)
tree41aa5687251426ecc2cd465e9184d24aaaa1f9cb /src/nat/nat_test.c
parent465acbf13c2b8bc85786f75d12e57d04e6516ea1 (diff)
downloadgnunet-e6b9f7bb2febff33140dd3cb0ea96bed09a05346.tar.gz
gnunet-e6b9f7bb2febff33140dd3cb0ea96bed09a05346.zip
set af, better error msgs
Diffstat (limited to 'src/nat/nat_test.c')
-rw-r--r--src/nat/nat_test.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index a758cbce6..8a46a96fa 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -350,7 +350,11 @@ addr_cb (void *cls,
350 client = GNUNET_CLIENT_connect ("gnunet-nat-server", 350 client = GNUNET_CLIENT_connect ("gnunet-nat-server",
351 h->cfg); 351 h->cfg);
352 if (NULL == client) 352 if (NULL == client)
353 return; 353 {
354 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
355 _("Failed to connect to `gnunet-nat-server'\n"));
356 return;
357 }
354 ca = GNUNET_malloc (sizeof (struct ClientActivity)); 358 ca = GNUNET_malloc (sizeof (struct ClientActivity));
355 ca->client = client; 359 ca->client = client;
356 GNUNET_CONTAINER_DLL_insert (h->ca_head, 360 GNUNET_CONTAINER_DLL_insert (h->ca_head,
@@ -391,6 +395,7 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
391 const socklen_t addrlens[] = { sizeof (sa) }; 395 const socklen_t addrlens[] = { sizeof (sa) };
392 396
393 memset (&sa, 0, sizeof (sa)); 397 memset (&sa, 0, sizeof (sa));
398 sa.sin_family = AF_INET;
394 sa.sin_port = htons (bnd_port); 399 sa.sin_port = htons (bnd_port);
395#if HAVE_SOCKADDR_IN_SIN_LEN 400#if HAVE_SOCKADDR_IN_SIN_LEN
396 sa.sin_len = sizeof (sa); 401 sa.sin_len = sizeof (sa);
@@ -422,7 +427,10 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
422 sizeof (sa))) ) 427 sizeof (sa))) )
423 { 428 {
424 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 429 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
425 _("Failed to create listen socket for NAT test\n")); 430 _("Failed to create listen socket bound to `%s' for NAT test: %s\n"),
431 GNUNET_a2s ((const struct sockaddr*)&sa,
432 sizeof(sa)),
433 STRERROR (errno));
426 if (NULL != ret->lsock) 434 if (NULL != ret->lsock)
427 GNUNET_NETWORK_socket_close (ret->lsock); 435 GNUNET_NETWORK_socket_close (ret->lsock);
428 GNUNET_free (ret); 436 GNUNET_free (ret);