[Netadm-devel] gwc/include confutil.h,1.3,1.4 global.h,1.3,1.4 sysipc.h,1.4,1.5 sysshm.h,1.7,1.8 sysutil.h,1.2,1.3

[linuxpark <lin...@us...>]

Update of /cvsroot/netadm/gwc/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25121/include

Modified Files:
	confutil.h global.h sysipc.h sysshm.h sysutil.h 
Log Message:
MOD:

      modify  running policy cache managed by gwcadmd

      gwccli ----+----------> gwcadmd(running policy cache) ---> pf.ko
                 |
      gwcguid ---+



Index: confutil.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/confutil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** confutil.h	5 Mar 2006 01:11:00 -0000	1.3
--- confutil.h	6 Mar 2006 04:23:56 -0000	1.4
***************
*** 22,25 ****
--- 22,26 ----
  	_CMD_DEL_FC_IPOL,     /* delete one internal fc policy  */
  	_CMD_DMP_FC_IPOL,     /* dump all internal fc policies to stout  */
+ 	_CMD_APPLY_FC_IPOL,   /* apply all internal fc policies through ioctl */
  } sys_ucmd_e;
  
***************
*** 42,45 ****
--- 43,47 ----
  void * _del_fc_ipol (void *arg, int len, frp_t fr);
  void * _dmp_fc_ipol (void *arg, int len, frp_t fr);
+ void * _apply_fc_ipol (void *arg, int len, frp_t fr);
  
  /* sys_ucmd_msg

Index: sysshm.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysshm.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sysshm.h	5 Mar 2006 01:11:00 -0000	1.7
--- sysshm.h	6 Mar 2006 04:23:56 -0000	1.8
***************
*** 79,83 ****
  	int		fc_pol_cnt;
  	fc_pol_t	fc_pol [MAXSHM_FC_POL];
- 	list		fc_ipol_list;	/* pointer of running fc polic list */
  
  	/* TODO: delete this after finishing up FC */
--- 79,82 ----
***************
*** 89,91 ****
--- 88,92 ----
  sm_t *csm;
  
+ list runpol_list;
+ 
  #endif				/* __SYS_SHM_INCLUDED */

Index: sysutil.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysutil.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sysutil.h	5 Mar 2006 01:11:00 -0000	1.2
--- sysutil.h	6 Mar 2006 04:23:56 -0000	1.3
***************
*** 30,50 ****
  #define tcdprintf( fmt, args... ) printf( "tc(%d): " fmt, __LINE__,##args)
  #else
- #if 0
- #define tcdprintf( fmt, args... ) do  {  \
-   status= system(cmd);	 \
-   bzero(cmd, sizeof(cmd));\
- }while(0)
- #endif
  
- #if 0
- #define tcdprintf( fmt, args... ) do  {			  \
-   status= system(cmd);					  \
-   if(csm->polused && !WIFEXITED(status)){		  \
-     frerr (fr, RET_EINTERNAL, "Failed to exec cmd [%s] error[%d]\n", cmd, status);  \
-     return;						  \
-   }							  \
- }while(0)
- #endif
- /* current available */
  #define tcdprintf( fmt, args... ) system (cmd)
  #endif
--- 30,34 ----
***************
*** 52,56 ****
  #ifdef USE_SYSLOG
  #define out(fmt, args...)         \
!  sysl_log(SYSLI, SYSL_PROC_INFO, fmt, ##args)
  #else
  #define out(fmt, args...)         \
--- 36,40 ----
  #ifdef USE_SYSLOG
  #define out(fmt, args...)         \
!  sysl_log(SYSLI, SYSL_PROC_INFO, "[%s,%s,%d]" fmt, __FILE__, __FUNCTION__, __LINE__, ##args)
  #else
  #define out(fmt, args...)         \

Index: sysipc.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysipc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sysipc.h	1 Mar 2006 04:06:33 -0000	1.4
--- sysipc.h	6 Mar 2006 04:23:56 -0000	1.5
***************
*** 50,62 ****
  
  typedef struct {
! 	ipc_ret_e ret;
! 	char *p;
! 	unsigned short len;
! 	unsigned short cols;
! 	unsigned short rows;
! 	int islist;
! 	int errcnt;
! 	int errlen;
! 	char errmsg[1024];
  } *frp_t, fr_t;			/* func ret */
  
--- 50,62 ----
  
  typedef struct {
! 	ipc_ret_e	ret;
! 	char		*p;
! 	unsigned short	len;
! 	unsigned short	cols;
! 	unsigned short	rows;
! 	int		islist;
! 	int		errcnt;
! 	int		errlen;
! 	char		errmsg[1024];
  } *frp_t, fr_t;			/* func ret */
  
***************
*** 115,124 ****
  #define __IOCTL_IDX_BASE	CMD_LISTTHRESHOLD
  
  typedef void (*cmdcallback_t) (int argc, char *argv[], int modify, frp_t fr);
  typedef struct {
! 	sys_cmd_e cmd;
! 	char *key;
! 	cmdcallback_t func;
! 	char *hlp;
  } sys_cmd_t;
  
--- 115,144 ----
  #define __IOCTL_IDX_BASE	CMD_LISTTHRESHOLD
  
+ typedef struct {
+ 	ipc_ret_e	ret;		/* return value during IPC */
+ 	int		errcnt;
+ 	int		errlen;
+ 	char		errmsg[1024];
+ } sys_ipc_ret_t;
+ 
+ typedef struct {
+ 	int		type;		/* type of message */
+ 	int		len;		/* data len */
+ 	unsigned char	data[1024];	/* start point of data */
+ } sys_ipc_msg_t;
+ 	
+ typedef enum {
+ 	IPCMTYPE_FC_RET = 0x00000001,
+ 	IPCMTYPE_FC_ADD_IPOL,
+ 	IPCMTYPE_FC_DEL_IPOL,
+ 	IPCMTYPE_FC_APPLY_IPOL,
+ } sys_ipc_e;
+ 
  typedef void (*cmdcallback_t) (int argc, char *argv[], int modify, frp_t fr);
  typedef struct {
! 	sys_cmd_e	cmd;
! 	char		*key;
! 	cmdcallback_t	func;
! 	char		*hlp;
  } sys_cmd_t;
  

Index: global.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/global.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** global.h	25 Feb 2006 22:59:00 -0000	1.3
--- global.h	6 Mar 2006 04:23:56 -0000	1.4
***************
*** 42,45 ****
--- 42,46 ----
  #define SZCLI		  "gwccli"
  #define SZRUNSHELL	  "gwc"
+ #define SZADMD		  "gwcadmd"
  /* exe, config file path - end */
  #define SZFWCSSFRTLD	  "/tmp/.SYS_RTLD"