From owner-freebsd-bugs  Mon Feb 10  9:40:10 2003
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6454537B401
	for <freebsd-bugs@hub.freebsd.org>; Mon, 10 Feb 2003 09:40:07 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E31AD43FA3
	for <freebsd-bugs@hub.freebsd.org>; Mon, 10 Feb 2003 09:40:06 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1AHe6NS060815
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 10 Feb 2003 09:40:06 -0800 (PST)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1AHe6I6060814;
	Mon, 10 Feb 2003 09:40:06 -0800 (PST)
Date: Mon, 10 Feb 2003 09:40:06 -0800 (PST)
Message-Id: <200302101740.h1AHe6I6060814@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: Gleb Smirnoff <glebius@cell.sick.ru>
Subject: Re: kern/47920: if ng_pppoe switches to nonstandard mode it stays in it forever
Reply-To: Gleb Smirnoff <glebius@cell.sick.ru>
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org

The following reply was made to PR kern/47920; it has been noted by GNATS.

From: Gleb Smirnoff <glebius@cell.sick.ru>
To: freebsd-bugs@FreeBSD.ORG, FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: kern/47920: if ng_pppoe switches to nonstandard mode it stays in it forever
Date: Mon, 10 Feb 2003 20:29:59 +0300

 Sorry. This one is better.
 
 -- 
 Totus tuus, Glebius.
 GLEBIUS-RIPN GLEB-RIPE
 
 --- ng_pppoe.c.orig	Mon Feb 10 15:16:04 2003
 +++ ng_pppoe.c	Mon Feb 10 20:27:34 2003
 @@ -166,6 +166,9 @@
  	 ETHERTYPE_PPPOE_DISC};
  
  static int nonstandard;
 +#define PPPOE_STANDARD		0	/* try standard */
 +#define PPPOE_NONSTANDARD	1	/* be nonstandard */
 +#define PPPOE_KEEPSTANDARD	-1	/* never switch to nonstandard mode */
  static int
  ngpppoe_set_ethertype(SYSCTL_HANDLER_ARGS)
  {
 @@ -176,12 +179,19 @@
  	error = sysctl_handle_int(oidp, &val, sizeof(int), req);
  	if (error != 0 || req->newptr == NULL)
  		return (error);
 -	if (val == 1) {
 -		nonstandard = 1;
 +	switch (val) {
 +	case PPPOE_NONSTANDARD:
 +		nonstandard = PPPOE_NONSTANDARD;
  		eh_prototype.ether_type = ETHERTYPE_PPPOE_STUPID_DISC;
 -	} else {
 -		nonstandard = 0;
 +		break;
 +	case PPPOE_STANDARD:
 +		nonstandard = PPPOE_STANDARD;
  		eh_prototype.ether_type = ETHERTYPE_PPPOE_DISC;
 +		break;
 +	case PPPOE_KEEPSTANDARD:
 +		nonstandard = PPPOE_KEEPSTANDARD;
 +		eh_prototype.ether_type = ETHERTYPE_PPPOE_DISC;
 +		break;
  	}
  	return (0);
  }
 @@ -913,8 +923,12 @@
  		code = wh->ph.code; 
  		switch(wh->eh.ether_type) {
  		case	ETHERTYPE_PPPOE_STUPID_DISC:
 -			nonstandard = 1;
 -			eh_prototype.ether_type = ETHERTYPE_PPPOE_STUPID_DISC;
 +			if (nonstandard > PPPOE_KEEPSTANDARD) {
 +			  nonstandard = PPPOE_NONSTANDARD;
 +			  eh_prototype.ether_type = ETHERTYPE_PPPOE_STUPID_DISC;
 +			  printf("Switched to nonstandard PPPoE");
 +			} else
 +			  printf("Ignored nonstandard PPPoE");
  			/* fall through */
  		case	ETHERTYPE_PPPOE_DISC:
  			/*
 @@ -1098,7 +1112,7 @@
  				 * from NEWCONNECTED to CONNECTED
  				 */
  				sp->pkt_hdr = neg->pkt->pkt_header;
 -				if (nonstandard)
 +				if (nonstandard == PPPOE_NONSTANDARD)
  					sp->pkt_hdr.eh.ether_type
  						= ETHERTYPE_PPPOE_STUPID_SESS;
  				else
 @@ -1150,7 +1164,7 @@
  				 * Keep a copy of the header we will be using.
  				 */
  				sp->pkt_hdr = neg->pkt->pkt_header;
 -				if (nonstandard)
 +				if (nonstandard == PPPOE_NONSTANDARD)
  					sp->pkt_hdr.eh.ether_type
  						= ETHERTYPE_PPPOE_STUPID_SESS;
  				else
 @@ -1434,7 +1448,7 @@
  			/* revert the stored header to DISC/PADT mode */
  		 	wh = &sp->pkt_hdr;
  			wh->ph.code = PADT_CODE;
 -			if (nonstandard)
 +			if (nonstandard == PPPOE_NONSTANDARD)
  				wh->eh.ether_type = ETHERTYPE_PPPOE_STUPID_DISC;
  			else
  				wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;

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