From 9e2db64f1ccebf4b813eb9d719bf6d3b1591f570 Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Thu, 2 Apr 2015 16:20:26 +0300
Subject: [PATCH] daemon: move protocol files into subfolder

---
 src/daemon/Makefile.am             | 14 +++++++++-----
 src/daemon/lldpd.h                 |  6 +++---
 src/daemon/{ => protocols}/cdp.c   |  0
 src/daemon/{ => protocols}/cdp.h   |  0
 src/daemon/{ => protocols}/edp.c   |  0
 src/daemon/{ => protocols}/edp.h   |  0
 src/daemon/{ => protocols}/lldp.c  |  0
 src/daemon/{ => protocols}/sonmp.c |  0
 src/daemon/{ => protocols}/sonmp.h |  0
 9 files changed, 12 insertions(+), 8 deletions(-)
 rename src/daemon/{ => protocols}/cdp.c (100%)
 rename src/daemon/{ => protocols}/cdp.h (100%)
 rename src/daemon/{ => protocols}/edp.c (100%)
 rename src/daemon/{ => protocols}/edp.h (100%)
 rename src/daemon/{ => protocols}/lldp.c (100%)
 rename src/daemon/{ => protocols}/sonmp.c (100%)
 rename src/daemon/{ => protocols}/sonmp.h (100%)

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index df5649ac..f2d1f9b7 100644
--- 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 4c10aa1f..fded75f4 100644
--- 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
-- 
2.39.5