Moved BFD IO loop out of BFD as we want to use it as socket-io coroutine

diff --git a/proto/bfd/Makefile b/proto/bfd/Makefile
index 402122fc37804e42ca24dc43f60d2ddea40767af..267dff98a1e24ca7c34d6fd8e653622f4a6e8d64 100644 (file)
--- a/proto/bfd/Makefile
+++ b/proto/bfd/Makefile
@@ -1,6 +1,6 @@
-src := bfd.c io.c packets.c
+src := bfd.c packets.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
 
-tests_objs := $(tests_objs) $(src-o-files)
\ No newline at end of file
+tests_objs := $(tests_objs) $(src-o-files)

diff --git a/proto/bfd/bfd.h b/proto/bfd/bfd.h
index 91fdaa600f64f38b77d02d31613f627fee79d2cb..9d4cbbf86e8f543f8bb5ae1272e4b19c92685106 100644 (file)
--- a/proto/bfd/bfd.h
+++ b/proto/bfd/bfd.h
@@ -22,7 +22,7 @@
 #include "lib/string.h"
 
 #include "nest/bfd.h"
-#include "io.h"
+#include "sysdep/unix/io-loop.h"
 
 
 #define BFD_CONTROL_PORT       3784

diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index 69cf8131e1241444071ef002b120a77aded7bb7f..07f454ab2e887fb87cdc7cb5c217b3eec90f88c4 100644 (file)
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -1,4 +1,4 @@
-src := alloc.c io.c krt.c log.c main.c random.c coroutine.c
+src := alloc.c io.c io-loop.c krt.c log.c main.c random.c coroutine.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)

diff --git a/proto/bfd/io.c b/sysdep/unix/io-loop.c
similarity index 99%
rename from proto/bfd/io.c
rename to sysdep/unix/io-loop.c
index c5f1e024d64e8b8386f0b6a9fdf8bf8aed347c65..a15d866a29f536e7e68492218efc004ddc80d461 100644 (file)
--- a/proto/bfd/io.c
+++ b/sysdep/unix/io-loop.c
@@ -15,7 +15,7 @@
 #include <sys/time.h>
 
 #include "nest/bird.h"
-#include "proto/bfd/io.h"
+#include "sysdep/unix/io-loop.h"
 
 #include "lib/buffer.h"
 #include "lib/lists.h"

diff --git a/proto/bfd/io.h b/sysdep/unix/io-loop.h
similarity index 89%
rename from proto/bfd/io.h
rename to sysdep/unix/io-loop.h
index ec706e9a81700fe5a7ac0d3bd42164ad2481c81d..d858b04ec11eb0d92623a9ff366478fe5dc0678e 100644 (file)
--- a/proto/bfd/io.h
+++ b/sysdep/unix/io-loop.h
@@ -4,8 +4,8 @@
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#ifndef _BIRD_BFD_IO_H_
-#define _BIRD_BFD_IO_H_
+#ifndef _BIRD_IO_LOOP_H_
+#define _BIRD_IO_LOOP_H_
 
 #include "nest/bird.h"
 #include "lib/lists.h"
@@ -31,4 +31,4 @@ void birdloop_mask_wakeups(struct birdloop *loop);
 void birdloop_unmask_wakeups(struct birdloop *loop);
 
 
-#endif /* _BIRD_BFD_IO_H_ */
+#endif /* _BIRD_IO_LOOP_H_ */