aboutsummaryrefslogtreecommitdiff
path: root/src/nat/test_nat_mini.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nat/test_nat_mini.c')
-rw-r--r--src/nat/test_nat_mini.c34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index a8381e497..8f689d6bc 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -50,10 +50,9 @@ addr_callback (void *cls, int add_remove,
50 const struct sockaddr *addr, socklen_t addrlen) 50 const struct sockaddr *addr, socklen_t addrlen)
51{ 51{
52 fprintf (stderr, 52 fprintf (stderr,
53 "Address changed: %s `%s' (%u bytes)\n", 53 "Address changed: %s `%s' (%u bytes)\n",
54 add_remove == GNUNET_YES ? "added" : "removed", 54 add_remove == GNUNET_YES ? "added" : "removed",
55 GNUNET_a2s (addr, addrlen), 55 GNUNET_a2s (addr, addrlen), (unsigned int) addrlen);
56 (unsigned int) addrlen);
57} 56}
58 57
59 58
@@ -65,8 +64,7 @@ stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
65{ 64{
66 struct GNUNET_NAT_MiniHandle *mini = cls; 65 struct GNUNET_NAT_MiniHandle *mini = cls;
67 66
68 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 67 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping NAT and quitting...\n");
69 "Stopping NAT and quitting...\n");
70 GNUNET_NAT_mini_map_stop (mini); 68 GNUNET_NAT_mini_map_stop (mini);
71} 69}
72 70
@@ -83,17 +81,14 @@ run (void *cls,
83 struct GNUNET_NAT_MiniHandle *mini; 81 struct GNUNET_NAT_MiniHandle *mini;
84 82
85 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 83 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
86 "Requesting NAT redirection for port %u...\n", 84 "Requesting NAT redirection for port %u...\n", PORT);
87 PORT); 85 mini = GNUNET_NAT_mini_map_start (PORT, GNUNET_YES /* tcp */ ,
88 mini = GNUNET_NAT_mini_map_start (PORT, 86 &addr_callback, NULL);
89 GNUNET_YES /* tcp */,
90 &addr_callback, NULL);
91 if (NULL == mini) 87 if (NULL == mini)
92 { 88 {
93 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 89 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Could not start UPnP interaction\n");
94 "Could not start UPnP interaction\n"); 90 return;
95 return; 91 }
96 }
97 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, mini); 92 GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, mini);
98} 93}
99 94
@@ -127,9 +122,10 @@ main (int argc, char *const argv[])
127 NULL); 122 NULL);
128 123
129 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 124 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
130 "UPnP test for NAT library, timeout set to %d seconds\n", TIMEOUT); 125 "UPnP test for NAT library, timeout set to %d seconds\n",
131 GNUNET_PROGRAM_run (5, argv_prog, "test-nat-mini", 126 TIMEOUT);
132 "nohelp", options, &run, NULL); 127 GNUNET_PROGRAM_run (5, argv_prog, "test-nat-mini", "nohelp", options, &run,
128 NULL);
133 return 0; 129 return 0;
134} 130}
135 131