[Netadm-devel] gwc/include confproc.h,1.4,1.5 confutil.h,1.4,1.5 global.h,1.4,1.5 message.h,1.5,1.6
Status: Beta
Brought to you by:
linuxpark
From: linuxpark <lin...@us...> - 2006-03-07 04:45:12
|
Update of /cvsroot/netadm/gwc/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12643/include Modified Files: confproc.h confutil.h global.h message.h sysipc.h Log Message: ADD: ADD: cli command ( dump_fc_ipol : dump flow control internal policy) + confutil.c (dump_fc_ipol ()) MOD: integrage sys_ipc_e -> sys_ucmd_e MOD: vi tab modified (in .vimrc, ts=8, sw=2, sts=2) MOD: make 2 function as ipc library function ipc request function: send_ipcmsg () used by other process except gwcadmd ipc response function: send_rmsg : used by gwcadmd daemon Index: confproc.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/confproc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** confproc.h 1 Mar 2006 04:06:33 -0000 1.4 --- confproc.h 7 Mar 2006 04:45:09 -0000 1.5 *************** *** 67,70 **** --- 67,71 ---- void del_fc_pol(int argc, char *argv[], int modify, frp_t fr); void fc_apply(int argc, char *argv[], int modify, frp_t fr); + void dump_fc_ipol(int argc, char *argv[], int modify, frp_t fr); /* A P A U T O */ void list_auto(int argc, char *argv[], int modify, frp_t fr); Index: message.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/message.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** message.h 1 Mar 2006 04:06:33 -0000 1.5 --- message.h 7 Mar 2006 04:45:09 -0000 1.6 *************** *** 65,68 **** --- 65,70 ---- #define INFO_CLI_DEL_FC_POL "Delete a policy in flow control" #define INFO_CLI_FC_APPLY "Apply the Policies of Flow control" + #define INFO_CLI_DUMP_FC_IPOL "dump internal policies of flow control to dump_ipol" + #define INFO_CLI_LIST_AUTO "List the setup config of auto test" #define INFO_CLI_SET_AUTO "Set the setup config of auto test " Index: global.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/global.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** global.h 6 Mar 2006 04:23:56 -0000 1.4 --- global.h 7 Mar 2006 04:45:09 -0000 1.5 *************** *** 36,39 **** --- 36,40 ---- #define SZMAINPATH "/usr/local/gwc" #define SZMASTCONF "/usr/local/gwc/etc/config" + #define SZIPOLDUMP "/usr/local/gwc/dump_ipol.txt" #define SYSMASTEXP "bin" #define SZHTMLPATH "html" Index: sysipc.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/sysipc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sysipc.h 6 Mar 2006 04:23:56 -0000 1.5 --- sysipc.h 7 Mar 2006 04:45:09 -0000 1.6 *************** *** 104,107 **** --- 104,108 ---- CMD_DEL_FC_POL, CMD_FC_APPLY, + CMD_DUMP_FC_IPOL, CMD_LIST_AUTO, CMD_SET_AUTO, *************** *** 127,137 **** 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); --- 128,134 ---- unsigned char data[1024]; /* start point of data */ } sys_ipc_msg_t; ! ! int send_ipcmsg ( int type, char *arg, int len, frp_t fr); /* request through IPC */ ! int send_rmsg (int fd, int ret, char *emsg ); /* response through IPC */ typedef void (*cmdcallback_t) (int argc, char *argv[], int modify, frp_t fr); Index: confutil.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/confutil.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** confutil.h 6 Mar 2006 04:23:56 -0000 1.4 --- confutil.h 7 Mar 2006 04:45:09 -0000 1.5 *************** *** 14,18 **** /* U T I L F U N C I D X */ typedef enum { ! _CMD_GET_FC_NET = 0, /* get fc net pointer in the shared memory by name*/ _CMD_GET_FC_SVC, /* get fc svc pointer in the shared memory by name*/ _CMD_GET_FC_FW, /* get fc fw pointer in the shared memory by name*/ --- 14,19 ---- /* U T I L F U N C I D X */ typedef enum { ! _CMD_SND_FC_RET = 0x00000001, ! _CMD_GET_FC_NET, /* get fc net pointer in the shared memory by name*/ _CMD_GET_FC_SVC, /* get fc svc pointer in the shared memory by name*/ _CMD_GET_FC_FW, /* get fc fw pointer in the shared memory by name*/ *************** *** 21,26 **** _CMD_ADD_FC_IPOL, /* insert one internal fc policy (runpol_list) */ _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; --- 22,27 ---- _CMD_ADD_FC_IPOL, /* insert one internal fc policy (runpol_list) */ _CMD_DEL_FC_IPOL, /* delete one internal fc policy */ _CMD_APPLY_FC_IPOL, /* apply all internal fc policies through ioctl */ + _CMD_DUMP_FC_IPOL, /* dump all internal fc policies to stout */ } sys_ucmd_e; *************** *** 42,47 **** void * _add_fc_ipol (void *arg, int len, frp_t fr); 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 --- 43,48 ---- void * _add_fc_ipol (void *arg, int len, frp_t fr); void * _del_fc_ipol (void *arg, int len, frp_t fr); void * _apply_fc_ipol (void *arg, int len, frp_t fr); + void * _dump_fc_ipol (void *arg, int len, frp_t fr); /* sys_ucmd_msg |