From dac67c7059618537881c52b602c7d49ae4397f8c Mon Sep 17 00:00:00 2001
From: Jeremy Lakeman <Jeremy.Lakeman@gmail.com>
Date: Fri, 12 Sep 2014 15:20:52 +0930
Subject: [PATCH] Small fixes while testing directory services

---
 directory_client.c | 1 +
 overlay_link.c     | 2 +-
 server.c           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/directory_client.c b/directory_client.c
index 33fdf262..76334cc7 100644
--- a/directory_client.c
+++ b/directory_client.c
@@ -117,6 +117,7 @@ int directory_service_init(){
       INFOF("ADD DIRECTORY SERVICE %s", alloca_tohex_sid_t(directory_service->sid));
     }
   }
+  unschedule(&directory_alarm);
   directory_update(&directory_alarm);
   return 0;
 }
diff --git a/overlay_link.c b/overlay_link.c
index 7edc431e..f90594a8 100644
--- a/overlay_link.c
+++ b/overlay_link.c
@@ -295,7 +295,7 @@ int overlay_mdp_service_stun(struct internal_mdp_header *header, struct overlay_
     addr.inet.sin_addr.s_addr = ob_get_ui32(payload);
     addr.inet.sin_port = ob_get_ui16(payload);
     
-    if (!subscriber || (subscriber->reachable!=REACHABLE_NONE))
+    if (!subscriber || (subscriber->reachable&REACHABLE_DIRECT))
       continue;
     
     struct network_destination *destination = create_unicast_destination(&addr, NULL);
diff --git a/server.c b/server.c
index c9764c5c..053aee13 100644
--- a/server.c
+++ b/server.c
@@ -655,6 +655,7 @@ static int app_server_start(const struct cli_parsed *parsed, struct cli_context
     sleep_ms(milliseconds);
   }
 exit:
+  serverMode = 0;
   keyring_free(keyring);
   keyring = NULL;
   RETURN(ret);