From owner-freebsd-isdn  Sat Jan 13 16:26:11 2001
Delivered-To: freebsd-isdn@freebsd.org
Received: from liliput.tmp.com.br (liliput.tmp.com.br [200.244.62.12])
	by hub.freebsd.org (Postfix) with ESMTP id 670E237B402
	for <freebsd-isdn@freebsd.org>; Sat, 13 Jan 2001 16:25:51 -0800 (PST)
Received: (from prallon@localhost)
	by liliput.tmp.com.br (8.8.8/8.8.8) id WAA06539;
	Sat, 13 Jan 2001 22:25:46 -0200
Date: Sat, 13 Jan 2001 22:25:46 -0200
From: Sergio de Souza Prallon <prallon@tmp.com.br>
To: Thomas Moestl <tmoestl@gmx.net>
Cc: freebsd-isdn@freebsd.org, hm@hcs.de
Subject: Re: [PATCH] isppp with uncompressed VJ packets broken in -CURRENT
Message-ID: <20010113222545.A6167@tmp.com.br>
References: <20010113205331.A2143@crow.dom2ip.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 1.0i
In-Reply-To: <20010113205331.A2143@crow.dom2ip.de>; from tmoestl@gmx.net on Sat, Jan 13, 2001 at 08:53:31PM +0100
X-URL: http://www.tmp.com.br
Sender: owner-freebsd-isdn@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

On Sat, Jan 13, 2001 at 08:53:31PM +0100, Thomas Moestl wrote:
> 
> Could someone please review/comment/commit this?
> 
> 	- thomas

This proves undoubtfully that the `cut&paste' facilities of an editor
can, sometimes, turns against oneself. Checking your patch I saw that
I also kept the vjlen variable from the upper block (where it make
sense). This is (hopefully) the propper patch for the bug. I've tested
the equivalent one against 0.96. I've also updated my web site
(http://sites.uol.com.br/prallon/itjc/) with it for those with 0.96.

--
Prallon


*** i4b_ispppsubr.c.orig        Sat Jan 13 22:16:29 2001
--- i4b_ispppsubr.c     Sat Jan 13 22:17:13 2001
***************
*** 577,587 ****
                case PPP_VJ_UCOMP:
                        if (sp->state[IDX_IPCP] == STATE_OPENED) {
                                u_char *iphdr;
!                               int hlen, vjlen;
!                               if ((vjlen = sl_uncompress_tcp_core(m->m_data,
!                                  m->m_len, m->m_len, TYPE_COMPRESSED_TCP,
!                                  &sp->pp_comp, &iphdr, &hlen)) <= 0)
                                        goto drop;
                                schednetisr (NETISR_IP);
--- 577,587 ----
                case PPP_VJ_UCOMP:
                        if (sp->state[IDX_IPCP] == STATE_OPENED) {
                                u_char *iphdr;
!                               int hlen;
!                               if (sl_uncompress_tcp_core(m->m_data,
!                                  m->m_len, m->m_len, TYPE_UNCOMPRESSED_TCP,
!                                  &sp->pp_comp, &iphdr, &hlen) != 0)
                                        goto drop;
                                schednetisr (NETISR_IP);


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-isdn" in the body of the message