diff options
| author | Maria Matejka <mq@ucw.cz> | 2021-06-18 18:23:41 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2021-11-22 19:05:43 +0100 |
| commit | c84ed603714db2c42a781f8dbb5b3fd540ff689f (patch) | |
| tree | 59b5c772dd1a9209ded29efc3ec58ba21582a810 | |
| parent | a4451535c69b8f934523905a8131ae2f16be2146 (diff) | |
Moved BFD IO loop out of BFD as we want to use it as socket-io coroutine
| -rw-r--r-- | proto/bfd/Makefile | 4 | ||||
| -rw-r--r-- | proto/bfd/bfd.h | 2 | ||||
| -rw-r--r-- | sysdep/unix/Makefile | 2 | ||||
| -rw-r--r-- | sysdep/unix/io-loop.c (renamed from proto/bfd/io.c) | 2 | ||||
| -rw-r--r-- | sysdep/unix/io-loop.h (renamed from proto/bfd/io.h) | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/proto/bfd/Makefile b/proto/bfd/Makefile index 402122fc..267dff98 100644 --- 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 91fdaa60..9d4cbbf8 100644 --- 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 69cf8131..07f454ab 100644 --- 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 index c5f1e024..a15d866a 100644 --- 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 index ec706e9a..d858b04e 100644 --- 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_ */ |