Merged silc_1_0_branch to trunk.

[silc.git] / apps / silcd / route.c

diff --git a/apps/silcd/route.c b/apps/silcd/route.c
index 6c1e03d1c7971bcbcdd6f24d1a59354bfca73ebe..5488bb315659a5417fbaf692ecbf5ae8b065e807 100644 (file)
--- a/apps/silcd/route.c
+++ b/apps/silcd/route.c
@@ -97,11 +97,11 @@ SilcSocketConnection silc_server_route_get(SilcServer server, void *id,
 #endif
 
     router = silc_server_route_check(dest, port);
-    if (!router)
-      return (SilcSocketConnection)server->id_entry->router->connection;
-
-    return (SilcSocketConnection)router->connection;
+    if (router)
+        return (SilcSocketConnection)router->connection;
   }
 
-  return (SilcSocketConnection)server->id_entry->router->connection;
+  return (server->id_entry->router) 
+       ? (SilcSocketConnection)server->id_entry->router->connection
+       : NULL;
 }