From e980a38b4e23b63913990fb647444c7b6a633c83 Mon Sep 17 00:00:00 2001
From: Daniel Adolfsson <daniel@ashen.se>
Date: Wed, 11 Dec 2019 14:41:00 +0100
Subject: [PATCH] Cleanup

---
 src/alloc.c   | 2 +-
 src/conf.h    | 7 +++----
 src/iface.h   | 6 +++---
 src/ndppd.c   | 1 -
 src/proxy.h   | 3 +--
 src/rtnl.h    | 1 -
 src/rule.c    | 2 +-
 src/rule.h    | 5 +++--
 src/session.h | 2 +-
 src/sio.h     | 1 -
 10 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index 85baa5c..5a6f4c9 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -24,8 +24,8 @@
 #    define NDPPD_ALLOC_SIZE 16384
 #endif
 
-#include "ndppd.h"
 #include "alloc.h"
+#include "ndppd.h"
 
 typedef struct ndL_chunk ndL_chunk_t;
 
diff --git a/src/conf.h b/src/conf.h
index 9413d14..3f7a537 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -16,12 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with ndppd.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef NDPPD_CF_H
-#define NDPPD_CF_H
+#ifndef NDPPD_CONF_H
+#define NDPPD_CONF_H
 
 #include "ndppd.h"
 
-/* cf.c */
 bool nd_conf_load(const char *path);
 
-#endif // NDPPD_CF_H
+#endif /* NDPPD_CONF_H */
diff --git a/src/iface.h b/src/iface.h
index 2db36c9..5992bfc 100644
--- a/src/iface.h
+++ b/src/iface.h
@@ -16,8 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with ndppd.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef NDPPD_IFA_H
-#define NDPPD_IFA_H
+#ifndef NDPPD_IFACE_H
+#define NDPPD_IFACE_H
 
 #include "ndppd.h"
 #include <net/if.h>
@@ -51,4 +51,4 @@ bool nd_iface_set_allmulti(nd_iface_t *iface, bool on);
 bool nd_iface_set_promisc(nd_iface_t *iface, bool on);
 void nd_iface_cleanup();
 
-#endif /* NDPPD_IFA_H */
+#endif /* NDPPD_IFACE_H */
diff --git a/src/ndppd.c b/src/ndppd.c
index 814cc32..1a6e06d 100644
--- a/src/ndppd.c
+++ b/src/ndppd.c
@@ -119,7 +119,6 @@ static bool ndL_daemonize()
     close(STDOUT_FILENO);
     close(STDERR_FILENO);
 
-
     return true;
 }
 
diff --git a/src/proxy.h b/src/proxy.h
index 09d22ba..36296a1 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -35,10 +35,9 @@ struct nd_proxy
     bool promisc;
 };
 
-/* proxy.c */
 nd_proxy_t *nd_proxy_create(const char *ifname);
 void nd_proxy_handle_ns(nd_proxy_t *proxy, nd_addr_t *src, nd_addr_t *dst, nd_addr_t *tgt, uint8_t *src_ll);
 bool nd_proxy_startup();
 void nd_proxy_update_all();
 
-#endif // NDPPD_PROXY_H
+#endif /* NDPPD_PROXY_H */
diff --git a/src/rtnl.h b/src/rtnl.h
index e9e884a..29cf1c6 100644
--- a/src/rtnl.h
+++ b/src/rtnl.h
@@ -44,7 +44,6 @@ struct nd_rtnl_addr
 
 extern long nd_rtnl_dump_timeout;
 
-
 bool nd_rtnl_open();
 void nd_rtnl_cleanup();
 bool nd_rtnl_query_addresses();
diff --git a/src/rule.c b/src/rule.c
index 385f5cd..699f1ef 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with ndppd.  If not, see <https://www.gnu.org/licenses/>.
  */
+#include "rule.h"
 #include "ndppd.h"
 #include "proxy.h"
-#include "rule.h"
 
 nd_rule_t *nd_rule_create(nd_proxy_t *proxy)
 {
diff --git a/src/rule.h b/src/rule.h
index 13ffd08..c4b3a20 100644
--- a/src/rule.h
+++ b/src/rule.h
@@ -19,6 +19,8 @@
 #ifndef NDPPD_RULE_H
 #define NDPPD_RULE_H
 
+#include <net/if.h>
+
 #include "ndppd.h"
 
 struct nd_rule
@@ -34,7 +36,6 @@ struct nd_rule
     bool is_auto;
 };
 
-/* rule.c */
 nd_rule_t *nd_rule_create(nd_proxy_t *proxy);
 
-#endif // NDPPD_RULE_H
+#endif /* NDPPD_RULE_H */
diff --git a/src/session.h b/src/session.h
index 756c27e..968dc2b 100644
--- a/src/session.h
+++ b/src/session.h
@@ -62,4 +62,4 @@ struct nd_session
 nd_session_t *nd_alloc_session();
 void nd_free_session(nd_session_t *session);
 
-#endif /*NDPPD_SESSION_H*/
+#endif /* NDPPD_SESSION_H */
diff --git a/src/sio.h b/src/sio.h
index d242f62..6d14c73 100644
--- a/src/sio.h
+++ b/src/sio.h
@@ -31,7 +31,6 @@ struct nd_sio
     nd_sio_handler_t *handler;
 };
 
-/* sio.c */
 nd_sio_t *nd_sio_open(int domain, int type, int protocol);
 void nd_sio_close(nd_sio_t *nio);
 bool nd_sio_bind(nd_sio_t *sio, const struct sockaddr *addr, size_t addrlen);