moved cw_vendorspecific... to mod_capwap.

FossilOrigin-Name: e736ec72b11816d348b9a27affd6382e911392ead1d24c0178c771aad34376f6

actube.workspace

@@ -3,9 +3,9 @@
   <Project Name="ac" Path="ac.project" Active="No"/>
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
-  <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
+  <Project Name="mod_capwap" Path="mod_capwap.project" Active="Yes"/>
   <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
-  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
+  <Project Name="libcw" Path="libcw.project" Active="No"/>
   <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>

libcw.project

@@ -11,7 +11,6 @@
       <File Name="src/cw/mbag_type_dword.c"/>
       <File Name="src/cw/sock_getport.c"/>
       <File Name="src/cw/dtls_gnutls_get_peers_cert.c"/>
-      <File Name="src/cw/cw_in_vendor_specific_payload.c"/>
       <File Name="src/cw/conn_process_packet.c"/>
       <File Name="src/cw/cw_cisco_id_to_str.c"/>
       <File Name="src/cw/lw_put_sockaddr.c"/>

mod_capwap.project

@@ -18,6 +18,7 @@
         <File Name="src/mod/capwap/capwap_out_get_session_id.c"/>
         <File Name="src/mod/capwap/capwap_out_get_idle_timeout.c"/>
         <File Name="src/mod/capwap/capwap_actions_ac.c"/>
+        <File Name="src/mod/capwap/capwap_in_vendor_specific_payload.c"/>
       </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>

src/cw/cw.h

@@ -368,10 +368,11 @@ extern int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a
 extern int cw_in_wtp_board_data(struct conn *conn, struct cw_action_in *a, uint8_t * data,
 				int len, struct sockaddr *from);
 
-					 
+/*					 
 int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
 				struct cw_ElemHandlerParams *params,
 				  uint8_t * data, int len);
+*/
 
 extern int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 					   uint8_t * data, int len,

src/cw/cw_process_element.c

@@ -15,8 +15,6 @@
 int cw_process_element(struct cw_ElemHandlerParams *params, int proto, int vendor,int elem_id,
 		uint8_t  * data, int len){
 	
-printf("The process elemnt handler is here \n");
-
 	struct cw_ElemHandler * handler;
 	struct cw_ElemData * elem_data, elem_data_search;
 

src/mod/capwap/Makefile

@@ -15,6 +15,7 @@ OBJS=\
 	capwap_in_wtp_descriptor.o \
 	capwap_out_ac_ip_list.o \
 	capwap_in_session_id.o \
+	capwap_in_vendor_specific_payload.o \
 
 
 LIBDIR		:= ../../../lib

src/mod/capwap/capwap_actions_ac.c

@@ -85,7 +85,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,					/* min/max length */
 		NULL,					/* type */
 		"vendor_specific_payload",		/* Key */
-		cw_in_vendor_specific_payload		/* get */
+		capwap_in_vendor_specific_payload		/* get */
 	}
 	,
 	

src/mod/capwap/capwap_in_vendor_specific_payload.c

@@ -1,7 +1,6 @@
 
-#include "cw.h"
+#include "cw/dbg.h"
-#include "dbg.h"
+#include "cw/log.h"
-#include "log.h"
 
 /** 
  * @file 
@@ -11,7 +10,7 @@
 /**
  * Default handler for Vendor Specific Payload message elements.
  */
-int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
+int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
 				struct cw_ElemHandlerParams *params,
 				  uint8_t * data, int len)
 {
@@ -23,7 +22,6 @@ int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler,
 	vendor_id = cw_get_dword(data);
 	elem_id = cw_get_word(data + 4);
 
-	printf("Spec handler looking for %d %d %d\n",0,vendor_id,elem_id);
 	vhandler = cw_msgset_get_elemhandler(params->conn->msgset,0,vendor_id,elem_id);
 	
 	

src/mod/capwap/mod_capwap.h

@@ -20,6 +20,11 @@ extern int capwap_in_wtp_board_data(struct conn *conn, struct cw_ElemHandler *a,
 int capwap_in_wtp_board_data(struct cw_ElemHandler *eh, struct cw_ElemHandlerParams *params, 
 			uint8_t * data,	 int len);
 
+
+int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
+				struct cw_ElemHandlerParams *params,
+				  uint8_t * data, int len);				    
+
 /*
 extern int capwap_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a,
 				     uint8_t * dst);