Work on mods.

FossilOrigin-Name: 2933314d1c705fae5022e022409b5f77a878656baead522ceb629b7f648c8307

src/mod/capwap/Makefile

@@ -1,5 +1,3 @@
-include ../../Macros.mak
-include ../../Config.mak
 
 OBJS=\
 	mod_capwap_ac.o \
@@ -7,30 +5,9 @@ OBJS=\
 	capwap_in_wtp_descriptor.o \
 	capwap_in_wtp_board_data.o
 
-OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
-
-
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
 
 NAME=libcapwap.a
-LIBDIR=../../lib/$(ARCH)
 
-SRCS = $(OBJS:.o=.c) 
-
-$(ARCH)/%.o:%.c
-	@mkdir -p $(ARCH)
-	@echo "  CC "$<
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../Mod.mak
 
 
-$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
-	@mkdir -p $(LIBDIR)
-	@echo "  AR $(LIBDIR)/$(NAME)"
-	@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
-
-
-all: $(LIBDIR)/$(NAME)
-
-clean: 
-	rm -rf $(ARCH)
-	rm -f $(LIBDIR)/$(NAME)

src/mod/capwap/capwap_in_wtp_descriptor.c

@@ -156,9 +156,11 @@ static int cw_read_wtp_descriptor(mbag_t mbag, struct conn *conn,
 int capwap_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
 			 int len, struct sockaddr *from)
 {
+
 	mbag_t mbag = conn->incomming;
 
-	return cw_read_wtp_descriptor(mbag, conn, a, data, len, 0);
+	int rc =cw_read_wtp_descriptor(mbag, conn, a, data, len, 0);
+	return rc;
 }
 
 

src/mod/capwap/mod_capwap_ac.c

@@ -1,5 +1,5 @@
 
-#include "mod.h"
+#include "capwap/mod.h"
 #include "capwap/log.h"
 #include "capwap/dbg.h"
 
@@ -35,7 +35,8 @@ static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,struct soc
 static struct mod_ac capwap_ac = {
 	.name ="capwap",
 	.init = init,
-	.detect = detect
+	.detect = detect,
+	.register_actions = capwap_register_actions_ac
 
 };
 

src/mod/cipwap/Makefile

@@ -1,32 +1,8 @@
-include ../../Macros.mak
-include ../../Config.mak
 
 OBJS=\
 	mod_cipwap_ac.o
 
-OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
-
-
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
-
-
 NAME=libcipwap.a
-LIBDIR=../../lib/$(ARCH)
 
-SRCS = $(OBJS:.o=.c) 
+include ../Mod.mak
 
-$(ARCH)/%.o:%.c
-	@mkdir -p $(ARCH)
-	@echo "  CC "$<
-	@$(CC) -c $(CFLAGS) $< -o $@
-
-$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
-	@mkdir -p $(LIBDIR)
-	@echo "  AR $(LIBDIR)/$(NAME)"
-	@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
-
-
-all: $(LIBDIR)/$(NAME)
-
-clean: 
-	rm -rf $(ARCH)

src/mod/cipwap/mod_cipwap_ac.c

@@ -1,5 +1,5 @@
 
-#include "mod.h"
+#include "capwap/mod.h"
 #include "capwap/log.h"
 
 #include "mod_cipwap.h"