Move send functions to a new header

6 files changed, 51 insertions, 14 deletions

diff --git a/ffd/announce.c b/ffd/announce.c
index 2e54725..f68bb48 100644
--- a/ffd/announce.c
+++ b/ffd/announce.c
@@ -26,6 +26,7 @@
 
 #include "ffd.h"
 #include "neigh.h"
+#include "send.h"
 
 #include <stdio.h>
 
diff --git a/ffd/ffd.c b/ffd/ffd.c
index 5ff5f1b..9acd201 100644
--- a/ffd/ffd.c
+++ b/ffd/ffd.c
@@ -29,6 +29,7 @@
 #include "netif.h"
 #include "packet.h"
 #include "queue.h"
+#include "send.h"
 #include "tlv.h"
 #include "tlv_types.h"
 
diff --git a/ffd/ffd.h b/ffd/ffd.h
index 748082f..42d679c 100644
--- a/ffd/ffd.h
+++ b/ffd/ffd.h
@@ -211,18 +211,4 @@ void ffd_update_enqueue(const ffd_node_id_t *node, uint16_t type, uint16_t key,
 int ffd_update_timeout(void);
 void ffd_update_run(void);
 
-void ffd_send_ack(ffd_neigh_t *neigh, uint16_t nonce);
-void ffd_send_hellos(void);
-void ffd_send_update(ffd_iface_t *iface, ffd_neigh_t *neigh, ffd_announce_t *announce, bool with_data);
-void ffd_send_retract(ffd_neigh_t *neigh, ffd_node_id_t node, uint16_t type, uint16_t key);
-void ffd_send_announce_request(ffd_iface_t *iface, ffd_neigh_t *neigh, ffd_node_id_t node, uint16_t type, uint16_t key, bool with_data);
-void ffd_send_seqno_request(ffd_neigh_t *neigh, ffd_announce_t *announce, uint16_t seqno);
-
-static inline void ffd_send_seqno_request_for(ffd_neigh_t *neigh, ffd_announce_t *announce) {
-	if (FFD_IS_INFINITY(announce->feasibility_distance))
-		return;
-
-	ffd_send_seqno_request(neigh, announce, announce->feasibility_distance.seqno+1);
-}
-
 #endif /* _FFD_FFD_H_ */
diff --git a/ffd/neigh.c b/ffd/neigh.c
index 2c73362..e8e7d0f 100644
--- a/ffd/neigh.c
+++ b/ffd/neigh.c
@@ -25,6 +25,7 @@
 
 
 #include "neigh.h"
+#include "send.h"
 
 
 ffd_neigh_t* ffd_neigh_get(ffd_iface_t *iface, const eth_addr_t *addr) {
diff --git a/ffd/send.h b/ffd/send.h
new file mode 100644
index 0000000..ce70199
--- /dev/null
+++ b/ffd/send.h
@@ -0,0 +1,47 @@
+/*
+  Copyright (c) 2012, Matthias Schiffer <mschiffer@universe-factory.net>
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef _FFD_SEND_H_
+#define _FFD_SEND_H_
+
+#include "ffd.h"
+
+
+void ffd_send_ack(ffd_neigh_t *neigh, uint16_t nonce);
+void ffd_send_hellos(void);
+void ffd_send_update(ffd_iface_t *iface, ffd_neigh_t *neigh, ffd_announce_t *announce, bool with_data);
+void ffd_send_retract(ffd_neigh_t *neigh, ffd_node_id_t node, uint16_t type, uint16_t key);
+void ffd_send_announce_request(ffd_iface_t *iface, ffd_neigh_t *neigh, ffd_node_id_t node, uint16_t type, uint16_t key, bool with_data);
+void ffd_send_seqno_request(ffd_neigh_t *neigh, ffd_announce_t *announce, uint16_t seqno);
+
+static inline void ffd_send_seqno_request_for(ffd_neigh_t *neigh, ffd_announce_t *announce) {
+	if (FFD_IS_INFINITY(announce->feasibility_distance))
+		return;
+
+	ffd_send_seqno_request(neigh, announce, announce->feasibility_distance.seqno+1);
+}
+
+#endif /* _FFD_SEND_H_ */
diff --git a/ffd/update.c b/ffd/update.c
index e5faab5..5ae3006 100644
--- a/ffd/update.c
+++ b/ffd/update.c
@@ -27,6 +27,7 @@
 #include "ffd.h"
 #include "neigh.h"
 #include "queue.h"
+#include "send.h"
 
 #include <stdio.h>