diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-04 14:10:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-04 14:10:32 +0000 |
commit | cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9 (patch) | |
tree | 5cb37c041743daff5af528dbbe24f5c563ce702e /src/nat | |
parent | b91546a3de767292e6472c6b1927480adba43d88 (diff) | |
download | gnunet-cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9.tar.gz gnunet-cf45b8dff29c366d51aa2e6ea6a64b99b514b9c9.zip |
bugfixes and redesigning scheduler API
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/nat.c | 8 | ||||
-rw-r--r-- | src/nat/test_nat.c | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c index 2a93d31a7..151c526d4 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c | |||
@@ -285,9 +285,7 @@ nat_pulse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
285 | notify_change (nat, ext_addr_natpmp, port_mapped); | 285 | notify_change (nat, ext_addr_natpmp, port_mapped); |
286 | } | 286 | } |
287 | 287 | ||
288 | nat->pulse_timer = GNUNET_SCHEDULER_add_delayed (nat->sched, GNUNET_NO, | 288 | nat->pulse_timer = GNUNET_SCHEDULER_add_delayed (nat->sched, |
289 | GNUNET_SCHEDULER_PRIORITY_DEFAULT, | ||
290 | GNUNET_SCHEDULER_NO_TASK, | ||
291 | GNUNET_TIME_UNIT_SECONDS, | 289 | GNUNET_TIME_UNIT_SECONDS, |
292 | &nat_pulse, nat); | 290 | &nat_pulse, nat); |
293 | } | 291 | } |
@@ -335,9 +333,7 @@ GNUNET_NAT_register (struct GNUNET_SCHEDULER_Handle *sched, | |||
335 | nat->natpmp = GNUNET_NAT_NATPMP_init (nat->local_addr, addrlen, nat->public_port); | 333 | nat->natpmp = GNUNET_NAT_NATPMP_init (nat->local_addr, addrlen, nat->public_port); |
336 | nat->upnp = GNUNET_NAT_UPNP_init (nat->local_addr, addrlen, nat->public_port); | 334 | nat->upnp = GNUNET_NAT_UPNP_init (nat->local_addr, addrlen, nat->public_port); |
337 | 335 | ||
338 | nat->pulse_timer = GNUNET_SCHEDULER_add_delayed (sched, GNUNET_NO, | 336 | nat->pulse_timer = GNUNET_SCHEDULER_add_delayed (sched, |
339 | GNUNET_SCHEDULER_PRIORITY_DEFAULT, | ||
340 | GNUNET_SCHEDULER_NO_TASK, | ||
341 | GNUNET_TIME_UNIT_SECONDS, | 337 | GNUNET_TIME_UNIT_SECONDS, |
342 | &nat_pulse, nat); | 338 | &nat_pulse, nat); |
343 | 339 | ||
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 2ff168c56..dc5112c36 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c | |||
@@ -125,9 +125,7 @@ run (void *cls, | |||
125 | nat = GNUNET_NAT_register (sched, addr, data.addrlen, addr_callback, NULL); | 125 | nat = GNUNET_NAT_register (sched, addr, data.addrlen, addr_callback, NULL); |
126 | GNUNET_free (addr); | 126 | GNUNET_free (addr); |
127 | 127 | ||
128 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_NO, | 128 | GNUNET_SCHEDULER_add_delayed (sched, |
129 | GNUNET_SCHEDULER_PRIORITY_DEFAULT, | ||
130 | GNUNET_SCHEDULER_NO_TASK, | ||
131 | GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, TIMEOUT), | 129 | GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, TIMEOUT), |
132 | stop, nat); | 130 | stop, nat); |
133 | } | 131 | } |