ndp: code cleanup

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/src/ndp.c b/src/ndp.c
index e201ac9..3b472de 100644 (file)
--- a/src/ndp.c
+++ b/src/ndp.c
@@ -33,9 +33,8 @@
 #include <netlink/socket.h>
 #include <netlink/attr.h>
 
-#include "router.h"
 #include "dhcpv6.h"
-#include "ndp.h"
+#include "odhcpd.h"
 
 struct event_socket {
        struct odhcpd_event ev;
@@ -395,7 +394,7 @@ static void check_addr_updates(struct interface *iface)
        }
 }
 
-void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
+static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
 {
        struct interface *c;
        char ipbuf[INET6_ADDRSTRLEN];
@@ -417,7 +416,7 @@ void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, boo
        }
 }
 
-void setup_ping6(struct in6_addr *addr, struct interface *iface)
+static void setup_ping6(struct in6_addr *addr, struct interface *iface)
 {
        struct interface *c;
 

diff --git a/src/ndp.h b/src/ndp.h
deleted file mode 100644 (file)
index abd5b0a..0000000
--- a/src/ndp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License v2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#pragma once
-#include "odhcpd.h"
-#include <time.h>
-
-#ifndef SOL_NETLINK
-#define SOL_NETLINK 270
-#endif
-
-#define NDP_MAX_NEIGHBORS 1000
-
-struct ndp_neighbor {
-       struct list_head head;
-       struct interface *iface;
-       struct in6_addr addr;
-       uint8_t len;
-       time_t timeout;
-};