[Netadm-devel] gwc/gwclib confproc.c,1.18,1.19 conftab.c,1.8,1.9 confutil.c,1.10,1.11

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

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

Modified Files:
	confproc.c conftab.c confutil.c 
Log Message:

MOD:  rearrange export symbol.



Index: conftab.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/conftab.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** conftab.c	8 Mar 2006 15:29:55 -0000	1.8
--- conftab.c	13 Mar 2006 14:15:05 -0000	1.9
***************
*** 107,108 ****
--- 107,172 ----
  	{0},
  };
+ 
+ 
+ qos_tos_t tostab[] = {
+   {APC_TOS_TYPE_MD, "MD", "Minimize-Delay"},
+   {APC_TOS_TYPE_MT, "MT", "Maximize-Throughput"},
+   {APC_TOS_TYPE_MR, "MR", "Maximize-Reliability"},
+   {APC_TOS_TYPE_MMC, "MMC", "Minimize-Cost"},
+   {APC_TOS_TYPE_NS, "NS", "Normal-Service"},
+   {-1, ""},
+   { 0 }
+ };
+ 
+ sys_strmap_t map_truefalse[] = {
+   { "true", TRUE },
+   { "false", FALSE },
+   { 0 }
+ };
+ 
+ sys_strmap_t  map_nettype [] = {
+   { "net",  SYS_NT_NET },
+   { "host", SYS_NT_HOST },
+   { 0 }
+ };
+ 
+ sys_strmap_t map_prototype [] = {
+   { "tcp",  SYS_PROTO_TCP },
+   { "udp",  SYS_PROTO_UDP },
+   { "icmp", SYS_PROTO_ICMP },
+   { 0 }
+ };
+ 
+ sys_strmap_t map_icmptype [] = {
+   { "unreach",    SYS_ICMP_UNREACH },
+   { "echo",       SYS_ICMP_ECHO },
+   { "echorep",    SYS_ICMP_ECHOREP },
+   { "squench",    SYS_ICMP_SQUENCH },
+   { "redir",      SYS_ICMP_REDIR },
+   { "timex",      SYS_ICMP_TIMEX },
+   { "paramprob",  SYS_ICMP_PARAMPROB },
+   { "timest",     SYS_ICMP_TIMEST },
+   { "timestrep",  SYS_ICMP_TIMESTREP },
+   { "inforeq",    SYS_ICMP_INFOREQ },
+   { "inforep",    SYS_ICMP_INFOREP },
+   { "maskreq",    SYS_ICMP_MASKREQ },
+   { "maskrep",    SYS_ICMP_MASKREP },
+   { 0 }
+ };
+ 
+ sys_strmap_t map_thput_unit [] = {
+   { "bps",    SYS_FLOW_BPS },
+   { "kbps",   SYS_FLOW_KBPS },
+   { "mbps",   SYS_FLOW_MBPS },
+   { "byte",   SYS_FLOW_BYTE },
+   { "kbyte",  SYS_FLOW_KBYTE },
+   { "mbyte", SYS_FLOW_MBYTE },
+   { 0 }
+ };
+ 
+ sys_strmap_t map_fc_rule [] = {
+   { "fc", FC_PR_CONTROL },
+   { "mh", FC_PR_MOD_HEADER },
+   { 0 }
+ };
+ 

Index: confutil.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/confutil.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** confutil.c	10 Mar 2006 18:13:58 -0000	1.10
--- confutil.c	13 Mar 2006 14:15:05 -0000	1.11
***************
*** 38,41 ****
--- 38,42 ----
  #include "linklist.h"
  #include "slog.h"
+ #include "confproc.h"
  
  #if !defined(TRUE)
***************
*** 48,57 ****
  extern sys_cmd_t cmdtab[];
  extern sys_ucmd_t ucmdtab[];
- 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_fc_rule [];
  
  void * sys_ucmd_msg (sys_ucmd_e cmd, void *arg, int len, frp_t fr) {
--- 49,52 ----

Index: confproc.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/confproc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** confproc.c	10 Mar 2006 18:13:58 -0000	1.18
--- confproc.c	13 Mar 2006 14:15:05 -0000	1.19
***************
*** 52,132 ****
  extern int errno;
  
- #if 0
- static inline void
- maxbw()
- {
- 	int i;
- 
- 	for (i = 0; i < csm->cscnt; i++) {
- 		csm->maxbw = max(csm->maxbw, csm->glass[i].bw);
- 	}
- }
- #endif
- 
- /* 
-  * this tostab is used in both filter tos and pol mark 
-  */
- qos_tos_t tostab[] = {
-   {APC_TOS_TYPE_MD, "MD", "Minimize-Delay"},
-   {APC_TOS_TYPE_MT, "MT", "Maximize-Throughput"},
-   {APC_TOS_TYPE_MR, "MR", "Maximize-Reliability"},
-   {APC_TOS_TYPE_MMC, "MMC", "Minimize-Cost"},
-   {APC_TOS_TYPE_NS, "NS", "Normal-Service"},
-   {-1, ""},
-   { 0 }
- };
- 
- sys_strmap_t map_truefalse[] = {
-   { "true", TRUE },
-   { "false", FALSE },
-   { 0 }
- };
- 
- sys_strmap_t  map_nettype [] = {
-   { "net",  SYS_NT_NET },
-   { "host", SYS_NT_HOST },
-   { 0 }
- };
- 
- sys_strmap_t map_prototype [] = {
-   { "tcp",  SYS_PROTO_TCP },
-   { "udp",  SYS_PROTO_UDP },
-   { "icmp", SYS_PROTO_ICMP },
-   { 0 }
- };
- 
- sys_strmap_t map_icmptype [] = {
-   { "unreach",	  SYS_ICMP_UNREACH },
-   { "echo",	  SYS_ICMP_ECHO },
-   { "echorep",	  SYS_ICMP_ECHOREP },
-   { "squench",	  SYS_ICMP_SQUENCH },
-   { "redir",	  SYS_ICMP_REDIR },
-   { "timex",	  SYS_ICMP_TIMEX },
-   { "paramprob",  SYS_ICMP_PARAMPROB },
-   { "timest",	  SYS_ICMP_TIMEST },
-   { "timestrep",  SYS_ICMP_TIMESTREP },
-   { "inforeq",	  SYS_ICMP_INFOREQ },
-   { "inforep",	  SYS_ICMP_INFOREP },
-   { "maskreq",	  SYS_ICMP_MASKREQ },
-   { "maskrep",	  SYS_ICMP_MASKREP },
-   { 0 }
- };
- 
- sys_strmap_t map_thput_unit [] = {
-   { "bps",    SYS_FLOW_BPS },
-   { "kbps",   SYS_FLOW_KBPS },
-   { "mbps",   SYS_FLOW_MBPS },
-   { "byte",   SYS_FLOW_BYTE },
-   { "kbyte",  SYS_FLOW_KBYTE },
-   { "mbyte", SYS_FLOW_MBYTE },
-   { 0 }
- };
- 
- sys_strmap_t map_fc_rule [] = { 
-   { "fc", FC_PR_CONTROL },
-   { "mh", FC_PR_MOD_HEADER },
-   { 0 }
- };
- 
  void
  list_apinfo(int argc, char *argv[], int modify, frp_t fr)
--- 52,55 ----