[Netadm-devel] gwc/pf pf.c,1.10,1.11 sysklog.c,1.1,1.2

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

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

Modified Files:
	pf.c sysklog.c 
Log Message:

   ADD1: sysklog.ko, gwcklogd.
   MOD1: make deactivate gwcguid.
   MOD2: scripts/gwc, scripts/install.sh  according to ADD1 and MOD1.
   FIX1: fix select maxfd from klogcmdtab[MAXSYSIDX] to klogcmdtab [MAXSYSIDX -1].
   DEL1: remove debug code.
   ADD2: CHANGES according to ADD1, MOD1
   MOD3: change syslog.conf to be able to handling gwcklogd log to local1 (gwc.log).
   
   OTHERS: comment and my email address.
   


Index: pf.c
===================================================================
RCS file: /cvsroot/netadm/gwc/pf/pf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pf.c	6 May 2006 15:21:07 -0000	1.10
--- pf.c	6 May 2006 17:33:33 -0000	1.11
***************
*** 166,170 ****
--- 166,173 ----
    struct blk      *blkh, **blkhp;
    int             i;
+   static int j =0;
  
+   /* TODO : remove me */
+   gwc_printk (GWC_KSYS_IDX, "This is KSYS test, gwc_ksys.log .. remove this debug code\n");
    for( i = 0; i <= blk_hash_mask; i++){
    
***************
*** 177,180 ****
--- 180,185 ----
      spin_unlock(&blk_hash_table[i].lock);
    }
+   /* TODO : remove me */
+   gwc_printk (GWC_PF_IDX, "This is PF test, gwc_pf.log .. remove this debug code\n");
  
    return 1;

Index: sysklog.c
===================================================================
RCS file: /cvsroot/netadm/gwc/pf/sysklog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sysklog.c	6 May 2006 15:17:47 -0000	1.1
--- sysklog.c	6 May 2006 17:33:33 -0000	1.2
***************
*** 134,138 ****
  	switch (type) {
  	case 0:		/* Close log */
- 	    dprintk("\n");
  		if (kctl_rcnt [idx] <= 0 ) {
  		    printk ("%s: Device(type: %d) already released for reading\n", 
--- 134,137 ----
***************
*** 146,150 ****
  
  	case 1:		/* Open log */
- 	    dprintk("\n");
  		if (kctl_rcnt [idx]) {
  		    printk ("%s: Device(type: %d) already open for reading\n", 
--- 145,148 ----
***************
*** 188,196 ****
  		break;
  	case 4:		/* Read/clear last kernel messages */
- 		dprintk("\n"); /* TODO: delete me --LP */
  		do_clear = 1; 
  		/* FALL THRU */
  	case 3:		/* Read last kernel messages */
- 		dprintk("\n");/* TODO: delete me --LP */
  		error = -EINVAL;
  		if (!buf || len < 0)
--- 186,192 ----
***************
*** 517,529 ****
  static int gwc_sys_open(struct inode * inode, struct file * file)
  { 
!     dprintk ("\n");
! 	return do_gwc_sysklog(GWC_KSYS_IDX, 1, NULL, 0);
  }
  
  static int gwc_sys_release(struct inode * inode, struct file * file)
  {
!     dprintk ("\n");
! 	(void) do_gwc_sysklog(GWC_KSYS_IDX, 0, NULL, 0);
! 	return 0;
  }
  
--- 513,523 ----
  static int gwc_sys_open(struct inode * inode, struct file * file)
  { 
!     return do_gwc_sysklog(GWC_KSYS_IDX, 1, NULL, 0);
  }
  
  static int gwc_sys_release(struct inode * inode, struct file * file)
  {
!     (void) do_gwc_sysklog(GWC_KSYS_IDX, 0, NULL, 0);
!     return 0;
  }
  
***************
*** 531,537 ****
  			 size_t count, loff_t *ppos)
  {
! 	if ((file->f_flags & O_NONBLOCK) && !do_gwc_sysklog(GWC_KSYS_IDX, 9,  NULL, 0))
! 		return -EAGAIN;
! 	return do_gwc_sysklog(GWC_KSYS_IDX, 2, buf, count);
  }
  
--- 525,532 ----
  			 size_t count, loff_t *ppos)
  {
!     if ((file->f_flags & O_NONBLOCK) && !do_gwc_sysklog(GWC_KSYS_IDX, 9,  NULL, 0))
! 	return -EAGAIN;
! 	
!     return do_gwc_sysklog(GWC_KSYS_IDX, 2, buf, count);
  }
  
***************
*** 540,546 ****
      static int i = 0;
      
-     printk ("------->wait ... (%d)\n", i++);
      poll_wait(file, &log_wait[GWC_KSYS_IDX], wait);
-     printk ("-------------------->cool !(%d)\n", i++);
  
      if (do_gwc_sysklog(GWC_KSYS_IDX, 9, NULL, 0))
--- 535,539 ----