[Netadm-devel] gwc/gwcadmd main.c,1.8,1.9

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

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

Modified Files:
	main.c 
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: main.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwcadmd/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.c	6 Mar 2006 14:16:05 -0000	1.8
--- main.c	7 Mar 2006 04:45:08 -0000	1.9
***************
*** 909,927 ****
  }
  
- int send_rmsg (int fd, int ret, char *emsg ) {
-   sys_ipc_ret_t ipc_ret, *ipcret = &ipc_ret;
-   int iret;
- 
-   ipcret->ret = ret;
-   if (emsg != NULL && strlen (emsg))
-     strcpy (ipcret->errmsg, emsg);
-   
-   if ((iret = write (fd, (void *)ipcret, sizeof (sys_ipc_ret_t))) < 0 ) {
-     out("write error:%s\n", strerror(errno));
-     return iret;
-   }
-   return RET_OK;
- }
- 
  void destory_runpol ( void *p ) 
  {
--- 909,912 ----
***************
*** 1136,1142 ****
  	switch ( ipcmsg->type ) {
  
! 	  case IPCMTYPE_FC_ADD_IPOL:
  
! 	    if (!sys_ucmd_msg ( _CMD_ADD_FC_IPOL, ipcmsg->data,	ipcmsg->len, fr)) {
  	      sprintf (minbuf, "Failed to add ipol \"%s\" (%d); %s",
  		       (char *)ipcmsg->data, fr->ret, fr->errmsg != NULL? fr->errmsg:"");
--- 1121,1127 ----
  	switch ( ipcmsg->type ) {
  
! 	  case _CMD_ADD_FC_IPOL:
  
! 	    if (!sys_ucmd_msg ( ipcmsg->type, ipcmsg->data, ipcmsg->len, fr)) {
  	      sprintf (minbuf, "Failed to add ipol \"%s\" (%d); %s",
  		       (char *)ipcmsg->data, fr->ret, fr->errmsg != NULL? fr->errmsg:"");
***************
*** 1155,1161 ****
  	    break;
  	
! 	  case IPCMTYPE_FC_DEL_IPOL:
  	
! 	    if (!sys_ucmd_msg ( _CMD_DEL_FC_IPOL, ipcmsg->data,ipcmsg->len, fr)) {
  	      sprintf (minbuf,  "Failed to del ipol \"%s\" (%d); %s",
  		       (char *)ipcmsg->data, fr->ret, fr->errmsg != NULL? fr->errmsg:"");
--- 1140,1146 ----
  	    break;
  	
! 	  case _CMD_DEL_FC_IPOL:
  	
! 	    if (!sys_ucmd_msg ( ipcmsg->type, ipcmsg->data, ipcmsg->len, fr)) {
  	      sprintf (minbuf,  "Failed to del ipol \"%s\" (%d); %s",
  		       (char *)ipcmsg->data, fr->ret, fr->errmsg != NULL? fr->errmsg:"");
***************
*** 1175,1183 ****
  	    break;
  	
! 	  case IPCMTYPE_FC_APPLY_IPOL:
  	
! 	    if (!sys_ucmd_msg ( _CMD_DEL_FC_IPOL, ipcmsg->data, ipcmsg->len, fr)) {
  	      sprintf (minbuf, "Failed to apply ipol (%d); %s",
! 		       fr->ret, fr->errmsg != NULL? fr->errmsg:"");
  		
  	      out ("%s\n", minbuf);
--- 1160,1168 ----
  	    break;
  	
! 	  case _CMD_APPLY_FC_IPOL:
  	
! 	    if (!sys_ucmd_msg ( ipcmsg->type, ipcmsg->data, ipcmsg->len, fr)) {
  	      sprintf (minbuf, "Failed to apply ipol (%d); %s",
! 		       fr->ret, fr->errmsg != NULL? fr->errmsg : "");
  		
  	      out ("%s\n", minbuf);
***************
*** 1194,1197 ****
--- 1179,1202 ----
  	    }
  	    break;
+ 	  
+ 	  case _CMD_DUMP_FC_IPOL:
+ 	
+ 	    if (!sys_ucmd_msg ( ipcmsg->type, ipcmsg->data, ipcmsg->len, fr)) {
+ 	      sprintf (minbuf, "Failed to dump ipol (%d); %s",
+ 		       fr->ret, fr->errmsg != NULL? fr->errmsg : "");
+ 		
+ 	      out ("%s\n", minbuf);
+ 	      if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK)
+ 		out ("Failed to send_rmesg\n");
+ 	
+ 	    } else {
+ 	      sprintf (minbuf, "Success to dump ipol (%s)", SZIPOLDUMP);
+ 	      out ("%s\n", minbuf);
+ 	      
+ 	      if (send_rmsg (cli, fr->ret, minbuf)!= RET_OK)
+ 		out ("Failed to send_rmesg\n");
+ 	
+ 	    }
+ 	    break;
  	
  	  default: