4 files changed, 12 insertions, 12 deletions

diff --git a/BUGS b/BUGS
index 1d9398c9b..5c1991751 100644
--- a/BUGS
+++ b/BUGS
@@ -84,9 +84,12 @@ sane end-user should care about this codebase yet anyway.
   - integrate all options into "config.scm"
   - change config-file writing to exclude options set to default values
 * ARM:
-  - implement exponential back-off for service restarts
   - better tracking of which config changes actually need to cause process restarts by ARM.
-  - have way to specify dependencies between services (to manage ARM restarts better)
+  - listen for requests to discover dependencies between services (and avoid
+    having to explicitly program start requests)
+  - better crash management (attach debugging support, capture and analyze
+    debug output, detect random vs. deterministic crashes)
+  - shutdown sequence?
 * CORE: 
   - test case (test_core_api) hangs for a while (some timeout task not killed somewhere?)
   - [./core/gnunet-service-core.c:469]: (style) struct or union member 'Neighbour::message_queue_size' is never used
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 6f773bc11..65c286c25 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -31,7 +31,7 @@ BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 ALLOW_SHUTDOWN = YES
-DEFAULTSERVICES = resolver transport core
+DEFAULTSERVICES = resolver transport core 
 # GLOBAL_PREFIX =
 # USERNAME =
 # MAXBUF =
@@ -118,7 +118,6 @@ ALLOW_SHUTDOWN = YES
 # REJECT_FROM6 =
 # PREFIX =
 
-
 [core]
 PORT = 2092
 HOSTNAME = localhost
@@ -150,7 +149,6 @@ FRIENDS = $SERVICEHOME/friends
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-topology
 
-
 [hostlist]
 # port for hostlist http server
 HTTPPORT = 8080
diff --git a/src/transport/gnunet-nat-client.c b/src/transport/gnunet-nat-client.c
index 3bf409461..0fce09e71 100644
--- a/src/transport/gnunet-nat-client.c
+++ b/src/transport/gnunet-nat-client.c
@@ -42,27 +42,27 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/in.h> 
 
-#define DEBUG 0
+#define DEBUG 1
 
 /**
  * Number of UDP ports to keep open (typically >= 256)
  */
-#define NUM_UDP_PORTS 256
+#define NUM_UDP_PORTS  1024
 
 /**
  * Number of ICMP replies to send per message received (typically >= 1024)
  */
-#define NUM_ICMP_REPLIES 1024
+#define NUM_ICMP_REPLIES 10240
 
 /**
  * How often do we send our UDP messages to keep ports open? (typically < 100ms)
  */
-#define UDP_SEND_FREQUENCY_MS 50
+#define UDP_SEND_FREQUENCY_MS 10
 
 /**
  * Port we use for the dummy target.
  */
-#define NAT_TRAV_PORT 2222
+#define NAT_TRAV_PORT 22223
 
 /**
  * How often do we retry to open and bind a UDP socket before giving up?
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 84158584f..6a8b2db5e 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1136,7 +1136,6 @@ find_ready_address(struct NeighborList *neighbor)
   struct ReadyList *head = neighbor->plugins;
   struct PeerAddressList *addresses;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  struct GNUNET_TIME_Relative min_latency = GNUNET_TIME_relative_get_forever();
   struct PeerAddressList *best_address;
 
   best_address = NULL;
@@ -1168,7 +1167,7 @@ find_ready_address(struct NeighborList *neighbor)
 #if DEBUG_TRANSPORT
               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                           "Found address with latency %llu (previous best was %llu), setting as best found yet!\n",
-                          addresses->latency.value, best_address == NULL ? min_latency.value : best_address->latency.value);
+                          addresses->latency.value, best_address == NULL ? -1LL : best_address->latency.value);
 #endif
               best_address = addresses;
             }