[Netadm-devel] gwc/include sysdef.h,1.7,1.8 sysioctl.h,1.4,1.5

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

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

Modified Files:
	sysdef.h sysioctl.h 
Log Message:
MOD:
    
    modify user layer data structure for interfacing with pf.



Index: sysdef.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysdef.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sysdef.h	5 Mar 2006 01:11:00 -0000	1.7
--- sysdef.h	10 Mar 2006 16:52:04 -0000	1.8
***************
*** 11,14 ****
--- 11,15 ----
  #ifndef	__SYS_DEF_H
  #define	__SYS_DEF_H
+ #include <linux/icmp.h>
  
  #define	DL		32
***************
*** 46,62 ****
  
  typedef enum {
!         SYS_ICMP_UNREACH        = 0x0001,
!         SYS_ICMP_ECHO           = 0x0002,
!         SYS_ICMP_ECHOREP        = 0x0004,
!         SYS_ICMP_SQUENCH        = 0x0008,
!         SYS_ICMP_REDIR          = 0x0010,
!         SYS_ICMP_TIMEX          = 0x0020,
!         SYS_ICMP_PARAMPROB      = 0x0040,
!         SYS_ICMP_TIMEST         = 0x0080,
!         SYS_ICMP_TIMESTREP      = 0x0100,
!         SYS_ICMP_INFOREQ        = 0x0200,
!         SYS_ICMP_INFOREP        = 0x0400,
!         SYS_ICMP_MASKREQ        = 0x0800,
!         SYS_ICMP_MASKREP        = 0x1000,
  } sys_icmp_type_e;
  
--- 47,63 ----
  
  typedef enum {
!         SYS_ICMP_UNREACH        = ICMP_DEST_UNREACH,
!         SYS_ICMP_ECHO           = ICMP_ECHO,
!         SYS_ICMP_ECHOREP        = ICMP_ECHOREPLY,
!         SYS_ICMP_SQUENCH        = ICMP_SOURCE_QUENCH,/*Source Quench */
!         SYS_ICMP_REDIR          = ICMP_REDIRECT,    /*Redirect(change route)*/
!         SYS_ICMP_TIMEX          = ICMP_TIME_EXCEEDED,
!         SYS_ICMP_PARAMPROB      = ICMP_PARAMETERPROB,
!         SYS_ICMP_TIMEST         = ICMP_TIMESTAMP,
!         SYS_ICMP_TIMESTREP      = ICMP_TIMESTAMPREPLY,
!         SYS_ICMP_INFOREQ        = ICMP_INFO_REQUEST, /* Information Request*/
!         SYS_ICMP_INFOREP        = ICMP_INFO_REPLY,   /* Information Reply*/
!         SYS_ICMP_MASKREQ        = ICMP_ADDRESS,	     /* Address Mask Request*/
!         SYS_ICMP_MASKREP        = ICMP_ADDRESSREPLY, /* Address Mask Reply */
  } sys_icmp_type_e;
  
***************
*** 250,254 ****
--- 251,257 ----
   * be accessed globaly.
   */
+ #ifndef __SYS_IOCTL_H_
  #include "sysioctl.h"
+ #endif 
  typedef struct {
  	char		  polname[OL];    /* same as policy name of fc */

Index: sysioctl.h
===================================================================
RCS file: /cvsroot/netadm/gwc/include/sysioctl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sysioctl.h	5 Mar 2006 01:11:00 -0000	1.4
--- sysioctl.h	10 Mar 2006 16:52:05 -0000	1.5
***************
*** 35,41 ****
  } __attribute__ ((packed)) kuio_msg_t;
  
! #define IOCTLPF_REGISTER_SRCBLOCK	_IO (IOCTLPF_MAGIC, 0)
  #define IOCTLPF_REGISTER_MODSEQ		_IO (IOCTLPF_MAGIC, 1)
! #define IOCTLPF_UNREGISTER_HOST		_IO (IOCTLPF_MAGIC, 2)
  #define IOCTLPF_REFLESH			_IO (IOCTLPF_MAGIC, 3)
  #define IOCTLPF_MAXNR			 4
--- 35,41 ----
  } __attribute__ ((packed)) kuio_msg_t;
  
! #define IOCTLPF_REGISTER_NET		_IO (IOCTLPF_MAGIC, 0)
  #define IOCTLPF_REGISTER_MODSEQ		_IO (IOCTLPF_MAGIC, 1)
! #define IOCTLPF_UNREGISTER_NET		_IO (IOCTLPF_MAGIC, 2)
  #define IOCTLPF_REFLESH			_IO (IOCTLPF_MAGIC, 3)
  #define IOCTLPF_MAXNR			 4