From e0ccdbd38fb5dfad7b0cff0df4b182e45efee055 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Sat, 2 Apr 2016 15:07:35 +0000
Subject: [PATCH] Moved cipwap_items to mod/cipwap

FossilOrigin-Name: 99fc10818ae04e66f4dedac83cda3e057f2ecb35cb84a2759013404b8ec0e1d6
---
 src/cw/Makefile                       | 10 ----------
 src/mod/Mod.mak                       |  2 +-
 src/mod/cipwap/Makefile               |  1 +
 src/mod/cipwap/cipwap_actions_ac.c    |  2 +-
 src/mod/cipwap/cipwap_actions_wtp.c   |  2 +-
 src/{cw => mod/cipwap}/cipwap_items.c |  4 ++--
 src/{cw => mod/cipwap}/cipwap_items.h |  0
 src/mod/cisco/cisco_actions_wtp.c     |  3 ++-
 src/mod/cisco/cisco_in_telnet_ssh.c   |  2 +-
 src/mod/cisco/cisco_out_telnet_ssh.c  |  2 +-
 src/wtp/wtp_main.c                    |  8 ++++----
 11 files changed, 14 insertions(+), 22 deletions(-)
 rename src/{cw => mod/cipwap}/cipwap_items.c (90%)
 rename src/{cw => mod/cipwap}/cipwap_items.h (100%)

diff --git a/src/cw/Makefile b/src/cw/Makefile
index 1b5a16cf..7e043e47 100644
--- a/src/cw/Makefile
+++ b/src/cw/Makefile
@@ -258,15 +258,6 @@ BSTROBJS= bstr_create.o \
 
 FRAGOBJS=fragman.o
 
-#	cw_in_wtp_descriptor.o \
-#	capwap_80211_actions_wtp.o \
-#	capwap_80211_actions_ac.o \
-#	capwap_actions_ac.o \
-	#capwap_actions_wtp.o \
-
-	#cipwap_actions_ac.o \
-	#cipwap_actions_wtp.o \
-
 CWACTION=action.o \
 	cw_in_generic.o \
 	cw_in_generic2.o \
@@ -277,7 +268,6 @@ CWACTION=action.o \
 	cipwap_strings_elem.o \
 	capwap_strings_result.o\
 	capwap_strings_board.o \
-	cipwap_items.o\
 	cw_put_msg.o \
 	cw_put_mbag_item.o \
 	cw_put_local_ip_address.o \
diff --git a/src/mod/Mod.mak b/src/mod/Mod.mak
index fd53de40..51663598 100644
--- a/src/mod/Mod.mak
+++ b/src/mod/Mod.mak
@@ -5,7 +5,7 @@ include ../../Config.mak
 OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
 
 
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 $(COMPDEFS) -DWITH_RMAC_SUPPORT -I ../../ -I../
+CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 $(COMPDEFS) -DWITH_RMAC_SUPPORT -I ../../ -I../ -I../../include
 
 LIBDIR=../../lib/$(ARCH)
 
diff --git a/src/mod/cipwap/Makefile b/src/mod/cipwap/Makefile
index 74c98ff0..a16c9a15 100644
--- a/src/mod/cipwap/Makefile
+++ b/src/mod/cipwap/Makefile
@@ -4,6 +4,7 @@ OBJS=\
 	mod_cipwap_wtp.o \
 	cipwap_actions_ac.o \
 	cipwap_actions_wtp.o \
+	cipwap_items.o \
 
 
 NAME=libcipwap.a
diff --git a/src/mod/cipwap/cipwap_actions_ac.c b/src/mod/cipwap/cipwap_actions_ac.c
index e626919f..c2a88044 100644
--- a/src/mod/cipwap/cipwap_actions_ac.c
+++ b/src/mod/cipwap/cipwap_actions_ac.c
@@ -19,10 +19,10 @@
 
 #include "cw/cw.h"
 #include "cw/action.h"
-#include "cw/cipwap_items.h"
 #include "cw/strheap.h"
 #include "cw/radio.h"
 
+#include "cipwap_items.h"
 
 #include "mod_cipwap.h"
 
diff --git a/src/mod/cipwap/cipwap_actions_wtp.c b/src/mod/cipwap/cipwap_actions_wtp.c
index 43eba62c..02253d71 100644
--- a/src/mod/cipwap/cipwap_actions_wtp.c
+++ b/src/mod/cipwap/cipwap_actions_wtp.c
@@ -19,10 +19,10 @@
 
 #include "cw/cw.h"
 #include "cw/action.h"
-#include "cw/cipwap_items.h"
 #include "cw/strheap.h"
 #include "cw/radio.h"
 
+#include "cipwap_items.h"
 
 #include "mod_cipwap.h"
 
diff --git a/src/cw/cipwap_items.c b/src/mod/cipwap/cipwap_items.c
similarity index 90%
rename from src/cw/cipwap_items.c
rename to src/mod/cipwap/cipwap_items.c
index fdf215d3..6b1faa40 100644
--- a/src/cw/cipwap_items.c
+++ b/src/mod/cipwap/cipwap_items.c
@@ -1,6 +1,6 @@
 
-#include "mbag.h"
-#include "item.h"
+#include "cw/mbag.h"
+#include "cw/item.h"
 
 #include "cipwap_items.h"
 
diff --git a/src/cw/cipwap_items.h b/src/mod/cipwap/cipwap_items.h
similarity index 100%
rename from src/cw/cipwap_items.h
rename to src/mod/cipwap/cipwap_items.h
diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c
index 4e7e7074..0f1e9f58 100644
--- a/src/mod/cisco/cisco_actions_wtp.c
+++ b/src/mod/cisco/cisco_actions_wtp.c
@@ -26,9 +26,10 @@
 #include "cw/capwap_cisco.h"
 #include "cw/capwap80211.h"
 #include "cw/capwap80211_items.h"
-#include "cw/cipwap_items.h"
 #include "cw/lwapp_cisco.h"
 
+#include "include/cipwap_items.h"
+
 #include "mod_cisco.h"
 
 #include "cisco.h"
diff --git a/src/mod/cisco/cisco_in_telnet_ssh.c b/src/mod/cisco/cisco_in_telnet_ssh.c
index d4194c05..78c0a788 100644
--- a/src/mod/cisco/cisco_in_telnet_ssh.c
+++ b/src/mod/cisco/cisco_in_telnet_ssh.c
@@ -1,7 +1,7 @@
 
 
 #include "cisco.h"
-#include "cw/cipwap_items.h"
+#include "include/cipwap_items.h"
 #include "cw/cw.h"
 #include "cw/dbg.h"
 
diff --git a/src/mod/cisco/cisco_out_telnet_ssh.c b/src/mod/cisco/cisco_out_telnet_ssh.c
index d41a3c49..2f97c489 100644
--- a/src/mod/cisco/cisco_out_telnet_ssh.c
+++ b/src/mod/cisco/cisco_out_telnet_ssh.c
@@ -1,7 +1,6 @@
 
 #include "cisco.h"
 #include "cw/capwap_items.h"
-#include "cw/cipwap_items.h"
 
 #include "cw/lwapp.h"
 #include "cw/cw.h"
@@ -11,6 +10,7 @@
 #include "cw/capwap_cisco.h"
 
 
+#include "include/cipwap_items.h"
 
 
 
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index e185a45e..2f9dcbf4 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -139,10 +139,10 @@ int main()
 
 
 
-//#define CWMOD "cisco"
-//#define CWBIND "cisco"
-#define CWMOD "capwap"
-#define CWBIND "capwap80211"
+#define CWMOD "cisco"
+#define CWBIND "cisco"
+//#define CWMOD "capwap"
+//#define CWBIND "capwap80211"
 
 
 	struct mod_wtp *mod = modload_wtp(CWMOD);