Deleted Added
full compact
ip_auth.c (65837) ip_auth.c (69152)
1/*
2 * Copyright (C) 1998-2000 by Darren Reed & Guido van Rooij.
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#if !defined(lint)
9/*static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.1.2.2 2000/01/16 10:12:14 darrenr Exp $";*/
1/*
2 * Copyright (C) 1998-2000 by Darren Reed & Guido van Rooij.
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#if !defined(lint)
9/*static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.1.2.2 2000/01/16 10:12:14 darrenr Exp $";*/
10static const char rcsid[] = "@(#)$FreeBSD: head/sys/contrib/ipfilter/netinet/ip_auth.c 65837 2000-09-14 14:42:04Z ru $";
10static const char rcsid[] = "@(#)$FreeBSD: head/sys/contrib/ipfilter/netinet/ip_auth.c 69152 2000-11-25 07:35:38Z jlemon $";
11#endif
12
13#include <sys/errno.h>
14#include <sys/types.h>
15#include <sys/param.h>
16#include <sys/time.h>
17#include <sys/file.h>
18#if !defined(_KERNEL) && !defined(KERNEL)

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

281#if defined(__NetBSD__) || defined(__OpenBSD__) || (FreeBSD_version >= 300003)
282u_long cmd;
283#else
284int cmd;
285#endif
286frentry_t *fr, **frptr;
287{
288 mb_t *m;
11#endif
12
13#include <sys/errno.h>
14#include <sys/types.h>
15#include <sys/param.h>
16#include <sys/time.h>
17#include <sys/file.h>
18#if !defined(_KERNEL) && !defined(KERNEL)

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

281#if defined(__NetBSD__) || defined(__OpenBSD__) || (FreeBSD_version >= 300003)
282u_long cmd;
283#else
284int cmd;
285#endif
286frentry_t *fr, **frptr;
287{
288 mb_t *m;
289#if defined(_KERNEL) && !SOLARIS
290 struct ifqueue *ifq;
291#endif
292 frauth_t auth, *au = &auth;
293 frauthent_t *fae, **faep;
294 int i, error = 0;
295
296 switch (cmd)
297 {
298 case SIOCSTLCK :
299 error = fr_lock(data, &fr_auth_lock);

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

418 if (error)
419 fr_authstats.fas_sendfail++;
420 else
421 fr_authstats.fas_sendok++;
422 } else if (m) {
423# if SOLARIS
424 error = fr_qin(fr_auth[i].fra_q, m);
425# else /* SOLARIS */
289 frauth_t auth, *au = &auth;
290 frauthent_t *fae, **faep;
291 int i, error = 0;
292
293 switch (cmd)
294 {
295 case SIOCSTLCK :
296 error = fr_lock(data, &fr_auth_lock);

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

415 if (error)
416 fr_authstats.fas_sendfail++;
417 else
418 fr_authstats.fas_sendok++;
419 } else if (m) {
420# if SOLARIS
421 error = fr_qin(fr_auth[i].fra_q, m);
422# else /* SOLARIS */
426 ifq = &ipintrq;
427 if (IF_QFULL(ifq)) {
428 IF_DROP(ifq);
429 m_freem(m);
423 if (! IF_HANDOFF(&ipintrq, m, NULL))
430 error = ENOBUFS;
424 error = ENOBUFS;
431 } else {
432 IF_ENQUEUE(ifq, m);
425 else
433 schednetisr(NETISR_IP);
426 schednetisr(NETISR_IP);
434 }
435# endif /* SOLARIS */
436 if (error)
437 fr_authstats.fas_quefail++;
438 else
439 fr_authstats.fas_queok++;
440 } else
441 error = EINVAL;
442# endif

--- 109 unchanged lines hidden ---
427# endif /* SOLARIS */
428 if (error)
429 fr_authstats.fas_quefail++;
430 else
431 fr_authstats.fas_queok++;
432 } else
433 error = EINVAL;
434# endif

--- 109 unchanged lines hidden ---