[Netadm-devel] gwc/include confproc.h,1.1.1.1,1.2 global.h,1.2,1.3 message.h,1.2,1.3 sysdef.h,1.1.1.1,1.2 sysipc.h,1.1.1.1,1.2 sysshm.h,1.4,1.5

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

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

Modified Files:
	confproc.h global.h message.h sysdef.h sysipc.h sysshm.h 
Log Message:
MOD:

    [ start to gwc-v1.0-pre3, not completed ]

    ADD: 1. command index, handler (but not main routine, just null),
	    message for gwc-v1.0-pre3 functionalities.
	    sysipc.h, message.h, confproc.h
	    confproc.c, conftab.c

	 2. data structure for gwc-v1.0-pre3. 
	    for example,  service protocol object, network object, flow object,
	                  policy object in sysdef.h
	    but i didn't insert these object in shared memory (sysshm.h)

    MOD: 1. version info in global.h
         2. renamed current qos concerned data structure from _tc_ to _qos_

    else ADD and MOD


Index: sysshm.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysshm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sysshm.h	17 Feb 2006 06:58:59 -0000	1.4
--- sysshm.h	25 Feb 2006 22:59:00 -0000	1.5
***************
*** 31,37 ****
  #define MAXSHM_RADIO	  24
  #define MAXSHM_IF	  6
! #define MAXSHM_TC_CLASS	  64
! #define MAXSHM_TC_FILTER  64
! #define MAXSHM_TC_POL	  1024
  #define MAXSHM_HOST_POL	  1024
  
--- 31,37 ----
  #define MAXSHM_RADIO	  24
  #define MAXSHM_IF	  6
! #define MAXSHM_QOS_CLASS  64
! #define MAXSHM_QOS_FILTER 64
! #define MAXSHM_QOS_POL	  1024
  #define MAXSHM_HOST_POL	  1024
  
***************
*** 49,63 ****
  	sys_802dot11if_t radiodev[MAXSHM_RADIO];
  	int ifcnt;
! 	sys_if_t dev[MAXSHM_IF];
  	int maxbw;
  	int tcifcnt;				/* TC dev info for its max bandwidth */
! 	sys_tc_dev_t tc_dev[MAXSHM_IF];
  	int cscnt;
! 	sys_tc_class_t glass[MAXSHM_TC_CLASS];
  	int ftcnt;
! 	sys_tc_filter_t filter[MAXSHM_TC_FILTER];
  	int polused;
  	int polcnt;
! 	sys_tc_pol_t pol[MAXSHM_TC_POL];
  	int hpolcnt;				/* error packet */
  	sys_host_pol_t hostpol[MAXSHM_HOST_POL];
--- 49,63 ----
  	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];

Index: message.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/message.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** message.h	31 Jan 2006 14:19:38 -0000	1.2
--- message.h	25 Feb 2006 22:59:00 -0000	1.3
***************
*** 22,109 ****
  
  /* INFO_: INFOrmation */
! #define INFO_CLI_LISTAPINFO "List AP infomation."
! #define INFO_CLI_ADDAPINFO "Add AP Network infomation."
! #define INFO_CLI_LISTSNMPCOMM "List SNMP commnunity infomation."
! #define INFO_CLI_ADDSNMPCOMM "Add SNMP community infomation."
! #define INFO_CLI_LISTPHYMACSPEC "List phycal interface mac spec infomation."
! #define INFO_CLI_LISTSYSINFO "List current AP system infomation."
! #define INFO_CLI_LISTIFINFO "List current IF infomation."
! #define INFO_CLI_LISTIPINFO "List current IP infomation."
! #define INFO_CLI_LISTTCPINFO "List current TCP infomation."
! #define INFO_CLI_LISTUDPINFO "List current UDP infomation."
! #define INFO_CLI_LISTCCKTPOWER "List current CCK transmitter power"
! #define INFO_CLI_LISTOFDMTPOWER "List current  OFDM transmitter power"
! #define INFO_CLI_LISTCLIENTPOWER "List current Client power"
! #define INFO_CLI_SETTXPOWER "Set current Tx Power"
! #define INFO_CLI_LIST_IF "List Interface infomation"
! #define INFO_CLI_LIST_TC_MAXBW	"List the maximum bandwidth of a interfaces"
! #define INFO_CLI_ADD_TC_MAXBW	"Add the maximum bandwidth of a specfied interface"
! #define INFO_CLI_DEL_TC_MAXBW	"Delete the maximum bandwidth info of a specfied interface"
! #define INFO_CLI_LIST_TC_CLASS "List Traffic Control class infomation"
! #define INFO_CLI_ADD_TC_CLASS "Add Traffic Control Class"
! #define INFO_CLI_DEL_TC_CLASS "Delete Traffic Control Class"
! #define INFO_CLI_LIST_TC_FILTER "List Traffic Control Filter"
! #define INFO_CLI_ADD_TC_FILTER "Add Traffic Control Filter"
! #define INFO_CLI_DEL_TC_FILTER "Delete Traffic Control Filter"
! #define INFO_CLI_LIST_TC_POL "List Traffic Control Policy"
! #define INFO_CLI_ADD_TC_POL "Add Traffic Control Policy"
! #define INFO_CLI_DEL_TC_POL "Delete Traffic Control Policy"
! #define INFO_CLI_TC_APPLY "Apply Traffic Control Policy"
! #define INFO_CLI_LIST_HOSTPOL "List host policy{pakcet control|modify seq of TCP}"
! #define INFO_CLI_ADD_HOSTPOL  "Add host policy{packet control|modify seq of TCP}"
! #define INFO_CLI_DEL_HOSTPOL  "Delete host policy{packet control|modify seq of TCP}"
! #define INFO_CLI_HOSTPOL_APPLY "Apply host policy{packet control|modify seq of TCP}"
! #define INFO_CLI_LIST_AUTO "List the setup config of auto test"
! #define INFO_CLI_SET_AUTO "Set the setup config of auto test "
! #define INFO_CLI_AUTO_APPLY "Apply the Auto test config"
  
  /* STR_	: normal STRing */
! #define STR_STATE	"qry_state"
! #define STR_TARGET	"target"
! #define STR_AP_IP	"target_ip"
! #define STR_AP_MASK	"target_mask"
! #define STR_SNMP	"snmp"
! #define STR_COMMUNITY	"snmp_community"
! #define STR_RADIO_IDX	"radio_idx"
! #define STR_INTERFACE	"interface"
! #define STR_TC_DEV	"tc_dev"
! #define STR_TC_CLASS	"tc_class"
! #define STR_TC_FILTER	"tc_filter"
! #define STR_TC_POLICY	"tc_policy"
! #define STR_HOST_POLICY	"host_policy"
! #define STR_AUTO_TEST	"auto_test"
  
  /* EM_	: Error Message */
! 
! #define EM_OBJNOTFOUND		"Can't found the object(%s)"
! #define EM_NOTAVAILABLEREQ	"It(%s) is not supported"
! #define EM_NOTAVAILABLESVC	"It(%s) is not available service"
! #define EM_AUTHCON		"Can't connect to Auth Server"
! #define EM_WRITE	"Write error"
! #define EM_READ		"Read error"
! #define EM_NOUSER	"User does not exist"
! #define EM_EMPTYNAME	"Enter User Name"
! #define EM_DUPUSER	"User already exist"
! #define EM_PASSWD	"Passwd incorret"
! #define EM_EMPTYPASS	"Enter Passwd"
! #define EM_PASSINIT	"User passwd does not initialized"
! #define EM_BLOCKUSR	"Blocked count"
! #define EM_AUTHDBIO	"Auth DB error"
! #define EM_SKEYIO	"Key file error"
! #define EM_NOMEMORY	"Not enough memory"
! #define EM_USERPERM	"Permission error"
! #define EM_MSGBUFSIZ	"Not enough buffer"
! #define EM_AUTHCONN	"Can't connect"
! #define EM_INTERN	"Internal error"
! #define EM_SYSTEM	"Internal Function error"
! #define EM_WRONGDATA	"Input error of internal auth routine"
! #define EM_AUTHTYPE	"Inout error of authentification type"
! #define EM_EXPDATE	"Expire date error"
! #define EM_EMPTYBAD	"Maximum bad trial"
! #define EM_PWLENGTH	"Password size error"
! #define EM_PASSFORM	"Bad password error"
! #define EM_EXPPASSWD	"Password expired"
! #define EM_DELADMIN	"Can't delete system admin"
! #define EM_AUTHPUBLIC	"Normal user can't login"
  
  #endif				/* __SYS_MESSAGES_H */
--- 22,119 ----
  
  /* INFO_: INFOrmation */
! #define INFO_CLI_LISTAPINFO	  "List AP infomation."
! #define INFO_CLI_ADDAPINFO	  "Add AP Network infomation."
! #define INFO_CLI_LISTSNMPCOMM	  "List SNMP commnunity infomation."
! #define INFO_CLI_ADDSNMPCOMM	  "Add SNMP community infomation."
! #define INFO_CLI_LISTPHYMACSPEC	  "List phycal interface mac spec infomation."
! #define INFO_CLI_LISTSYSINFO	  "List current AP system infomation."
! #define INFO_CLI_LISTIFINFO	  "List current IF infomation."
! #define INFO_CLI_LISTIPINFO	  "List current IP infomation."
! #define INFO_CLI_LISTTCPINFO	  "List current TCP infomation."
! #define INFO_CLI_LISTUDPINFO	  "List current UDP infomation."
! #define INFO_CLI_LISTCCKTPOWER	  "List current CCK transmitter power"
! #define INFO_CLI_LISTOFDMTPOWER	  "List current  OFDM transmitter power"
! #define INFO_CLI_LISTCLIENTPOWER  "List current Client power"
! #define INFO_CLI_SETTXPOWER	  "Set current Tx Power"
! #define INFO_CLI_LIST_IF	  "List Interface infomation"
! 
! #define INFO_CLI_LIST_QOS_MAXBW	  "List the maximum bandwidth of a interfaces"
! #define INFO_CLI_ADD_QOS_MAXBW	  "Add the maximum bandwidth of a specfied interface"
! #define INFO_CLI_DEL_QOS_MAXBW	  "Delete the maximum bandwidth info of a specfied interface"
! #define INFO_CLI_LIST_QOS_CLASS	  "List class infomation in QoS"
! #define INFO_CLI_ADD_QOS_CLASS	  "Add a Class in QoS"
! #define INFO_CLI_DEL_QOS_CLASS	  "Delete a Class in QoS"
! #define INFO_CLI_LIST_QOS_FILTER  "List Filters in QoS"
! #define INFO_CLI_ADD_QOS_FILTER	  "Add a Filter in QoS"
! #define INFO_CLI_DEL_QOS_FILTER	  "Delete a Filter in QoS"
! #define INFO_CLI_LIST_QOS_POL	  "List Policy in QoS"
! #define INFO_CLI_ADD_QOS_POL	  "Add a Policy in QoS"
! #define INFO_CLI_DEL_QOS_POL	  "Delete a Policy in QoS"
! #define INFO_CLI_QOS_APPLY	  "Apply the Policies of QoS"
! 
! #define INFO_CLI_LIST_FC_SVC	  "List service protocol in flow control"
! #define INFO_CLI_ADD_FC_SVC	  "Add a service protocol in flow control"
! #define INFO_CLI_DEL_FC_SVC	  "Delete a service protocol in flow control"
! #define INFO_CLI_LIST_FC_NET	  "List network in flow control"
! #define INFO_CLI_ADD_FC_NET	  "Add a network protocol in flow control"
! #define INFO_CLI_DEL_FC_NET	  "Delete a service protocol in flow control"
! #define INFO_CLI_LIST_FC_FLOW	  "List flow object in flow control"
! #define INFO_CLI_ADD_FC_FLOW	  "Add a flow object in flow control"
! #define INFO_CLI_DEL_FC_FLOW	  "Delete a flow object in flow control"
! #define INFO_CLI_LIST_FC_POL	  "List policies in flow control"
! #define INFO_CLI_ADD_FC_POL	  "Add a policy in flow control"
! #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_LIST_AUTO	  "List the setup config of auto test"
! #define INFO_CLI_SET_AUTO	  "Set the setup config of auto test "
! #define INFO_CLI_AUTO_APPLY	  "Apply the Auto test config"
  
  /* STR_	: normal STRing */
! #define STR_STATE		  "qry_state"
! #define STR_TARGET		  "target"
! #define STR_AP_IP		  "target_ip"
! #define STR_AP_MASK		  "target_mask"
! #define STR_SNMP		  "snmp"
! #define STR_COMMUNITY		  "snmp_community"
! #define STR_RADIO_IDX		  "radio_idx"
! #define STR_INTERFACE		  "interface"
! #define STR_TC_DEV		  "tc_dev"
! #define STR_TC_CLASS		  "tc_class"
! #define STR_TC_FILTER		  "tc_filter"
! #define STR_TC_POLICY		  "tc_policy"
! #define STR_HOST_POLICY		  "host_policy"
! #define STR_AUTO_TEST		  "auto_test"
  
  /* EM_	: Error Message */
! #define EM_OBJNOTFOUND		  "Can't found the object(%s)"
! #define EM_NOTAVAILABLEREQ	  "It(%s) is not supported"
! #define EM_NOTAVAILABLESVC	  "It(%s) is not available service"
! #define EM_AUTHCON		  "Can't connect to Auth Server"
! #define EM_WRITE		  "Write error"
! #define EM_READ			  "Read error"
! #define EM_NOUSER		  "User does not exist"
! #define EM_EMPTYNAME		  "Enter User Name"
! #define EM_DUPUSER		  "User already exist"
! #define EM_PASSWD		  "Passwd incorret"
! #define EM_EMPTYPASS		  "Enter Passwd"
! #define EM_PASSINIT		  "User passwd does not initialized"
! #define EM_BLOCKUSR		  "Blocked count"
! #define EM_AUTHDBIO		  "Auth DB error"
! #define EM_SKEYIO		  "Key file error"
! #define EM_NOMEMORY		  "Not enough memory"
! #define EM_USERPERM		  "Permission error"
! #define EM_MSGBUFSIZ		  "Not enough buffer"
! #define EM_AUTHCONN		  "Can't connect"
! #define EM_INTERN		  "Internal error"
! #define EM_SYSTEM		  "Internal Function error"
! #define EM_WRONGDATA		  "Input error of internal auth routine"
! #define EM_AUTHTYPE		  "Inout error of authentification type"
! #define EM_EXPDATE		  "Expire date error"
! #define EM_EMPTYBAD		  "Maximum bad trial"
! #define EM_PWLENGTH		  "Password size error"
! #define EM_PASSFORM		  "Bad password error"
! #define EM_EXPPASSWD		  "Password expired"
! #define EM_DELADMIN		  "Can't delete system admin"
! #define EM_AUTHPUBLIC		  "Normal user can't login"
  
  #endif				/* __SYS_MESSAGES_H */

Index: confproc.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/confproc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** confproc.h	30 Jan 2006 17:41:29 -0000	1.1.1.1
--- confproc.h	25 Feb 2006 22:59:00 -0000	1.2
***************
*** 33,53 ****
  void set_txpower(int argc, char *argv[], int modify, frp_t fr);
  void list_if(int argc, char *argv[], int modify, frp_t fr);
! void list_tc_maxbw(int argc, char *argv[], int modify, frp_t fr);
! void add_tc_maxbw(int argc, char *argv[], int modify, frp_t fr);
! void del_tc_maxbw(int argc, char *argv[], int modify, frp_t fr);
! void list_tc_class(int argc, char *argv[], int modify, frp_t fr);
! void add_tc_class(int argc, char *argv[], int modify, frp_t fr);
! void del_tc_class(int argc, char *argv[], int modify, frp_t fr);
! void list_tc_filter(int argc, char *argv[], int modify, frp_t fr);
! void add_tc_filter(int argc, char *argv[], int modify, frp_t fr);
! void del_tc_filter(int argc, char *argv[], int modify, frp_t fr);
! void list_tc_pol(int argc, char *argv[], int modify, frp_t fr);
! void add_tc_pol(int argc, char *argv[], int modify, frp_t fr);
! void del_tc_pol(int argc, char *argv[], int modify, frp_t fr);
! void tc_apply(int argc, char *argv[], int modify, frp_t fr);
! void list_hostpol(int argc, char *argv[], int modify, frp_t fr);
! void add_hostpol(int argc, char *argv[], int modify, frp_t fr);
! void del_hostpol(int argc, char *argv[], int modify, frp_t fr);
! void hostpol_apply(int argc, char *argv[], int modify, frp_t fr);
  void list_auto(int argc, char *argv[], int modify, frp_t fr);
  void set_auto(int argc, char *argv[], int modify, frp_t fr);
--- 33,64 ----
  void set_txpower(int argc, char *argv[], int modify, frp_t fr);
  void list_if(int argc, char *argv[], int modify, frp_t fr);
! 
! 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);
! void del_qos_maxbw(int argc, char *argv[], int modify, frp_t fr);
! void list_qos_class(int argc, char *argv[], int modify, frp_t fr);
! void add_qos_class(int argc, char *argv[], int modify, frp_t fr);
! void del_qos_class(int argc, char *argv[], int modify, frp_t fr);
! void list_qos_filter(int argc, char *argv[], int modify, frp_t fr);
! void add_qos_filter(int argc, char *argv[], int modify, frp_t fr);
! void del_qos_filter(int argc, char *argv[], int modify, frp_t fr);
! void list_qos_pol(int argc, char *argv[], int modify, frp_t fr);
! void add_qos_pol(int argc, char *argv[], int modify, frp_t fr);
! 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);
! void del_fc_svc(int argc, char *argv[], int modify, frp_t fr);
! void list_fc_net(int argc, char *argv[], int modify, frp_t fr);
! void add_fc_net(int argc, char *argv[], int modify, frp_t fr);
! void del_fc_net(int argc, char *argv[], int modify, frp_t fr);
! void list_fc_flow(int argc, char *argv[], int modify, frp_t fr);
! void add_fc_flow(int argc, char *argv[], int modify, frp_t fr);
! void del_fc_flow(int argc, char *argv[], int modify, frp_t fr);
! void list_fc_pol(int argc, char *argv[], int modify, frp_t fr);
! void add_fc_pol(int argc, char *argv[], int modify, frp_t fr);
! 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 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.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sysipc.h	30 Jan 2006 17:41:29 -0000	1.1.1.1
--- sysipc.h	25 Feb 2006 22:59:00 -0000	1.2
***************
*** 78,98 ****
  	CMD_SET_TXPW,
  	CMD_LIST_IF,
! 	CMD_LIST_TC_MAXBW,
! 	CMD_ADD_TC_MAXBW,
! 	CMD_DEL_TC_MAXBW,
! 	CMD_LIST_TC_CLASS,
! 	CMD_ADD_TC_CLASS,
! 	CMD_DEL_TC_CLASS,
! 	CMD_LIST_TC_FILTER,
! 	CMD_ADD_TC_FILTER,
! 	CMD_DEL_TC_FILTER,
! 	CMD_LIST_TC_POL,
! 	CMD_ADD_TC_POL,
! 	CMD_DEL_TC_POL,
! 	CMD_TC_APPLY,
! 	CMD_LIST_HOSTPOL,
! 	CMD_ADD_HOSTPOL,
! 	CMD_DEL_HOSTPOL,
! 	CMD_HOSTPOL_APPLY,
  	CMD_LIST_AUTO,
  	CMD_SET_AUTO,
--- 78,107 ----
  	CMD_SET_TXPW,
  	CMD_LIST_IF,
! 	CMD_LIST_QOS_MAXBW,
! 	CMD_ADD_QOS_MAXBW,
! 	CMD_DEL_QOS_MAXBW,
! 	CMD_LIST_QOS_CLASS,
! 	CMD_ADD_QOS_CLASS,
! 	CMD_DEL_QOS_CLASS,
! 	CMD_LIST_QOS_FILTER,
! 	CMD_ADD_QOS_FILTER,
! 	CMD_DEL_QOS_FILTER,
! 	CMD_LIST_QOS_POL,
! 	CMD_ADD_QOS_POL,
! 	CMD_DEL_QOS_POL,
! 	CMD_QOS_APPLY,
! 	CMD_LIST_FC_SVC,
! 	CMD_ADD_FC_SVC,
! 	CMD_DEL_FC_SVC,
! 	CMD_LIST_FC_NET,
! 	CMD_ADD_FC_NET,
! 	CMD_DEL_FC_NET,
! 	CMD_LIST_FC_FLOW,
! 	CMD_ADD_FC_FLOW,
! 	CMD_DEL_FC_FLOW,
! 	CMD_LIST_FC_POL,
! 	CMD_ADD_FC_POL,
! 	CMD_DEL_FC_POL,
! 	CMD_FC_APPLY,
  	CMD_LIST_AUTO,
  	CMD_SET_AUTO,

Index: sysdef.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysdef.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sysdef.h	30 Jan 2006 17:41:29 -0000	1.1.1.1
--- sysdef.h	25 Feb 2006 22:59:00 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  #define KB		1000
  
+ /* GLOBAL OBJECT             START */
  typedef struct {
  	char *str;
***************
*** 30,33 ****
--- 31,56 ----
  } sys_net_t;
  
+ typedef enum {
+         SYS_NT_NET      = 1,
+         SYS_NT_HOST     = 2,
+ } sys_net_type_e;
+ 
+ typedef enum {
+ 	SYS_FLOW_BPS	  = 1,
+         SYS_FLOW_KBPS     = 2,
+         SYS_FLOW_MBPS     = 3,
+ 	SYS_FLOW_BYTE	  = 4,
+ 	SYS_FLOW_KBYTE	  = 5,
+ 	SYS_FLOW_MBYTE	  = 6,
+ } sys_thput_unit_e;
+ 
+ typedef enum {
+ 	SYS_PROTO_TCP = IPPROTO_TCP,
+ 	SYS_PROTO_UDP = IPPROTO_UDP,
+ 	SYS_PROTO_ICMP = IPPROTO_ICMP,
+ } sys_proto_type_e;
+ 
+ /* GLOBAL OBJECT             END */
+ 
  /* 802dot11 radio interface */
  /* type */
***************
*** 67,85 ****
  } sys_802dot11if_t;
  
  typedef struct {
! 	char if_name[OL];
! 	char if_hostname[MAXHOSTNAME];
! 	struct in_addr if_addr;
! 	struct in_addr if_mask;
! 	int bw;
! 	int root_id;
! 	int root_made;
! } sys_if_t;
  
  #define TC_DEV_MAXBW  1000001	/* kbyte, so about 1Gbyte */
  typedef struct {
  	char if_name[OL];
! 	int bw;
! } sys_tc_dev_t;
  
  /* TODO: no need  */
--- 90,109 ----
  } sys_802dot11if_t;
  
+ /* QoS	object			start */
  typedef struct {
! 	char		if_name[OL];
! 	char		if_hostname[MAXHOSTNAME];
! 	struct in_addr	if_addr;
! 	struct in_addr	if_mask;
! 	int		bw;
! 	int		root_id;
! 	int		root_made;
! } qos_if_t;
  
  #define TC_DEV_MAXBW  1000001	/* kbyte, so about 1Gbyte */
  typedef struct {
  	char if_name[OL];
! 	int  bw;
! } qos_dev_t;
  
  /* TODO: no need  */
***************
*** 92,111 ****
  	int class_made;
  	char if_name[OL];
! } sys_tc_class_t;
  
  typedef enum {
  	APC_TC_FILTER_TYPE_TOS = 0,
  	APC_TC_FILTER_TYPE_PROTO,
! } sys_tc_filter_type_e;
! 
! typedef enum {
! 	APC_TC_PROTO_TCP = IPPROTO_TCP,
! 	APC_TC_PROTO_UDP = IPPROTO_UDP,
! } sys_tc_proto_type_e;
  
  typedef struct {
! 	sys_tc_proto_type_e type;
  	unsigned short port;
! } sys_tc_proto_t;
  
  #define APC_FILTER_TYPE_TOS   0x00000000
--- 116,130 ----
  	int class_made;
  	char if_name[OL];
! } qos_class_t;
  
  typedef enum {
  	APC_TC_FILTER_TYPE_TOS = 0,
  	APC_TC_FILTER_TYPE_PROTO,
! } qos_filter_type_e;
  
  typedef struct {
! 	sys_proto_type_e type;
  	unsigned short port;
! } qos_proto_t;
  
  #define APC_FILTER_TYPE_TOS   0x00000000
***************
*** 139,152 ****
  	char name[OL / 4];
  	char nf_name[MAXCOMMNAME];
! } sys_tc_tos_t;
  
  typedef struct {
  	char name[OL];
! 	sys_tc_filter_type_e type;
  	union {
  		unsigned char tos;
! 		sys_tc_proto_t proto;
  	} u;
! } sys_tc_filter_t;
  
  #define NOMARK	  0
--- 158,171 ----
  	char name[OL / 4];
  	char nf_name[MAXCOMMNAME];
! } qos_tos_t;
  
  typedef struct {
  	char name[OL];
! 	qos_filter_type_e type;
  	union {
  		unsigned char tos;
! 		qos_proto_t proto;
  	} u;
! } qos_filter_t;
  
  #define NOMARK	  0
***************
*** 157,170 ****
  
  typedef struct {
  	char name[OL];
! 	char filter_name[OL];
! 	char class_name[OL];
! 	int mark_used;
! 	char mark_name[OL / 4];
! } sys_tc_pol_t;
  
  /* sys_host_pol_t/flag */
! #define BLOCK_HOST  0x0001
! #define MODIFY_SEQ  0x0002
  #define MAX_PKTRATE   65535
  
--- 176,215 ----
  
  typedef struct {
+ 	char		name[OL];
+ 	char		filter_name[OL];
+ 	char		class_name[OL];
+ 	int		mark_used;
+ 	char		mark_name[OL / 4];
+ } qos_pol_t;
+ 
+ /* QoS	object			start */
+ 
+ /* F L O W  C O N T R O L       start */
+ typedef struct {
+         char            name[OL];
+         sys_net_type_e  type;
+ 	sys_net_t	net;
+         char            net_if[OL];
+ } fc_net_t;
+ 
+ typedef struct {
  	char name[OL];
! 	sys_proto_type_e  type;
! 	union {
! 	  unsigned short  port;
! 	  unsigned short  icmptype;
! 	} ext;
! } fc_svc_t;
! 
! typedef struct {
! 	char name[OL];
! 	int  value;
! 	sys_thput_unit_e unit;
! } fc_flow_t;
! 
  
  /* sys_host_pol_t/flag */
! #define BLOCK_HOST    0x0001
! #define MODIFY_SEQ    0x0002
  #define MAX_PKTRATE   65535
  
***************
*** 172,180 ****
--- 217,235 ----
  	/* struct in_addr  ip; */
  	char name[OL];
+ 	char src_net[OL];
+ 	char src_svc[OL];
  	int ip;
  	unsigned short flag;
  	int max_pktrate;
+ } sys_fc_pol_t;
+ typedef struct {
+           /* struct in_addr  ip; */
+           char name[OL];
+ 	          int ip;
+ 		          unsigned short flag;
+ 			          int max_pktrate;
  } sys_host_pol_t;
  
+ 
  #define AUTO_STATE_INIT	0
  #define AUTO_STATE_S1	1

Index: global.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/global.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** global.h	17 Feb 2006 08:09:18 -0000	1.2
--- global.h	25 Feb 2006 22:59:00 -0000	1.3
***************
*** 29,33 ****
  #define	SZPKGNAME	  "Netadm network control system"
  #define	SZSYSCOPYRIGHT	  "GPL v2"
! #define	SZSYSVERSION	  "gwc-v0.1-pre2"
  /* package naming , version , copyright - end */
  /* exe, config file path - start */
--- 29,33 ----
  #define	SZPKGNAME	  "Netadm network control system"
  #define	SZSYSCOPYRIGHT	  "GPL v2"
! #define	SZSYSVERSION	  "gwc-v0.1-pre3"
  /* package naming , version , copyright - end */
  /* exe, config file path - start */