[Netadm-devel] gwc/include confproc.h,1.2,1.3 confutil.h,1.1.1.1,1.2 sysdef.h,1.4,1.5 sysipc.h,1.2,1
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/include confproc.h,1.2,1.3 confutil.h,1.1.1.1,1.2 sysdef.h,1.4,1.5 sysipc.h,1.2,1.3 sysshm.h,1.5,1.6
|
From: linuxpark <lin...@us...> - 2006-02-28 23:41:56
|
Update of /cvsroot/netadm/gwc/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13557/include Modified Files: confproc.h confutil.h sysdef.h sysipc.h sysshm.h Log Message: ADD: ADD: internal routine below in confproc.c, confproc.h add_fc_svc add_fc_net add_fc_fw add_fc_pol : definitly not list_fc_svc list_fc_net list_fc_fw list_fc_pol: not complete yet. del_fc_svc del_fc_net del_fc_fw del_fc_pol: definitly not ADD: internal routine for utils to access shared memory in confutil.c confutil.h conftab.c sys_ucmd_e ucmdtab sys_ucmd_msg ( sys_ucmd_e cmd, void *arg, int len ) : exported library. MOD: rename object name in shared memory (sysshm.h) ADD: Warning message during installation this warning message will be existed until gtk GUI will be completed for gwc-v0.1-pre3. GTK+ daemon will be improved by hyseok hwang <o2...@ho...> gwc-v0.1-pre3 will be released until march. 15. 1006. Index: confutil.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/confutil.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** confutil.h 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- confutil.h 28 Feb 2006 23:41:50 -0000 1.2 *************** *** 12,25 **** #define __SYS_CONFUTIL_H ! void frinit(frp_t fr); ! void frerr(frp_t fr, ipc_ret_e ret, char *fmt, ...); char *mapidtostr(sys_strmap_t * map, int id); int mapstrtoid(sys_strmap_t * map, char *str); ! int frerrmap(frp_t fr, ipc_ret_e ret, char *key, sys_strmap_t * map); ! void frfree(frp_t fr); - fr_t *ipc_msg(sys_cmd_e cmd, void *p, unsigned short plen, int argc); char *mapidtostr(sys_strmap_t * map, int id); int cshmattach(sm_t ** csm); int cshmdetach(sm_t * csm); #endif /* __SYS_UTIL_H */ --- 12,55 ---- #define __SYS_CONFUTIL_H ! /* U T I L F U N C I D X */ ! typedef enum { ! _CMD_GET_FC_NET = 0, ! _CMD_GET_FC_SVC, ! _CMD_GET_FC_FW, ! _CMD_GET_FC_POL, ! } sys_ucmd_e; ! ! typedef void* (*ucmdcallback_t) (void *arg, int len); ! ! typedef struct { ! sys_ucmd_e cmd; ! ucmdcallback_t func; ! } sys_ucmd_t; ! /* ! * TODO : these are internal function, don't call directly ! * these functions will be call by sys_ucmd_msg with it's cmd (index) ! */ ! void * _get_fc_net (void *arg, int len); ! void * _get_fc_svc (void *arg, int len); ! void * _get_fc_fw (void *arg, int len); ! void * _get_fc_pol (void *arg, int len); ! ! /* sys_ucmd_msg ! * @cmd : cmd of handler ! * @arg : random arg which will be used in handler ! * @len : sizeof arg ! */ ! void * sys_ucmd_msg (sys_ucmd_e cmd, void *arg, int len); ! fr_t *ipc_msg(sys_cmd_e cmd, void *p, unsigned short plen, int argc); ! char *mapidtostr(sys_strmap_t * map, int id); int mapstrtoid(sys_strmap_t * map, char *str); ! void frinit(frp_t fr); ! void frerr(frp_t fr, ipc_ret_e ret, char *fmt, ...); ! void frerrmap(frp_t fr, ipc_ret_e ret, char *key, sys_strmap_t * map); void frfree(frp_t fr); char *mapidtostr(sys_strmap_t * map, int id); int cshmattach(sm_t ** csm); int cshmdetach(sm_t * csm); + #endif /* __SYS_UTIL_H */ Index: sysshm.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/sysshm.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sysshm.h 25 Feb 2006 22:59:00 -0000 1.5 --- sysshm.h 28 Feb 2006 23:41:50 -0000 1.6 *************** *** 39,66 **** #define MUTEX_UNLOCK 0 typedef struct { ! int state; /* state being able to query */ ! int target; /* flag whether target is gw, ap, or CISCO ap */ ! sys_net_t ap; /* network infomation of AP or general gw */ ! int snmp; /* flag whether target can support SNMP */ ! char community[MAXCOMMNAME]; /* SNMP community */ ! int shared_mutex; /* shared mutex for radio state */ ! int ridx_slot; sys_802dot11if_t radiodev[MAXSHM_RADIO]; ! int ifcnt; ! qos_if_t dev[MAXSHM_IF]; ! int maxbw; ! int tcifcnt; /* TC dev info for its max bandwidth */ ! qos_dev_t tc_dev[MAXSHM_IF]; ! int cscnt; ! qos_class_t glass[MAXSHM_QOS_CLASS]; ! int ftcnt; ! qos_filter_t filter[MAXSHM_QOS_FILTER]; ! int polused; ! int polcnt; ! qos_pol_t pol[MAXSHM_QOS_POL]; ! int hpolcnt; /* error packet */ ! sys_host_pol_t hostpol[MAXSHM_HOST_POL]; ! sys_autoconf_t auto_test; } sm_t; --- 39,86 ---- #define MUTEX_UNLOCK 0 + /* F L O W C O N T R O L O B J E C T L I M I T */ + #define MAXSHM_FC_NET 256 + #define MAXSHM_FC_SVC 256 + #define MAXSHM_FC_FW 128 + #define MAXSHM_FC_POL 1024 + typedef struct { ! int state; /* state being able to query */ ! int target; /* flag whether target is gw, ap, or CISCO ap */ ! sys_net_t ap; /* network infomation of AP or general gw */ ! int snmp; /* flag whether target can support SNMP */ ! char community[MAXCOMMNAME]; /* SNMP community */ ! int shared_mutex; /* shared mutex for radio state */ ! int ridx_slot; sys_802dot11if_t radiodev[MAXSHM_RADIO]; ! int ifcnt; ! qos_if_t dev[MAXSHM_IF]; ! int maxbw; /* Q O S */ ! int tcifcnt; /* TC dev info for its max bandwidth */ ! qos_dev_t tc_dev[MAXSHM_IF]; ! int cscnt; ! qos_class_t glass[MAXSHM_QOS_CLASS]; ! int ftcnt; ! qos_filter_t filter[MAXSHM_QOS_FILTER]; ! int polused; ! int polcnt; ! qos_pol_t pol[MAXSHM_QOS_POL]; ! ! int fc_net_cnt; /* F L O W C O N T R O L */ ! fc_net_t fc_net [MAXSHM_FC_NET]; ! ! int fc_svc_cnt; ! fc_svc_t fc_svc [MAXSHM_FC_SVC]; ! ! int fc_fw_cnt; ! fc_fw_t fc_fw [MAXSHM_FC_FW]; ! ! int fc_pol_cnt; ! fc_pol_t fc_pol [MAXSHM_FC_POL]; ! ! /* TODO: delete this after finishing up FC */ ! int hpolcnt; /* error packet */ ! sys_host_pol_t hostpol[MAXSHM_HOST_POL]; ! sys_autoconf_t auto_test; } sm_t; Index: confproc.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/confproc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** confproc.h 25 Feb 2006 22:59:00 -0000 1.2 --- confproc.h 28 Feb 2006 23:41:50 -0000 1.3 *************** *** 13,16 **** --- 13,21 ---- extern sys_strmap_t map_truefalse[]; + extern sys_strmap_t map_nettype []; + extern sys_strmap_t map_prototype []; + extern sys_strmap_t map_icmptype []; + extern sys_strmap_t map_thput_unit []; + extern sys_strmap_t map_fcpolrule []; /* * void functionname (int argc, char *argv[], int modify, frp_t fr); *************** *** 34,37 **** --- 39,43 ---- void list_if(int argc, char *argv[], int modify, frp_t fr); + /* Q O S */ void list_qos_maxbw(int argc, char *argv[], int modify, frp_t fr); void add_qos_maxbw(int argc, char *argv[], int modify, frp_t fr); *************** *** 47,51 **** void del_qos_pol(int argc, char *argv[], int modify, frp_t fr); void qos_apply(int argc, char *argv[], int modify, frp_t fr); ! void list_fc_svc(int argc, char *argv[], int modify, frp_t fr); void add_fc_svc(int argc, char *argv[], int modify, frp_t fr); --- 53,57 ---- void del_qos_pol(int argc, char *argv[], int modify, frp_t fr); void qos_apply(int argc, char *argv[], int modify, frp_t fr); ! /* F C */ void list_fc_svc(int argc, char *argv[], int modify, frp_t fr); void add_fc_svc(int argc, char *argv[], int modify, frp_t fr); *************** *** 61,64 **** --- 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); + /* A P A U T O */ void list_auto(int argc, char *argv[], int modify, frp_t fr); void set_auto(int argc, char *argv[], int modify, frp_t fr); Index: sysipc.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/sysipc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sysipc.h 25 Feb 2006 22:59:00 -0000 1.2 --- sysipc.h 28 Feb 2006 23:41:50 -0000 1.3 *************** *** 109,112 **** --- 109,116 ---- } sys_cmd_e; + #define CBFROM_MAIN 1 + #define CBFROM_MOD 2 + #define CBFROM_SYSTEM 3 + #define __IOCTL_IDX_BASE CMD_LISTTHRESHOLD Index: sysdef.h =================================================================== RCS file: /cvsroot/netadm/gwc/include/sysdef.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sysdef.h 27 Feb 2006 18:34:26 -0000 1.4 --- sysdef.h 28 Feb 2006 23:41:50 -0000 1.5 *************** *** 210,214 **** typedef struct { char name[OL]; ! sys_proto_type_e type; union { unsigned short port; --- 210,214 ---- typedef struct { char name[OL]; ! sys_proto_type_e proto; union { unsigned short port; *************** *** 221,225 **** int val; sys_thput_unit_e unit; ! } fc_flow_t; typedef enum { --- 221,225 ---- int val; sys_thput_unit_e unit; ! } fc_fw_t; typedef enum { *************** *** 235,239 **** char dnet[OL]; char dsvc[OL]; ! char flow[OL]; fc_pol_rule_e rule; } fc_pol_t; --- 235,239 ---- char dnet[OL]; char dsvc[OL]; ! char fw[OL]; fc_pol_rule_e rule; } fc_pol_t; |
