daemon: move protocol files into subfolder

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index df5649ace632c8c138b5881e913669d960545841..f2d1f9b7c5baee0c10063a18584960c3c14b5227 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -13,16 +13,20 @@ noinst_LTLIBRARIES = liblldpd.la
 nodist_liblldpd_la_SOURCES =
 liblldpd_la_SOURCES  = \
        frame.h frame.c \
-       lldp.c lldp-tlv.h \
-       cdp.c cdp.h \
-       sonmp.c sonmp.h \
-       edp.c edp.h \
+       lldp-tlv.h \
        client.c \
        priv.c privsep_io.c \
        interfaces.c \
        event.c lldpd.c \
        pattern.c \
-       probes.d trace.h
+       probes.d trace.h \
+       protocols/lldp.c \
+       protocols/cdp.c \
+       protocols/cdp.h \
+       protocols/sonmp.c \
+       protocols/sonmp.h \
+       protocols/edp.c \
+       protocols/edp.h
 liblldpd_la_CFLAGS   = $(AM_CFLAGS) @LIBEVENT_CFLAGS@
 liblldpd_la_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' -DLLDPCLI_PATH='"$(sbindir)/lldpcli"'
 liblldpd_la_LIBADD   = \

diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h
index 4c10aa1f174b17a368fc0acf04927627dcd03814..fded75f4249e13c671b06cede28aa3b762cfdcbe 100644 (file)
--- a/src/daemon/lldpd.h
+++ b/src/daemon/lldpd.h
@@ -46,13 +46,13 @@
 
 #include "lldp-tlv.h"
 #if defined (ENABLE_CDP) || defined (ENABLE_FDP)
-#  include "cdp.h"
+#  include "protocols/cdp.h"
 #endif
 #ifdef ENABLE_SONMP
-#  include "sonmp.h"
+#  include "protocols/sonmp.h"
 #endif
 #ifdef ENABLE_EDP
-#  include "edp.h"
+#  include "protocols/edp.h"
 #endif
 
 #include "../compat/compat.h"

diff --git a/src/daemon/cdp.c b/src/daemon/protocols/cdp.c
similarity index 100%
rename from src/daemon/cdp.c
rename to src/daemon/protocols/cdp.c

diff --git a/src/daemon/cdp.h b/src/daemon/protocols/cdp.h
similarity index 100%
rename from src/daemon/cdp.h
rename to src/daemon/protocols/cdp.h

diff --git a/src/daemon/edp.c b/src/daemon/protocols/edp.c
similarity index 100%
rename from src/daemon/edp.c
rename to src/daemon/protocols/edp.c

diff --git a/src/daemon/edp.h b/src/daemon/protocols/edp.h
similarity index 100%
rename from src/daemon/edp.h
rename to src/daemon/protocols/edp.h

diff --git a/src/daemon/lldp.c b/src/daemon/protocols/lldp.c
similarity index 100%
rename from src/daemon/lldp.c
rename to src/daemon/protocols/lldp.c

diff --git a/src/daemon/sonmp.c b/src/daemon/protocols/sonmp.c
similarity index 100%
rename from src/daemon/sonmp.c
rename to src/daemon/protocols/sonmp.c

diff --git a/src/daemon/sonmp.h b/src/daemon/protocols/sonmp.h
similarity index 100%
rename from src/daemon/sonmp.h
rename to src/daemon/protocols/sonmp.h