rename file names to keep it consistent with mapagent

src/Makefile

@@ -11,8 +11,8 @@ OBJS = \
 	cntlr_ubus.o \
 	cntlr.o \
 	cntlr_map.o \
-	cntlr_tlv_generator.o \
-	cntlr_cmdu_generator.o \
+	cntlr_tlv.o \
+	cntlr_cmdu.o \
 	cntlr_map_debug.o \
 	config.o \
 	main.o

src/cntlr.c

@@ -42,7 +42,7 @@
 #include "allsta.h"
 #include "cntlr_ubus.h"
 #include "cntlr_map.h"
-#include "cntlr_cmdu_generator.h"
+#include "cntlr_cmdu.h"
 
 #define map_plugin	"ieee1905.map"
 

src/cntlr_cmdu_generator.c → src/cntlr_cmdu.c

 /*
- * cntlr_tlv_generator.c - tlv building function
+ * cntlr_cmdu.c - cmdu building function
  *
  * Copyright (C) 2020 IOPSYS Software Solutions AB. All rights reserved.
  *
@@ -38,14 +38,13 @@
 #include <map2.h>
 #include <map_module.h>
 
-//#include "map_module.h"
 #include "utils.h"
 #include "debug.h"
 #include "liblist.h"
 #include "config.h"
 #include "cntlr.h"
-#include "cntlr_tlv_generator.h"
-#include "cntlr_cmdu_generator.h"
+#include "cntlr_tlv.h"
+#include "cntlr_cmdu.h"
 #include "cntlr_map.h"
 
 

src/cntlr_cmdu_generator.h → src/cntlr_cmdu.h

 /*
- * agent_tlv_generator.h - tlv building function declarations
+ * cntlr_cmdu.h - cmdu building function declarations
  *
  * Copyright (C) 2020 IOPSYS Software Solutions AB. All rights reserved.
  *

src/cntlr_map.c

@@ -36,7 +36,6 @@
 #include <map2.h>
 #include <map_module.h>
 
-//#include "map_module.h"
 #include "utils.h"
 #include "debug.h"
 #include "liblist.h"
@@ -45,8 +44,8 @@
 #include "cntlr_ubus.h"
 
 #include "cntlr_map_debug.h"
-#include "cntlr_cmdu_generator.h"
-#include "cntlr_tlv_generator.h"
+#include "cntlr_cmdu.h"
+#include "cntlr_tlv.h"
 
 typedef int (*map_cmdu_handler_t)(void *cntlr, struct cmdu_buff *cmdu);
 

src/cntlr_tlv_generator.c → src/cntlr_tlv.c

 /*
- * cntlr_tlv_generator.c - tlv building function
+ * cntlr_tlv.c - tlv building function
  *
  * Copyright (C) 2020 IOPSYS Software Solutions AB. All rights reserved.
  *
@@ -38,7 +38,6 @@
 
 #include <uci.h>
 
-//#include "map_module.h"
 #include "utils.h"
 #include "debug.h"
 #include "config.h"
@@ -46,7 +45,7 @@
 #include "cntlr_ubus.h"
 
 #include "cntlr_map_debug.h"
-#include "cntlr_tlv_generator.h"
+#include "cntlr_tlv.h"
 
 /**
  * TODO: move to appropriate utils file

src/cntlr_tlv_generator.h → src/cntlr_tlv.h

 /*
- * cntlr_tlv_generator.h - tlv building function declarations
+ * cntlr_tlv.h - tlv building function declarations
  *
  * Copyright (C) 2020 IOPSYS Software Solutions AB. All rights reserved.
  *

src/cntlr_ubus.c

@@ -33,11 +33,10 @@
 #include "allsta.h"
 #include "cntlr_map.h"
 #include "cntlr_ubus.h"
-#include "cntlr_tlv_generator.h"
+#include "cntlr_tlv.h"
 
-//#include "map_module.h"
-#include "cntlr_tlv_generator.h"
-#include "cntlr_cmdu_generator.h"
+#include "cntlr_tlv.h"
+#include "cntlr_cmdu.h"
 
 #define MULTICAST_ADDR_STR "01:80:c2:00:00:13"