[src/trunk]: src/sys Add ALTQ glue. XXX Temporary until ALTQ is changed to u...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/20c4bebe3a19
branches:  trunk
changeset: 500602:20c4bebe3a19
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Dec 14 17:36:44 2000 +0000

description:
Add ALTQ glue.  XXX Temporary until ALTQ is changed to use a pfil hook.

diffstat:

 sys/netinet/ip_input.c   |  10 +++++++++-
 sys/netinet6/ip6_input.c |  10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 2c5613ada62b -r 20c4bebe3a19 sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Thu Dec 14 16:04:51 2000 +0000
+++ b/sys/netinet/ip_input.c    Thu Dec 14 17:36:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_input.c,v 1.122 2000/11/24 03:43:20 itojun Exp $    */
+/*     $NetBSD: ip_input.c,v 1.123 2000/12/14 17:36:44 thorpej Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -479,6 +479,14 @@
        ip = mtod(m, struct ip *);
 #endif /* PFIL_HOOKS */
 
+#ifdef ALTQ
+       /* XXX Temporary until ALTQ is changed to use a pfil hook */
+       if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0) {
+               /* packet dropped by traffic conditioner */
+               return;
+       }
+#endif
+
        /*
         * Convert fields to host representation.
         */
diff -r 2c5613ada62b -r 20c4bebe3a19 sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Thu Dec 14 16:04:51 2000 +0000
+++ b/sys/netinet6/ip6_input.c  Thu Dec 14 17:36:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.29 2000/11/11 00:52:39 thorpej Exp $   */
+/*     $NetBSD: ip6_input.c,v 1.30 2000/12/14 17:36:45 thorpej Exp $   */
 /*     $KAME: ip6_input.c,v 1.121 2000/08/31 06:07:29 itojun Exp $     */
 
 /*
@@ -340,6 +340,14 @@
        }
 #endif
 
+#ifdef ALTQ
+       /* XXX Temporary until ALTQ is changed to use a pfil hook */
+       if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) {
+               /* packet is dropped by traffic conditioner */
+               return;
+       }
+#endif
+
        /*
         * Scope check
         */