Update of /cvsroot/netadm/gwc/gwclib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15510/gwclib
Modified Files:
confproc.c confutil.c sysipc.c
Log Message:
FIX:
FIX: index mapping : ugly index stemed from _CMD_SND_FC_RET=0
sys_ucmd_e must be matched with ucmdtab []
FIX: ugly condition: process except gwcadmd must communicate with gwcadmd using IPC.
REMAIN: user layer ( apply_fc ), kernel layer (pf)
Index: confutil.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/confutil.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** confutil.c 7 Mar 2006 04:45:09 -0000 1.7
--- confutil.c 7 Mar 2006 17:04:51 -0000 1.8
***************
*** 465,469 ****
void * _dump_fc_ipol ( void *arg, int len, frp_t fr) {
! fc_umsg_t *p;
struct listnode *n;
int i = 0;
--- 465,469 ----
void * _dump_fc_ipol ( void *arg, int len, frp_t fr) {
! static fc_umsg_t *p;
struct listnode *n;
int i = 0;
***************
*** 484,488 ****
saddr.s_addr = p->msg.saddr;
daddr.s_addr = p->msg.daddr;
!
fprintf(fp, "%d'th %s: indev:%s, proto:%s, rule:%s, %s:%d/%d--->%s:%d/%d, quota:%d\n",
++i,
--- 484,488 ----
saddr.s_addr = p->msg.saddr;
daddr.s_addr = p->msg.daddr;
!
fprintf(fp, "%d'th %s: indev:%s, proto:%s, rule:%s, %s:%d/%d--->%s:%d/%d, quota:%d\n",
++i,
***************
*** 504,508 ****
/* nomeaning */
! return &saddr;
}
--- 504,508 ----
/* nomeaning */
! return runpol_list;
}
Index: sysipc.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/sysipc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sysipc.c 7 Mar 2006 04:45:09 -0000 1.2
--- sysipc.c 7 Mar 2006 17:04:51 -0000 1.3
***************
*** 188,191 ****
--- 188,198 ----
break;
+
+ case _CMD_DUMP_FC_IPOL:
+
+ ipcmsg->len = 0;
+
+ break;
+
default:
Index: confproc.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwclib/confproc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** confproc.c 7 Mar 2006 04:45:09 -0000 1.15
--- confproc.c 7 Mar 2006 17:04:51 -0000 1.16
***************
*** 3044,3053 ****
}
else {
! if ( getpid() != getpidbyname("/proc", SZADMD) &&
! send_ipcmsg(_CMD_ADD_FC_IPOL, argv[0],
! strlen(argv[0]), fr) != RET_OK )
! {
frerr(fr, fr->ret, "%s\n", fr->errmsg);
return;
}else {
--- 3044,3054 ----
}
else {
! if ( getpid() != getpidbyname("/proc", SZADMD)) {
! if (send_ipcmsg(_CMD_ADD_FC_IPOL, argv[0],
! strlen(argv[0]), fr) != RET_OK )
! {
frerr(fr, fr->ret, "%s\n", fr->errmsg);
return;
+ }
}else {
***************
*** 3152,3160 ****
{
if (argc == 0) {
! if ( getpid() != getpidbyname("/proc", SZADMD) &&
! send_ipcmsg(_CMD_DUMP_FC_IPOL, NULL, 0, fr) != RET_OK ){
! frerr(fr, fr->ret, "Failed to dump internal policies (%d): %s\n",
! fr->ret, fr->errmsg != NULL ? fr->errmsg : "");
! return;
}
else {
--- 3153,3162 ----
{
if (argc == 0) {
! if ( getpid() != getpidbyname("/proc", SZADMD)) {
! if (send_ipcmsg(_CMD_DUMP_FC_IPOL, NULL, 0, fr) != RET_OK ){
! frerr(fr, fr->ret, "Failed to dump internal policies (%d): %s\n",
! fr->ret, fr->errmsg != NULL ? fr->errmsg : "");
! return;
! }
}
else {
|
