Deleted Added
sdiff udiff text old ( 64580 ) new ( 67614 )
full compact
ip_compat.h (64580) ip_compat.h (67614)
1/*
2 * Copyright (C) 1993-2000 by Darren Reed.
3 *
4 * Redistribution and use in source and binary forms are permitted
5 * provided that this notice is preserved and due credit is given
6 * to the original author and the contributors.
7 *
8 * @(#)ip_compat.h 1.8 1/14/96
9 * $Id: ip_compat.h,v 2.1.2.3 1999/11/18 13:55:26 darrenr Exp $
1/*
2 * Copyright (C) 1993-2000 by Darren Reed.
3 *
4 * Redistribution and use in source and binary forms are permitted
5 * provided that this notice is preserved and due credit is given
6 * to the original author and the contributors.
7 *
8 * @(#)ip_compat.h 1.8 1/14/96
9 * $Id: ip_compat.h,v 2.1.2.3 1999/11/18 13:55:26 darrenr Exp $
10 * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_compat.h 64580 2000-08-13 04:31:06Z darrenr $
10 * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_compat.h 67614 2000-10-26 12:33:42Z darrenr $
11 */
12
13#ifndef __IP_COMPAT_H__
14#define __IP_COMPAT_H__
15
16#ifndef __P
17# ifdef __STDC__
18# define __P(x) x

--- 240 unchanged lines hidden (view full) ---

259#define IPOPT_ADDEXT 147 /* ADDEXT */
260#define IPOPT_VISA 142 /* VISA */
261#define IPOPT_IMITD 144 /* IMITD */
262#define IPOPT_EIP 145 /* EIP */
263#define IPOPT_FINN 205 /* FINN */
264
265
266#if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
11 */
12
13#ifndef __IP_COMPAT_H__
14#define __IP_COMPAT_H__
15
16#ifndef __P
17# ifdef __STDC__
18# define __P(x) x

--- 240 unchanged lines hidden (view full) ---

259#define IPOPT_ADDEXT 147 /* ADDEXT */
260#define IPOPT_VISA 142 /* VISA */
261#define IPOPT_IMITD 144 /* IMITD */
262#define IPOPT_EIP 145 /* EIP */
263#define IPOPT_FINN 205 /* FINN */
264
265
266#if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
267# ifdef IPFILTER_LKM
268# include <osreldate.h>
269# define ACTUALLY_LKM_NOT_KERNEL
270# else
271# include <sys/osreldate.h>
272# endif
267# if __FreeBSD__ < 3
268# include <machine/spl.h>
269# else
270# if __FreeBSD__ == 3
271# if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL)
272# define ACTUALLY_LKM_NOT_KERNEL
273# endif
274# endif

--- 9 unchanged lines hidden (view full) ---

284# define ATOMIC_INC64 ATOMIC_INC
285# define ATOMIC_INC32 ATOMIC_INC
286# define ATOMIC_INC16 ATOMIC_INC
287# define ATOMIC_DECL ATOMIC_DEC
288# define ATOMIC_DEC64 ATOMIC_DEC
289# define ATOMIC_DEC32 ATOMIC_DEC
290# define ATOMIC_DEC16 ATOMIC_DEC
291#endif
273# if __FreeBSD__ < 3
274# include <machine/spl.h>
275# else
276# if __FreeBSD__ == 3
277# if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL)
278# define ACTUALLY_LKM_NOT_KERNEL
279# endif
280# endif

--- 9 unchanged lines hidden (view full) ---

290# define ATOMIC_INC64 ATOMIC_INC
291# define ATOMIC_INC32 ATOMIC_INC
292# define ATOMIC_INC16 ATOMIC_INC
293# define ATOMIC_DECL ATOMIC_DEC
294# define ATOMIC_DEC64 ATOMIC_DEC
295# define ATOMIC_DEC32 ATOMIC_DEC
296# define ATOMIC_DEC16 ATOMIC_DEC
297#endif
298#ifdef __sgi
299# define hz HZ
300# include <sys/ksynch.h>
301# define IPF_LOCK_PL plhi
302# include <sys/sema.h>
303#undef kmutex_t
304typedef struct {
305 lock_t *l;
306 int pl;
307} kmutex_t;
308# undef MUTEX_INIT
309# undef MUTEX_DESTROY
310#endif
292#ifdef KERNEL
293# if SOLARIS
294# if SOLARIS2 >= 6
295# include <sys/atomic.h>
296# if SOLARIS2 == 6
297# define ATOMIC_INCL(x) atomic_add_long((uint32_t*)&(x), 1)
298# define ATOMIC_DECL(x) atomic_add_long((uint32_t*)&(x), -1)
299# else

--- 33 unchanged lines hidden (view full) ---

333# define RWLOCK_INIT(x, y, z) mutex_init((x), (y), MUTEX_DRIVER, (z))
334# define RWLOCK_EXIT(x) mutex_exit(x)
335# define RW_DESTROY(x) mutex_destroy(x)
336# endif
337# define MUTEX_INIT(x, y, z) mutex_init((x), (y), MUTEX_DRIVER, (z))
338# define MUTEX_DESTROY(x) mutex_destroy(x)
339# define MUTEX_EXIT(x) mutex_exit(x)
340# define MTOD(m,t) (t)((m)->b_rptr)
311#ifdef KERNEL
312# if SOLARIS
313# if SOLARIS2 >= 6
314# include <sys/atomic.h>
315# if SOLARIS2 == 6
316# define ATOMIC_INCL(x) atomic_add_long((uint32_t*)&(x), 1)
317# define ATOMIC_DECL(x) atomic_add_long((uint32_t*)&(x), -1)
318# else

--- 33 unchanged lines hidden (view full) ---

352# define RWLOCK_INIT(x, y, z) mutex_init((x), (y), MUTEX_DRIVER, (z))
353# define RWLOCK_EXIT(x) mutex_exit(x)
354# define RW_DESTROY(x) mutex_destroy(x)
355# endif
356# define MUTEX_INIT(x, y, z) mutex_init((x), (y), MUTEX_DRIVER, (z))
357# define MUTEX_DESTROY(x) mutex_destroy(x)
358# define MUTEX_EXIT(x) mutex_exit(x)
359# define MTOD(m,t) (t)((m)->b_rptr)
341# define IRCOPY(a,b,c) copyin((a), (b), (c))
342# define IWCOPY(a,b,c) copyout((a), (b), (c))
360# define IRCOPY(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c))
361# define IWCOPY(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
343# define IRCOPYPTR ircopyptr
344# define IWCOPYPTR iwcopyptr
345# define FREE_MB_T(m) freemsg(m)
346# define SPL_NET(x) ;
347# define SPL_IMP(x) ;
348# undef SPL_X
349# define SPL_X(x) ;
350# ifdef sparc

--- 28 unchanged lines hidden (view full) ---

379 size_t qf_hl; /* header length */
380 int qf_sap;
381} qif_t;
382extern ill_t *get_unit __P((char *, int));
383# define GETUNIT(n, v) get_unit(n, v)
384# define IFNAME(x) ((ill_t *)x)->ill_name
385# else /* SOLARIS */
386# if defined(__sgi)
362# define IRCOPYPTR ircopyptr
363# define IWCOPYPTR iwcopyptr
364# define FREE_MB_T(m) freemsg(m)
365# define SPL_NET(x) ;
366# define SPL_IMP(x) ;
367# undef SPL_X
368# define SPL_X(x) ;
369# ifdef sparc

--- 28 unchanged lines hidden (view full) ---

398 size_t qf_hl; /* header length */
399 int qf_sap;
400} qif_t;
401extern ill_t *get_unit __P((char *, int));
402# define GETUNIT(n, v) get_unit(n, v)
403# define IFNAME(x) ((ill_t *)x)->ill_name
404# else /* SOLARIS */
405# if defined(__sgi)
387# define hz HZ
388# include <sys/ksynch.h>
389# define IPF_LOCK_PL plhi
390# include <sys/sema.h>
391#undef kmutex_t
392typedef struct {
393 lock_t *l;
394 int pl;
395} kmutex_t;
396# define ATOMIC_INC(x) { MUTEX_ENTER(&ipf_rw); \
397 (x)++; MUTEX_EXIT(&ipf_rw); }
398# define ATOMIC_DEC(x) { MUTEX_ENTER(&ipf_rw); \
399 (x)--; MUTEX_EXIT(&ipf_rw); }
400# define MUTEX_ENTER(x) (x)->pl = LOCK((x)->l, IPF_LOCK_PL);
401# define KRWLOCK_T kmutex_t
402# define READ_ENTER(x) MUTEX_ENTER(x)
403# define WRITE_ENTER(x) MUTEX_ENTER(x)
404# define RW_UPGRADE(x) ;
405# define MUTEX_DOWNGRADE(x) ;
406# define RWLOCK_EXIT(x) MUTEX_EXIT(x)
407# define MUTEX_EXIT(x) UNLOCK((x)->l, (x)->pl);
406# define ATOMIC_INC(x) { MUTEX_ENTER(&ipf_rw); \
407 (x)++; MUTEX_EXIT(&ipf_rw); }
408# define ATOMIC_DEC(x) { MUTEX_ENTER(&ipf_rw); \
409 (x)--; MUTEX_EXIT(&ipf_rw); }
410# define MUTEX_ENTER(x) (x)->pl = LOCK((x)->l, IPF_LOCK_PL);
411# define KRWLOCK_T kmutex_t
412# define READ_ENTER(x) MUTEX_ENTER(x)
413# define WRITE_ENTER(x) MUTEX_ENTER(x)
414# define RW_UPGRADE(x) ;
415# define MUTEX_DOWNGRADE(x) ;
416# define RWLOCK_EXIT(x) MUTEX_EXIT(x)
417# define MUTEX_EXIT(x) UNLOCK((x)->l, (x)->pl);
408# define MUTEX_INIT(x,y,z) (x).l = LOCK_ALLOC((uchar_t)-1, IPF_LOCK_PL, (lkinfo_t *)-1, KM_NOSLEEP)
409# define MUTEX_DESTROY(x) LOCK_DEALLOC((x).l)
418# define MUTEX_INIT(x,y,z) (x)->l = LOCK_ALLOC((uchar_t)-1, IPF_LOCK_PL, (lkinfo_t *)-1, KM_NOSLEEP)
419# define MUTEX_DESTROY(x) LOCK_DEALLOC((x)->l)
410# else /* __sgi */
411# define ATOMIC_INC(x) (x)++
412# define ATOMIC_DEC(x) (x)--
413# define MUTEX_ENTER(x) ;
414# define READ_ENTER(x) ;
415# define WRITE_ENTER(x) ;
416# define RW_UPGRADE(x) ;
417# define MUTEX_DOWNGRADE(x) ;

--- 574 unchanged lines hidden --- 		420# else /* __sgi */
421# define ATOMIC_INC(x) (x)++
422# define ATOMIC_DEC(x) (x)--
423# define MUTEX_ENTER(x) ;
424# define READ_ENTER(x) ;
425# define WRITE_ENTER(x) ;
426# define RW_UPGRADE(x) ;
427# define MUTEX_DOWNGRADE(x) ;

--- 574 unchanged lines hidden ---