On Wed, Oct 08, 2008 at 12:44:43PM -0700, Philip Guenther wrote:
> On Wed, Oct 8, 2008 at 12:27 PM, Peter J. Philipp <[EMAIL PROTECTED]> wrote:
> > I'm not just seeing this wrong I hope. Let me explain:
> >
> > http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_tun.c
> >
> > when looking at the top seeing the change 1.95 done by brad@, but when
> > selecting to see diffs with 1.94 the change in $OpenBSD$ tag reflects damien
> > and mpf who were the committers one commit before 1.95. This causes a bit
> > of confusion on my part, for who committed what, what are brad's changes?
> >
> > Is CVSWEB broken?
>
> No, that's just the way CVS keywords work: the expansion is done at
> *checkout* and not at commit. This can be seen using the -ko option
> to "cvs up" or "cvs co" to disable the expansion done at checkout
> time. Just trust what you see on the revision listing and ignore the
> keywords in the diff output.
>
> (Beware: the -k option is normally 'sticky', so if you use -ko you
> should either combine it with -p to just send the output to stdout (in
> which case the -ko isn't sticky) or do a fresh update with -A to
> 'unstick' it. Of course, the -A will also clear any -r option you
> had...)
>
>
> Philip Guenther
but when I do a
cvs diff -r 1.94 -r 1.95 if_tun.c
on my local mirror i'm seeing the right $OpenBSD$ markers. Compere the
output below to
http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_tun.c.diff?r1=1.94&r2=1.95
I'd say something's fishy here.
-Otto
Index: if_tun.c
===================================================================
RCS file: /cvs/src/sys/net/if_tun.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- if_tun.c 4 Aug 2008 18:55:08 -0000 1.94
+++ if_tun.c 2 Oct 2008 20:21:14 -0000 1.95
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.94 2008/08/04 18:55:08 damien Exp $ */
+/* $OpenBSD: if_tun.c,v 1.95 2008/10/02 20:21:14 brad Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -438,11 +438,7 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
int error = 0, s;
s = splnet();
- if (tp->tun_flags & TUN_LAYER2)
- if ((error = ether_ioctl(ifp, &tp->arpcom, cmd, data)) > 0) {
- splx(s);
- return (error);
- }
+
switch (cmd) {
case SIOCSIFADDR:
tuninit(tp);
@@ -515,8 +511,12 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
ifp->if_flags & IFF_LINK0 ? TUN_LAYER2 : 0);
break;
default:
- error = ENOTTY;
+ if (tp->tun_flags & TUN_LAYER2)
+ error = ether_ioctl(ifp, &tp->arpcom, cmd, data);
+ else
+ error = ENOTTY;
}
+
splx(s);
return (error);
}
