From owner-freebsd-current@FreeBSD.ORG Sun Aug 1 14:22:11 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 858ED16A4CE; Sun, 1 Aug 2004 14:22:11 +0000 (GMT) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36C9443D58; Sun, 1 Aug 2004 14:22:11 +0000 (GMT) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id 2C6941FFDD4; Sun, 1 Aug 2004 16:22:10 +0200 (CEST) Received: by transport.cksoft.de (Postfix, from userid 66) id 2B2D81FF91D; Sun, 1 Aug 2004 16:22:08 +0200 (CEST) Received: by mail.int.zabbadoz.net (Postfix, from userid 1060) id 1FD7A15384; Sun, 1 Aug 2004 14:21:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.int.zabbadoz.net (Postfix) with ESMTP id 14DBA15329; Sun, 1 Aug 2004 14:21:59 +0000 (UTC) Date: Sun, 1 Aug 2004 14:21:58 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@e0-0.zab2.int.zabbadoz.net To: Maxim Maximov In-Reply-To: Message-ID: References: <20040730091525.U484@pukruppa.net> <20040731213854.GB38076@cell.sick.ru> <410CB1E4.2030103@mcsi.pp.ru> <20040801093316.GA40608@cell.sick.ru> <410CBBA9.1080302@mcsi.pp.ru> <20040801095558.GA40732@cell.sick.ru> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de cc: Gleb Smirnoff cc: freebsd-current@freebsd.org Subject: Re: PPP(was: oE) problems with latest -CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Aug 2004 14:22:11 -0000 On Sun, 1 Aug 2004, Bjoern A. Zeeb wrote: > On Sun, 1 Aug 2004, Bjoern A. Zeeb wrote: > > > So it seems that either ether.c (command.c, physical.c) change > > or the ng_pppoe still have problems selecting the correct type > > and default to standard. I am checking the sources to find the place > > if glebius isn't faster ;-) > > sorry for replying to myself: could you please test this patch: forget the last one; gives inconstientcy at another place; this one should be better. I cannot test it at the moment; would need to build a world on i386 which takes > 5 hours here: Index: ng_pppoe.c =================================================================== RCS file: /local/mirror/FreeBSD/r/ncvs/src/sys/netgraph/ng_pppoe.c,v retrieving revision 1.66 diff -u -p -r1.66 ng_pppoe.c --- ng_pppoe.c 27 Jul 2004 19:47:13 -0000 1.66 +++ ng_pppoe.c 1 Aug 2004 14:17:49 -0000 @@ -246,9 +246,9 @@ enum { }; struct ng_pppoe_mode_t { - u_int8_t id; + u_int8_t id; const struct ether_header *eh_prototype; - const char *name; + const char *name; }; static const struct ether_header eh_standard = @@ -283,10 +283,9 @@ struct PPPOE { typedef struct PPPOE *priv_p; /* Deprecated sysctl, leaved here to keep compatibility for some time */ -#define PPPOE_KEEPSTANDARD -1 -#define PPPOE_STANDARD 0 -#define PPPOE_NONSTANDARD 1 -static int pppoe_mode = PPPOE_KEEPSTANDARD; +#define PPPOE_SYSCTL_KEEPSTANDARD -1 +#define PPPOE_SYSCTL_STANDARD 0 +#define PPPOE_SYSCTL_NONSTANDARD 1 static const struct ng_pppoe_mode_t *sysctl_mode = ng_pppoe_modes; static int @@ -295,23 +294,22 @@ ngpppoe_set_ethertype(SYSCTL_HANDLER_ARG int error; int val; - val = pppoe_mode; + val = PPPOE_SYSCTL_KEEPSTANDARD; error = sysctl_handle_int(oidp, &val, sizeof(int), req); if (error != 0 || req->newptr == NULL) return (error); switch (val) { - case PPPOE_NONSTANDARD: + case PPPOE_SYSCTL_NONSTANDARD: sysctl_mode = ng_pppoe_modes + 1; break; - case PPPOE_STANDARD: - case PPPOE_KEEPSTANDARD: + case PPPOE_SYSCTL_STANDARD: + case PPPOE_SYSCTL_KEEPSTANDARD: sysctl_mode = ng_pppoe_modes; break; default: return (EINVAL); } - pppoe_mode = val; printf("net.graph.nonstandard_pppoe is deprecated. See ng_pppoe(4), ppp(8).\n"); return (0); } -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT