[src/netbsd-2-0]: src/sys/netinet Pullup rev 1.1.1.2 (requested by christos i...

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

details:   https://anonhg.NetBSD.org/src/rev/d6e7440ca891
branches:  netbsd-2-0
changeset: 562358:d6e7440ca891
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Aug 13 03:55:28 2004 +0000

description:
Pullup rev 1.1.1.2 (requested by christos in ticket #759)

Bring up to ipf 4.1.3

diffstat:

 sys/netinet/ip_irc_pxy.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r d24905a97619 -r d6e7440ca891 sys/netinet/ip_irc_pxy.c
--- a/sys/netinet/ip_irc_pxy.c  Fri Aug 13 03:55:25 2004 +0000
+++ b/sys/netinet/ip_irc_pxy.c  Fri Aug 13 03:55:28 2004 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: ip_irc_pxy.c,v 1.1.1.1 2004/03/28 08:56:44 martti Exp $        */
+/*     $NetBSD: ip_irc_pxy.c,v 1.1.1.1.2.1 2004/08/13 03:55:28 jmc Exp $       */
 
 /*
  * Copyright (C) 2000-2003 Darren Reed
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * Id: ip_irc_pxy.c,v 2.39 2004/01/31 14:48:44 darrenr Exp
+ * Id: ip_irc_pxy.c,v 2.39.2.2 2004/05/24 14:01:48 darrenr Exp
  */
 
 #define        IPF_IRC_PROXY
@@ -270,9 +270,13 @@
        ip = fin->fin_ip;
        tcp = (tcphdr_t *)fin->fin_dp;
        bzero(ctcpbuf, sizeof(ctcpbuf));
-       off = (char *)tcp - MTOD(m, char *) + (TCP_OFF(tcp) << 2);
+       off = (char *)tcp - (char *)ip + (TCP_OFF(tcp) << 2) + fin->fin_ipoff;
 
+#ifdef __sgi
+       dlen = fin->fin_plen - off;
+#else
        dlen = MSGDSIZE(m) - off;
+#endif
        if (dlen <= 0)
                return 0;
        COPYDATA(m, off, MIN(sizeof(ctcpbuf), dlen), ctcpbuf);