netlink: Remove a newline from p-t-p startup message

[secnet.git] / netlink.c

diff --git a/netlink.c b/netlink.c
index 54ad76fb908fa6d7383bb96422cb2fcf84d797a2..794bffe7b5c6bf3755e7b9c64817b2816eed8865 100644 (file)
--- a/netlink.c
+++ b/netlink.c
@@ -410,12 +410,23 @@ static bool_t netlink_check(struct netlink *st, struct buffer_if *buf,
 }
 
 /* Deliver a packet _to_ client; used after we have decided
- * what to do with it. */
+ * what to do with it (and just to check that the client has
+ * actually registered a delivery function with us). */
 static void netlink_client_deliver(struct netlink *st,
                                   struct netlink_client *client,
                                   uint32_t source, uint32_t dest,
                                   struct buffer_if *buf)
 {
+    if (!client->deliver) {
+       string_t s,d;
+       s=ipaddr_to_string(source);
+       d=ipaddr_to_string(dest);
+       Message(M_ERR,"%s: dropping %s->%s, client not registered\n",
+               st->name,s,d);
+       free(s); free(d);
+       BUF_FREE(buf);
+       return;
+    }
     client->deliver(client->dst, buf);
     client->outcount++;
 }
@@ -754,7 +765,7 @@ static void netlink_dump_routes(struct netlink *st, bool_t requested)
     if (requested) c=M_WARNING;
     if (st->ptp) {
        net=ipaddr_to_string(st->secnet_address);
-       Message(c,"%s: point-to-point (remote end is %s); routes:\n",
+       Message(c,"%s: point-to-point (remote end is %s); routes: ",
                st->name, net);
        free(net);
        netlink_output_subnets(st,c,st->clients->subnets);