[src/netbsd-1-4]: src/sys/netinet Pull up revision 1.18:

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

details:   https://anonhg.NetBSD.org/src/rev/3601fe3f604e
branches:  netbsd-1-4
changeset: 469281:3601fe3f604e
user:      he <he%NetBSD.org@localhost>
date:      Tue Aug 24 19:31:20 1999 +0000

description:
Pull up revision 1.18:
  Check the protocol before forwarding to proxy module.  Fixes
  PR#7831.  (bouyer/darrenr)

diffstat:

 sys/netinet/ip_proxy.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r ff1308c445f5 -r 3601fe3f604e sys/netinet/ip_proxy.c
--- a/sys/netinet/ip_proxy.c    Tue Aug 24 19:19:30 1999 +0000
+++ b/sys/netinet/ip_proxy.c    Tue Aug 24 19:31:20 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_proxy.c,v 1.17 1999/02/02 19:57:32 cjs Exp $        */
+/*     $NetBSD: ip_proxy.c,v 1.17.2.1 1999/08/24 19:31:20 he Exp $     */
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_proxy.c,v 1.17 1999/02/02 19:57:32 cjs Exp $";
+static const char rcsid[] = "$NetBSD: ip_proxy.c,v 1.17.2.1 1999/08/24 19:31:20 he Exp $";
 #else
 static const char rcsid[] = "@(#)Id: ip_proxy.c,v 2.0.2.11.2.15 1998/11/22 01:50:29 darrenr Exp ";
 #endif
@@ -197,8 +197,9 @@
        u_32_t sum;
        int err;
 
-       if ((aps = nat->nat_aps) ||
-           (aps = ap_new_session(nat->nat_ptr->in_apr, ip, fin, nat))) {
+       if ((aps = nat->nat_aps) == NULL)
+               aps = ap_new_session(nat->nat_ptr->in_apr, ip, fin, nat);
+       if ((aps != NULL) && (aps->aps_p == ip->ip_p)) {
                if (ip->ip_p == IPPROTO_TCP) {
                        tcp = (tcphdr_t *)fin->fin_dp;
                        /*