[Netadm-devel] gwc/gwcguid fwc.c,1.4,1.5 qos.c,1.4,1.5 qos.h,1.2,1.3

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	fwc.c qos.c qos.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: fwc.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwcguid/fwc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fwc.c	17 Feb 2006 03:06:03 -0000	1.4
--- fwc.c	25 Feb 2006 22:58:59 -0000	1.5
***************
*** 120,124 ****
  	int i;

! 	list = sysclist(CMD_LIST_HOSTPOL, NULL, &col, &row);
  	if (row == -1) {

--- 120,124 ----
  	int i;

! 	list = sysclist(CMD_LIST_FC_POL, NULL, &col, &row);
  	if (row == -1) {

***************
*** 168,172 ****

  	// code here
! 	error = syscmd(CMD_ADD_HOSTPOL, gErrPktPolicy[gPolicyIndex].name,
  		       gErrPktPolicy[gPolicyIndex].ip,
  		       gErrPktPolicy[gPolicyIndex].policy,
--- 168,172 ----

  	// code here
! 	error = syscmd(CMD_ADD_FC_POL, gErrPktPolicy[gPolicyIndex].name,
  		       gErrPktPolicy[gPolicyIndex].ip,
  		       gErrPktPolicy[gPolicyIndex].policy,
***************
*** 197,201 ****
    }

!   error = syscmd(CMD_DEL_HOSTPOL, delRow, EOA);
    if (error != NULL) {
      userwin( USERWIN_ERROR, error);
--- 197,201 ----
    }

!   error = syscmd(CMD_DEL_FC_POL, delRow, EOA);
    if (error != NULL) {
      userwin( USERWIN_ERROR, error);
***************
*** 216,220 ****
  	char *error = NULL;

! 	error = syscmd(CMD_HOSTPOL_APPLY, EOA);

  	if (error != NULL) {
--- 216,220 ----
  	char *error = NULL;

! 	error = syscmd(CMD_FC_APPLY, EOA);

  	if (error != NULL) {

Index: qos.h
===================================================================
RCS file: /cvsroot/netadm/gwc/gwcguid/qos.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qos.h	9 Feb 2006 17:54:06 -0000	1.2
--- qos.h	25 Feb 2006 22:58:59 -0000	1.3
***************
*** 64,68 ****
  extern QosSize uQosSize;
  extern char band_interface[MAXSHM_IF][DL];
! extern char class_interface[MAXSHM_TC_CLASS][DL];
  extern char qosTos[5][MAX_CHAR_LENGTH];
  extern char qosProto[2][MAX_CHAR_LENGTH];
--- 64,68 ----
  extern QosSize uQosSize;
  extern char band_interface[MAXSHM_IF][DL];
! extern char class_interface[MAXSHM_QOS_CLASS][DL];
  extern char qosTos[5][MAX_CHAR_LENGTH];
  extern char qosProto[2][MAX_CHAR_LENGTH];

Index: qos.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwcguid/qos.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** qos.c	17 Feb 2006 03:06:03 -0000	1.4
--- qos.c	25 Feb 2006 22:58:59 -0000	1.5
***************
*** 35,46 ****
  // global variable
  QosBand uQosBand[MAXSHM_IF];
! QosClass uQosClass[MAXSHM_TC_CLASS];
! QosFilter uQosFilter[MAXSHM_TC_FILTER];
! QosPolicy uQosPolicy[MAXSHM_TC_POL];
  OpenQos uOpenQos;
  QosSize uQosSize;

  char band_interface[MAXSHM_IF][DL];
! char class_interface[MAXSHM_TC_CLASS][DL];
  char qosTos[5][MAX_CHAR_LENGTH] = { "MD", "MT", "MR", "MMC", "NS" };
  char qosProto[2][MAX_CHAR_LENGTH] = { "TCP", "UDP" };
--- 35,46 ----
  // global variable
  QosBand uQosBand[MAXSHM_IF];
! QosClass uQosClass[MAXSHM_QOS_CLASS];
! QosFilter uQosFilter[MAXSHM_QOS_FILTER];
! QosPolicy uQosPolicy[MAXSHM_QOS_POL];
  OpenQos uOpenQos;
  QosSize uQosSize;

  char band_interface[MAXSHM_IF][DL];
! char class_interface[MAXSHM_QOS_CLASS][DL];
  char qosTos[5][MAX_CHAR_LENGTH] = { "MD", "MT", "MR", "MMC", "NS" };
  char qosProto[2][MAX_CHAR_LENGTH] = { "TCP", "UDP" };
***************
*** 111,115 ****
  	char *error = NULL;

! 	error = syscmd(CMD_TC_APPLY, EOA);

  	if (error != NULL) {
--- 111,115 ----
  	char *error = NULL;

! 	error = syscmd(CMD_QOS_APPLY, EOA);

  	if (error != NULL) {
***************
*** 340,348 ****
  	int i;

! 	list = sysclist(CMD_LIST_TC_MAXBW, NULL, &col, &row);
  	if (row == -1) {

  		userwin(USERWIN_ERROR,list[0]);
! 		set_item_statusbar("CMD_LIST_TC_MAXBW error");
  		return -1;
  	}
--- 340,348 ----
  	int i;

! 	list = sysclist(CMD_LIST_QOS_MAXBW, NULL, &col, &row);
  	if (row == -1) {

  		userwin(USERWIN_ERROR,list[0]);
! 		set_item_statusbar("CMD_LIST_QOS_MAXBW error");
  		return -1;
  	}
***************
*** 364,368 ****
  	int i;

! 	list = sysclist(CMD_LIST_TC_MAXBW, NULL, &col, &row);
  	if (row == -1) {

--- 364,368 ----
  	int i;

! 	list = sysclist(CMD_LIST_QOS_MAXBW, NULL, &col, &row);
  	if (row == -1) {

***************
*** 390,394 ****
  	int i;

! 	list = sysclist(CMD_LIST_TC_CLASS, NULL, &col, &row);
  	if (row == -1) {

--- 390,394 ----
  	int i;

! 	list = sysclist(CMD_LIST_QOS_CLASS, NULL, &col, &row);
  	if (row == -1) {

***************
*** 417,421 ****
  	int i;

! 	list = sysclist(CMD_LIST_TC_FILTER, NULL, &col, &row);
  	if (row == -1) {

--- 417,421 ----
  	int i;

! 	list = sysclist(CMD_LIST_QOS_FILTER, NULL, &col, &row);
  	if (row == -1) {

***************
*** 445,449 ****
  	int i;

! 	list = sysclist(CMD_LIST_TC_POL, NULL, &col, &row);
  	if (row == -1) {

--- 445,449 ----
  	int i;

! 	list = sysclist(CMD_LIST_QOS_POL, NULL, &col, &row);
  	if (row == -1) {

***************
*** 641,650 ****
  	strcpy(strInterface, band_interface[index]);

! 	error = syscmd(CMD_ADD_TC_MAXBW, strInterface, strBand, EOA);

  	if (error != NULL) {

  		userwin(USERWIN_ERROR,error);
! 		set_item_statusbar("CMD_ADD_TC_MAXBW Error");
  		return;
  	}
--- 641,650 ----
  	strcpy(strInterface, band_interface[index]);

! 	error = syscmd(CMD_ADD_QOS_MAXBW, strInterface, strBand, EOA);

  	if (error != NULL) {

  		userwin(USERWIN_ERROR,error);
! 		set_item_statusbar("CMD_ADD_QOS_MAXBW Error");
  		return;
  	}
***************
*** 693,697 ****
  	strcpy(strInterface, class_interface[index]);

! 	error = syscmd(CMD_ADD_TC_CLASS, strName, strBand, strInterface, EOA);

  	if (error != NULL) {
--- 693,697 ----
  	strcpy(strInterface, class_interface[index]);

! 	error = syscmd(CMD_ADD_QOS_CLASS, strName, strBand, strInterface, EOA);

  	if (error != NULL) {
***************
*** 762,769 ****

  	if (radio == 1) {
! 		error = syscmd(CMD_ADD_TC_FILTER, tName, tType, tDetail, EOA);
  	} else {
  		error =
! 		    syscmd(CMD_ADD_TC_FILTER, tName, tType, tDetail, tPort,
  			   EOA);
  	}
--- 762,769 ----

  	if (radio == 1) {
! 		error = syscmd(CMD_ADD_QOS_FILTER, tName, tType, tDetail, EOA);
  	} else {
  		error =
! 		    syscmd(CMD_ADD_QOS_FILTER, tName, tType, tDetail, tPort,
  			   EOA);
  	}
***************
*** 856,860 ****

  		error =
! 		    syscmd(CMD_ADD_TC_POL, tName, tFilter, tClass, tUMark, EOA);
  	} else if (radio == 0) {

--- 856,860 ----

  		error =
! 		    syscmd(CMD_ADD_QOS_POL, tName, tFilter, tClass, tUMark, EOA);
  	} else if (radio == 0) {

***************
*** 863,867 ****
  			qosTos[comboMark]);
  		error =
! 		    syscmd(CMD_ADD_TC_POL, tName, tFilter, tClass, tUMark,
  			   tMark, EOA);

--- 863,867 ----
  			qosTos[comboMark]);
  		error =
! 		    syscmd(CMD_ADD_QOS_POL, tName, tFilter, tClass, tUMark,
  			   tMark, EOA);

***************
*** 886,890 ****
  {
  	char *error = NULL;
! 	error = syscmd(CMD_DEL_TC_MAXBW, delBand, EOA);
  	if (error != NULL) {
  		userwin(USERWIN_ERROR,error);
--- 886,890 ----
  {
  	char *error = NULL;
! 	error = syscmd(CMD_DEL_QOS_MAXBW, delBand, EOA);
  	if (error != NULL) {
  		userwin(USERWIN_ERROR,error);
***************
*** 903,907 ****
  	if (uQosSize.sizeClass > 0)
  		uQosSize.sizeClass--;
! 	error = syscmd(CMD_DEL_TC_CLASS, delClass, EOA);
  	if (error != NULL) {

--- 903,907 ----
  	if (uQosSize.sizeClass > 0)
  		uQosSize.sizeClass--;
! 	error = syscmd(CMD_DEL_QOS_CLASS, delClass, EOA);
  	if (error != NULL) {

***************
*** 922,926 ****
  	if (uQosSize.sizeFilter > 0)
  		uQosSize.sizeFilter--;
! 	error = syscmd(CMD_DEL_TC_FILTER, delFilter, EOA);
  	if (error != NULL) {

--- 922,926 ----
  	if (uQosSize.sizeFilter > 0)
  		uQosSize.sizeFilter--;
! 	error = syscmd(CMD_DEL_QOS_FILTER, delFilter, EOA);
  	if (error != NULL) {

***************
*** 940,944 ****
  	if (uQosSize.sizePolicy > 0)
  		uQosSize.sizePolicy--;
! 	error = syscmd(CMD_DEL_TC_POL, delPolicy, EOA);
  	if (error != NULL) {

--- 940,944 ----
  	if (uQosSize.sizePolicy > 0)
  		uQosSize.sizePolicy--;
! 	error = syscmd(CMD_DEL_QOS_POL, delPolicy, EOA);
  	if (error != NULL) {