From owner-p4-projects@FreeBSD.ORG Sun Aug 7 00:44:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF0FC16A421; Sun, 7 Aug 2005 00:44:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A9BA16A41F for ; Sun, 7 Aug 2005 00:44:44 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A48243D48 for ; Sun, 7 Aug 2005 00:44:44 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j770iiq2035062 for ; Sun, 7 Aug 2005 00:44:44 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j770iiWv035059 for perforce@freebsd.org; Sun, 7 Aug 2005 00:44:44 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 7 Aug 2005 00:44:44 GMT Message-Id: <200508070044.j770iiWv035059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 00:44:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=81582 Change 81582 by soc-cjones@soc-cjones_ishtar on 2005/08/07 00:44:22 Duh. We do in fact want to call the 'rename' verb when renaming. Silly me. Affected files ... .. //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#5 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#5 (text+ko) ==== @@ -801,7 +801,7 @@ req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); - gctl_ro_param(req, "verb", -1, "move"); + gctl_ro_param(req, "verb", -1, "rename"); gctl_ro_param(req, "cmd", -1, cmd); gctl_ro_param(req, "argc", sizeof(int), &argc); gctl_ro_param(req, "flags", sizeof(int), &flags); From owner-p4-projects@FreeBSD.ORG Sun Aug 7 02:21:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD73916A421; Sun, 7 Aug 2005 02:21:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B30A16A41F for ; Sun, 7 Aug 2005 02:21:41 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01BE843D45 for ; Sun, 7 Aug 2005 02:21:41 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j772Lelt045336 for ; Sun, 7 Aug 2005 02:21:40 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j772Le5x045333 for perforce@freebsd.org; Sun, 7 Aug 2005 02:21:40 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 7 Aug 2005 02:21:40 GMT Message-Id: <200508070221.j772Le5x045333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 02:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=81583 Change 81583 by soc-cjones@soc-cjones_ishtar on 2005/08/07 02:21:01 Make _rename compile. Affected files ... .. //depot/projects/soc2005/gvinum/docs/handbook/Makefile#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/Makefile#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/geom_ctl.c#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/geom_getxml.c#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/geom_stats.c#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/geom_xml2tree.c#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/libgeom.3#1 branch .. //depot/projects/soc2005/gvinum/src/lib/libgeom/libgeom.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/COPYRIGHT#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/makestatetext#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/request.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/statetexts.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinum.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumconfig.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumdaemon.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumext.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumhdr.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinuminterrupt.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumio.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumio.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumioctl.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumkw.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumlock.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinummemory.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumobj.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumparser.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumraid5.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumrequest.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumrevive.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumstate.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumstate.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumutil.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumutil.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/dev/vinum/vinumvar.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/bde/g_bde.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/bde/g_bde.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/bde/g_bde_crypt.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/bde/g_bde_lock.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/bde/g_bde_work.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_aes.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_apple.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_bsd.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_bsd_enc.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_ccd.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_ctl.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_ctl.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_dev.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_disk.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_disk.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_dump.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_event.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_fox.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_gpt.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_int.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_io.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_kern.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_mbr.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_mbr_enc.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_pc98.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_slice.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_slice.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_subr.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_sunlabel.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_sunlabel_enc.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/label/g_label.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/label/g_label.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/mirror/g_mirror.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/mirror/g_mirror.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/notes#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/soc2005/gvinum/src/sys/geom/uzip/g_uzip.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 7 02:22:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2053216A421; Sun, 7 Aug 2005 02:22:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB24D16A41F for ; Sun, 7 Aug 2005 02:22:42 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B967143D48 for ; Sun, 7 Aug 2005 02:22:42 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j772Mg4Y045374 for ; Sun, 7 Aug 2005 02:22:42 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j772Mgxq045371 for perforce@freebsd.org; Sun, 7 Aug 2005 02:22:42 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 7 Aug 2005 02:22:42 GMT Message-Id: <200508070222.j772Mgxq045371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 02:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=81584 Change 81584 by soc-cjones@soc-cjones_ishtar on 2005/08/07 02:22:06 Use correct style for getting 'destination' argument. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#3 (text+ko) ==== @@ -65,8 +65,8 @@ argc = gctl_get_paraml(req, "argc", sizeof(*argc)); flags = gctl_get_paraml(req, "flags", sizeof(*flags)); - destination = gctl_get_paraml(req, "destination", sizeof(*destination)); - if (NULL == destination || 0 == *destination) { + destination = gctl_get_param(req, "destination", NULL); + if (NULL == destination) { gctl_error(req, "no destination given"); return; } From owner-p4-projects@FreeBSD.ORG Sun Aug 7 02:22:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C709616A454; Sun, 7 Aug 2005 02:22:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 680A216A438 for ; Sun, 7 Aug 2005 02:22:43 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BA4243D48 for ; Sun, 7 Aug 2005 02:22:43 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j772MhLt045381 for ; Sun, 7 Aug 2005 02:22:43 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j772MgMK045377 for perforce@freebsd.org; Sun, 7 Aug 2005 02:22:42 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 7 Aug 2005 02:22:42 GMT Message-Id: <200508070222.j772MgMK045377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 02:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=81585 Change 81585 by soc-cjones@soc-cjones_ishtar on 2005/08/07 02:22:16 It compiles. Whee. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#2 (text+ko) ==== @@ -45,10 +45,10 @@ static int gv_rename_sd(struct gv_softc *, struct gctl_req *, struct gv_sd *, char *, int); static int gv_rename_vol(struct gv_softc *, struct gctl_req *, - struct gv_vol *, char *, int); + struct gv_volume *, char *, int); void -gv_rename(struct g_geom *, struct gctl_req *) +gv_rename(struct g_geom *gp, struct gctl_req *req) { struct gv_softc *sc; struct gv_volume *v; @@ -66,14 +66,20 @@ argc = gctl_get_paraml(req, "argc", sizeof(*argc)); flags = gctl_get_paraml(req, "flags", sizeof(*flags)); - newname = gctl_get_paraml(req, "newname", sizeof(*newname)); - if (NULL == newname || 0 == *newname) { + newname = gctl_get_param(req, "newname", NULL); + if (NULL == newname) { gctl_error(req, "no new name given"); return; } + type = gv_object_type(sc, newname); + printf("gv_object_type(sc, \"%s\") = %d\n", newname, type); + if (-1 != type) { + gctl_error(req, "new name is already in use"); + return; + } - object = gctl_get_paraml(req, "object", sizeof(*object)); - if (NULL == object || 0 == *object) { + object = gctl_get_param(req, "object", NULL); + if (NULL == object) { gctl_error(req, "no object given"); return; } @@ -96,6 +102,8 @@ gctl_error(req, "unknown plex '%s'", object); return; } + gctl_error(req, "calling gv_rename_plex(,, %s, %s,)", p, newname); + return; err = gv_rename_plex(sc, req, p, newname, *flags); if (err) return; @@ -106,6 +114,8 @@ gctl_error(req, "unknown subdisk '%s'", object); return; } + gctl_error(req, "calling gv_rename_sd(,, %s, %s,)", s, newname); + return; err = gv_rename_sd(sc, req, s, newname, *flags); if (err) return; @@ -116,6 +126,8 @@ gctl_error(req, "unknown drive '%s'", object); return; } + gctl_error(req, "calling gv_rename_drive(,, %s, %s,)", d, newname); + return; err = gv_rename_drive(sc, req, d, newname, *flags); if (err) return; @@ -136,6 +148,8 @@ g_topology_assert(); KASSERT(d != NULL, ("gv_rename_drive: NULL d")); + return (0); + } static int @@ -146,6 +160,7 @@ g_topology_assert(); KASSERT(d != NULL, ("gv_rename_plex: NULL p")); + return (0); } static int @@ -156,14 +171,45 @@ g_topology_assert(); KASSERT(d != NULL, ("gv_rename_sd: NULL s")); + return (0); } static int -gv_rename_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_vol *v, char *newname, int flags) +gv_rename_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_volume *v, char *newname, int flags) { int err; + struct gv_plex *p; + struct gv_sd *s; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_vol: NULL v")); + printf("gv_rename_vol:\n"); + printf("\tsc = %p\n", sc); + printf("\treq = %p\n", req); + printf("\tv = %p\n", v); + printf("\t\tv->name = %s\n", v->name); + printf("\t\tv->size = %d\n", (int) v->size); + printf("\t\tv->plexcount = %d\n", v->plexcount); + printf("\tnewname = \"%s\"\n", newname); + printf("\tflags = %x\n", flags); + + printf("iterating across plexes list...\n"); + LIST_FOREACH(p, &v->plexes, plex) { + if (strcmp(p->volume, v->name)) { + continue; /* Not a plex we're looking for. */ + } + printf("\tp->name = %s\n", p->name); + printf("\tp->size = %d\n", (int) p->size); + printf("\tp->volume = %s\n", p->volume); +/* LIST_FOREACH(s, &p->subdisks, sd) { + printf("\t\ts->name = %s\n", s->name); + printf("\t\ts->size = %d\n", (int) s->size); + printf("\t\ts->drive = %s\n", s->drive); + printf("\t\ts->plex = %s\n", s->plex); + } */ + } + + return (0); + } From owner-p4-projects@FreeBSD.ORG Sun Aug 7 12:18:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A79F16A421; Sun, 7 Aug 2005 12:18:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26B1516A41F for ; Sun, 7 Aug 2005 12:18:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA19343D48 for ; Sun, 7 Aug 2005 12:18:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77CIkGk080834 for ; Sun, 7 Aug 2005 12:18:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77CIkiU080830 for perforce@freebsd.org; Sun, 7 Aug 2005 12:18:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 12:18:46 GMT Message-Id: <200508071218.j77CIkiU080830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 12:18:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=81593 Change 81593 by rwatson@rwatson_peppercorn on 2005/08/07 12:18:17 A variety of fix-ups, especially relating to #ifdef __FreeBSD__, and some other incorrectities. Submitted by: bz Affected files ... .. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#5 edit .. //depot/projects/netsmp/src/sys/dev/cnw/if_cnw.c#3 edit .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwe.c#3 edit .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwip.c#3 edit .. //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#6 edit .. //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#5 edit .. //depot/projects/netsmp/src/sys/dev/lnc/if_lnc.c#5 edit .. //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#5 (text+ko) ==== @@ -3594,7 +3594,7 @@ bge_stop(sc); } } - sc->bge_if_flags = ifp->if_flags | ifp->if_drv_flags; + sc->bge_if_flags = ifp->if_flags; BGE_UNLOCK(sc); error = 0; break; ==== //depot/projects/netsmp/src/sys/dev/cnw/if_cnw.c#3 (text+ko) ==== @@ -571,7 +571,7 @@ { struct ifnet *ifp = &sc->sc_ethercom.ec_if; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((ifp->if_flags & IFF_RUNNING) != 0) return (0); sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET, cnw_intr, sc); @@ -586,8 +586,8 @@ } sc->sc_resource |= CNW_RES_PCIC; cnw_init(sc); - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; + ifp->if_flags |= IFF_RUNNING; return (0); } @@ -601,13 +601,13 @@ { struct ifnet *ifp = &sc->sc_ethercom.ec_if; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + if ((ifp->if_flags & IFF_RUNNING) == 0) return; pcmcia_function_disable(sc->sc_pf); sc->sc_resource &= ~CNW_RES_PCIC; pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + ifp->if_flags &= ~IFF_RUNNING; ifp->if_timer = 0; } @@ -773,16 +773,22 @@ #ifdef CNW_DEBUG if (sc->sc_ethercom.ec_if.if_flags & IFF_DEBUG) printf("%s: cnw_start\n", ifp->if_xname); +#if defined(__FreeBSD__) if (ifp->if_drv_flags & IFF_DRV_OACTIVE) +#else + if (ifp->if_flags & IFF_OACTIVE) +#endif printf("%s: cnw_start reentered\n", ifp->if_xname); #endif #if defined(__FreeBSD__) if (sc->cnw_gone) return; -#endif ifp->if_drv_flags |= IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_OACTIVE; +#endif for (;;) { #ifdef ONE_AT_A_TIME @@ -863,7 +869,11 @@ sc->sc_active = 1; } +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags &= ~IFF_OACTIVE; +#endif } /* @@ -1082,7 +1092,7 @@ #if !defined(__FreeBSD__) - if ((sc->sc_ethercom.ec_if.if_drv_flags & IFF_DRV_RUNNING) == 0 || + if ((sc->sc_ethercom.ec_if.if_flags & IFF_RUNNING) == 0 || (sc->sc_dev.dv_flags & DVF_ACTIVE) == 0) return (0); #else @@ -1201,7 +1211,11 @@ } sc->sc_active = 0; +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags &= ~IFF_OACTIVE; +#endif /* Continue to send packets from the queue */ #if !defined(__FreeBSD__) @@ -1249,7 +1263,7 @@ case SIOCSIFADDR: #if !defined(__FreeBSD__) - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING) && + if (!(ifp->if_flags & IFF_RUNNING) && (error = cnw_enable(sc)) != 0) break; ifp->if_flags |= IFF_UP; @@ -1271,14 +1285,13 @@ case SIOCSIFFLAGS: #if !defined(__FreeBSD__) - if (!(ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNIG)) { + if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == IFF_RUNNING) { /* * The interface is marked down and it is running, so * stop it. */ cnw_disable(sc); - } else if ((ifp->if_flags & IFF_UP) && - !(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + } else if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == IFF_UP){ /* * The interface is marked up and it is stopped, so * start it. @@ -1353,7 +1366,11 @@ #endif if (error) break; +#if !defined(__FreeBSD__) + if ((ifp->if_flags & IFF_RUNNING) == 0) +#else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) +#endif break; bus_space_read_region_1(sc->sc_memt, sc->sc_memh, sc->sc_memoff + CNW_EREG_CB, ==== //depot/projects/netsmp/src/sys/dev/firewire/if_fwe.c#3 (text+ko) ==== @@ -289,7 +289,11 @@ fwe->dma_ch = -1; } +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); +#else + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); +#endif } static int @@ -404,8 +408,13 @@ if ((xferq->flag & FWXFERQ_RUNNING) == 0) fc->irx_enable(fc, fwe->dma_ch); +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; +#endif FWE_POLL_REGISTER(fwe_poll, fwe, ifp); #if 0 @@ -426,10 +435,18 @@ case SIOCSIFFLAGS: s = splimp(); if (ifp->if_flags & IFF_UP) { +#if defined(__FreeBSD__) if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) +#else + if (!(ifp->if_flags & IFF_RUNNING)) +#endif fwe_init(&fwe->eth_softc); } else { +#if defined(__FreeBSD__) if (ifp->if_drv_flags & IFF_DRV_RUNNING) +#else + if (ifp->if_flags & IFF_RUNNING) +#endif fwe_stop(fwe); } /* XXX keep promiscoud mode */ @@ -525,12 +542,20 @@ } s = splimp(); +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_OACTIVE; +#endif if (ifp->if_snd.ifq_len != 0) fwe_as_output(fwe, ifp); +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags &= ~IFF_OACTIVE; +#endif splx(s); } ==== //depot/projects/netsmp/src/sys/dev/firewire/if_fwip.c#3 (text+ko) ==== @@ -269,7 +269,11 @@ fwip->dma_ch = -1; } +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); +#else + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); +#endif } static int @@ -397,8 +401,13 @@ if ((xferq->flag & FWXFERQ_RUNNING) == 0) fc->irx_enable(fc, fwip->dma_ch); +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; +#endif FWIP_POLL_REGISTER(fwip_poll, fwip, ifp); #if 0 @@ -417,10 +426,18 @@ case SIOCSIFFLAGS: s = splimp(); if (ifp->if_flags & IFF_UP) { +#if defined(__FreeBSD__) if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) +#else + if (!(ifp->if_flags & IFF_RUNNING)) +#endif fwip_init(&fwip->fw_softc); } else { +#if defined(__FreeBSD__) if (ifp->if_drv_flags & IFF_DRV_RUNNING) +#else + if (ifp->if_flags & IFF_RUNNING) +#endif fwip_stop(fwip); } splx(s); @@ -536,12 +553,20 @@ } s = splimp(); +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_OACTIVE; +#endif if (ifp->if_snd.ifq_len != 0) fwip_async_output(fwip, ifp); +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags &= ~IFF_OACTIVE; +#endif splx(s); } ==== //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#6 (text+ko) ==== @@ -975,7 +975,7 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_timer = 0; - sc->sc_ifflags = ifp->if_flags | ifp->if_drv_flags; + sc->sc_ifflags = ifp->if_flags; } static int @@ -1877,7 +1877,7 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) gem_stop(ifp, 0); } - sc->sc_ifflags = ifp->if_flags | ifp->if_drv_flags; + sc->sc_ifflags = ifp->if_flags; error = 0; break; case SIOCADDMULTI: ==== //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#5 (text+ko) ==== @@ -1460,7 +1460,7 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) lge_stop(sc); } - sc->lge_if_flags = ifp->if_flags | ifp->if_drv_flags; + sc->lge_if_flags = ifp->if_flags; error = 0; break; case SIOCADDMULTI: ==== //depot/projects/netsmp/src/sys/dev/lnc/if_lnc.c#5 (text+ko) ==== @@ -1213,9 +1213,9 @@ } /* - * IFF_DRV_OACTIVE and IFF_DRV_RUNNING are checked in ether_output so it's redundant - * to check them again since we wouldn't have got here if they were not - * appropriately set. This is also called from lnc_init and lncintr but the + * IFF_DRV_OACTIVE and IFF_DRV_RUNNING are checked in ether_output so it's + * redundant to check them again since we wouldn't have got here if they were + * not appropriately set. This is also called from lnc_init and lncintr but the * flags should be ok at those points too. */ ==== //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#5 (text+ko) ==== @@ -519,7 +519,11 @@ /* Wait for processes to go away */ usb_detach_wait(USBDEV(sc->sc_dev)); } +#if defined(__FreeBSD__) if (ifp->if_drv_flags & IFF_DRV_RUNNING) +#else + if (ifp->if_flags & IFF_RUNNING) +#endif udav_stop(GET_IFP(sc), 1); #if NRND > 0 @@ -913,8 +917,13 @@ } } +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_RUNNING; + ifp->if_flags &= ~IFF_OACTIVE; +#endif #if defined(__NetBSD__) splx(s); @@ -1151,7 +1160,11 @@ if (!sc->sc_link) return; +#if defined(__FreeBSD__) if (ifp->if_drv_flags & IFF_DRV_OACTIVE) +#else + if (ifp->if_flags & IFF_OACTIVE) +#endif return; #if defined(__NetBSD__) IFQ_POLL(&ifp->if_snd, m_head); @@ -1164,8 +1177,10 @@ if (udav_send(sc, m_head, 0)) { #if defined(__FreeBSD__) IF_PREPEND(&ifp->if_snd, m_head); + ifp->if_drv_flags |= IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_OACTIVE; #endif - ifp->if_drv_flags |= IFF_DRV_OACTIVE; return; } @@ -1177,7 +1192,11 @@ BPF_MTAP(ifp, m_head); #endif +#if defined(__FreeBSD__) ifp->if_drv_flags |= IFF_DRV_OACTIVE; +#else + ifp->if_flags |= IFF_OACTIVE; +#endif /* Set a timeout in case the chip goes out to lunch. */ ifp->if_timer = 5; @@ -1257,7 +1276,11 @@ DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); ifp->if_timer = 0; +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; +#else + ifp->if_flags &= ~IFF_OACTIVE; +#endif if (status != USBD_NORMAL_COMPLETION) { if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) { @@ -1617,7 +1640,11 @@ usb_ether_tx_list_free(&sc->sc_cdata); sc->sc_link = 0; +#if defined(__FreeBSD__) ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); +#else + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); +#endif } /* Set media options */ @@ -1655,7 +1682,11 @@ if (sc->sc_dying) return; +#if defined(__FreeBSD__) if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { +#else + if ((ifp->if_flags & IFF_RUNNING) == 0) { +#endif ifmr->ifm_active = IFM_ETHER | IFM_NONE; ifmr->ifm_status = 0; return; From owner-p4-projects@FreeBSD.ORG Sun Aug 7 12:54:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4100416A425; Sun, 7 Aug 2005 12:54:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00F7716A423 for ; Sun, 7 Aug 2005 12:54:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 232CB43E4C for ; Sun, 7 Aug 2005 12:22:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77CM82Z081172 for ; Sun, 7 Aug 2005 12:22:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77CM7TL081169 for perforce@freebsd.org; Sun, 7 Aug 2005 12:22:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 12:22:07 GMT Message-Id: <200508071222.j77CM7TL081169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 12:54:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=81594 Change 81594 by rwatson@rwatson_peppercorn on 2005/08/07 12:21:24 Catch up with entry point rename propagated from CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#96 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#96 (text+ko) ==== @@ -1278,7 +1278,7 @@ } static void -mac_lomac_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr, +mac_lomac_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct mac_lomac *source, *dest; @@ -1653,7 +1653,7 @@ } static void -mac_lomac_cleanup_sysv_sema(struct label *semalabel) +mac_lomac_cleanup_sysv_sem(struct label *semalabel) { bzero(SLOT(semalabel), sizeof(struct mac_lomac)); @@ -3028,7 +3028,7 @@ .mpo_init_inpcb_label = mac_lomac_init_label_waitcheck, .mpo_init_sysv_msgmsg_label = mac_lomac_init_label, .mpo_init_sysv_msgqueue_label = mac_lomac_init_label, - .mpo_init_sysv_sema_label = mac_lomac_init_label, + .mpo_init_sysv_sem_label = mac_lomac_init_label, .mpo_init_sysv_shm_label = mac_lomac_init_label, .mpo_init_ipq_label = mac_lomac_init_label_waitcheck, .mpo_init_mbuf_label = mac_lomac_init_label_waitcheck, @@ -3047,7 +3047,7 @@ .mpo_destroy_inpcb_label = mac_lomac_destroy_label, .mpo_destroy_sysv_msgmsg_label = mac_lomac_destroy_label, .mpo_destroy_sysv_msgqueue_label = mac_lomac_destroy_label, - .mpo_destroy_sysv_sema_label = mac_lomac_destroy_label, + .mpo_destroy_sysv_sem_label = mac_lomac_destroy_label, .mpo_destroy_sysv_shm_label = mac_lomac_destroy_label, .mpo_destroy_ipq_label = mac_lomac_destroy_label, .mpo_destroy_mbuf_label = mac_lomac_destroy_label, @@ -3106,7 +3106,7 @@ .mpo_create_inpcb_from_socket = mac_lomac_create_inpcb_from_socket, .mpo_create_sysv_msgmsg = mac_lomac_create_sysv_msgmsg, .mpo_create_sysv_msgqueue = mac_lomac_create_sysv_msgqueue, - .mpo_create_sysv_sema = mac_lomac_create_sysv_sema, + .mpo_create_sysv_sem = mac_lomac_create_sysv_sem, .mpo_create_sysv_shm = mac_lomac_create_sysv_shm, .mpo_create_ipq = mac_lomac_create_ipq, .mpo_create_mbuf_from_inpcb = mac_lomac_create_mbuf_from_inpcb, @@ -3127,7 +3127,7 @@ .mpo_relabel_cred = mac_lomac_relabel_cred, .mpo_cleanup_sysv_msgmsg = mac_lomac_cleanup_sysv_msgmsg, .mpo_cleanup_sysv_msgqueue = mac_lomac_cleanup_sysv_msgqueue, - .mpo_cleanup_sysv_sema = mac_lomac_cleanup_sysv_sema, + .mpo_cleanup_sysv_sem = mac_lomac_cleanup_sysv_sem, .mpo_cleanup_sysv_shm = mac_lomac_cleanup_sysv_shm, .mpo_check_bpfdesc_receive = mac_lomac_check_bpfdesc_receive, .mpo_check_cred_relabel = mac_lomac_check_cred_relabel, From owner-p4-projects@FreeBSD.ORG Sun Aug 7 14:29:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7697116A422; Sun, 7 Aug 2005 14:29:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1786D16A420 for ; Sun, 7 Aug 2005 14:29:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A4EA43D9A for ; Sun, 7 Aug 2005 14:29:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77EThAU092903 for ; Sun, 7 Aug 2005 14:29:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77ETh7N092900 for perforce@freebsd.org; Sun, 7 Aug 2005 14:29:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 14:29:43 GMT Message-Id: <200508071429.j77ETh7N092900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 14:29:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=81598 Change 81598 by rwatson@rwatson_peppercorn on 2005/08/07 14:29:02 Integrate netsmp: - ia64isms - change in types for sysvshm limits - kobj_machdep_init() - sam's if_free() fix for if_addr_mtx. - jhb takes if_pcn locking by storm - VV_NOKNOTE Affected files ... .. //depot/projects/netsmp/src/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/netsmp/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/netsmp/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/proc.h#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if.c#10 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/netsmp/src/sys/pci/if_pcn.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/netsmp/src/sys/sys/ata.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/kobj.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mount.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/shm.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/vnode.h#3 integrate Differences ... ==== //depot/projects/netsmp/src/sys/alpha/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.8 2004/07/11 03:07:28 marcel Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.9 2005/08/06 19:24:22 marcel Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -32,3 +32,10 @@ hint.sio.1.flags="0x80" hint.ppc.0.at="isa" hint.ppc.0.irq="7" +hint.uart.0.at="isa" +hint.uart.0.irq="4" +hint.uart.0.port="0x3F8" +hint.uart.1.at="isa" +hint.uart.1.flags="0x80" +hint.uart.1.irq="3" +hint.uart.1.port="0x2F8" ==== //depot/projects/netsmp/src/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.96 2005/07/29 12:41:37 brian Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.98 2005/08/07 09:41:53 krion Exp $ ############################################################## ### Basic configuration options ############################ @@ -91,7 +91,7 @@ #kern.maxswzone="" # Set the max swmeta KVA storage #kern.maxtsiz="" # Set the max text size #kern.maxusers="32" # Set size of various static tables -#kern.nbuf="" # Set the number of buffer headers +#kern.nbuf="" # Set the number of buffer headers #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack #kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI @@ -184,10 +184,16 @@ miibus_load="NO" # miibus support, needed for some drivers if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i +if_arl_load="NO" # Aironet Arlan 655 wireless network adapter +if_ath_load="NO" # Atheros IEEE 802.11 wireless NICs +if_aue_load="NO" # ADMtek AN986 Pegasus USB Ethernet if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs +if_axe_load="NO" # ASIX Electronics AX88172 USB Ethernet if_bfe_load="NO" # Broadcom BCM4401 if_bge_load="NO" # Broadcom BCM570x PCI gigabit ethernet if_cm_load="NO" # SMC (90c26, 90c56, 90c66) +if_cs_load="NO" # Crystal Semiconductor CS8920 +if_cue_load="NO" # CATC USB-EL1210A USB Ethernet if_dc_load="NO" # DEC/Intel 21143 and various workalikes if_de_load="NO" # DEC DC21x4x ethernet if_ed_load="NO" # National Semiconductor DS8390/WD83C690 ethernet @@ -199,16 +205,19 @@ if_fe_load="NO" # Fujitsu MB86960A/MB86965A based Ethernet adapters if_fxp_load="NO" # Intel EtherExpress PRO/100B (82557, 82558) if_gx_load="NO" # Intel Pro/1000 gigabit ethernet +if_hme_load="NO" # Sun Microelectronics STP2002-STQ Ethernet if_ie_load="NO" # Intel 82586 if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI gigabit ethernet if_lnc_load="NO" # AMD Lance/PCnet Ethernet if_my_load="NO" # Myson PCI fast ethernet if_nge_load="NO" # National Semiconductor PCI gigabit ethernet +if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter if_oltr_load="NO" # Olicom if_pcn_load="NO" # AMD PCnet PCI if_ray_load="NO" # Raytheon Raylink/Webgear Aviator PCCard if_re_load="NO" # RealTek 8139C+/8169/8169S/8110S if_rl_load="NO" # RealTek 8129/8139 +if_rue_load="NO" # RealTek RTL8150 USB to Fast Ethernet if_sbni_load="NO" # Granch SBNI12 leased line adapters if_sf_load="NO" # Adaptec Duralink PCI (AIC-6915 "starfire") if_sis_load="NO" # Silicon Integrated Systems SiS 900/7016 @@ -221,6 +230,7 @@ if_tx_load="NO" # SMC 83c17x fast ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet +if_udav_load="NO" # Davicom DM9601 USB Ethernet if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F ==== //depot/projects/netsmp/src/sys/boot/i386/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.72 2005/05/27 19:26:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.73 2005/08/06 00:33:42 ssouhlal Exp $"); #include #include @@ -71,7 +71,7 @@ #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" -#define PATH_KERNEL "/kernel" +#define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 #define NOPT 12 ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.16 2005/07/28 19:34:51 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.17 2005/08/05 17:00:58 njl Exp $"); #include "opt_acpi.h" #include @@ -225,6 +225,10 @@ else bi[i].min = 0; total_min += bi[i].min; + + /* If this battery is not present, don't use its capacity. */ + if (bi[i].cap == -1) + bi[i].cap = 0; total_cap += bi[i].cap; } ==== //depot/projects/netsmp/src/sys/dev/puc/puc_ebus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.5 2005/06/04 20:29:28 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.6 2005/08/07 13:37:25 marius Exp $"); #include "opt_puc.h" @@ -48,10 +48,11 @@ static int puc_ebus_probe(device_t dev) { - const char *nm; + const char *nm, *cmpt; nm = ofw_bus_get_name(dev); - if (!strcmp(nm, "se")) { + cmpt = ofw_bus_get_compat(dev); + if (!strcmp(nm, "se") || (cmpt != NULL && !strcmp(cmpt, "sab82532"))) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); return (0); } ==== //depot/projects/netsmp/src/sys/dev/uart/uart_bus_ebus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.6 2005/06/04 21:52:56 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.7 2005/08/07 13:37:25 marius Exp $"); #include #include @@ -96,7 +96,7 @@ sc->sc_class = &uart_ns8250_class; return (uart_bus_probe(dev, 0, 0, 0, 0)); } - if (!strcmp(nm, "se")) { + if (!strcmp(nm, "se") || (cmpt != NULL && !strcmp(cmpt, "sab82532"))) { sc->sc_class = &uart_sab82532_class; error = uart_bus_probe(dev, 0, 0, 0, 1); return ((error) ? error : -1); ==== //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_sparc64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.19 2005/06/04 21:33:18 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.20 2005/08/07 13:37:25 marius Exp $"); #include #include @@ -216,7 +216,7 @@ compat[0] = '\0'; di->bas.regshft = 0; di->bas.rclk = 0; - if (!strcmp(buf, "se")) { + if (!strcmp(buf, "se") || !strcmp(compat, "sab82532")) { di->ops = uart_sab82532_ops; /* SAB82532 are only known to be used for TTYs. */ if ((di->bas.chan = uart_cpu_channel(dev)) == 0) ==== //depot/projects/netsmp/src/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.430 2005/07/14 15:39:05 kensmith Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.432 2005/08/06 23:05:48 davidxu Exp $ machine i386 cpu I486_CPU ==== //depot/projects/netsmp/src/sys/ia64/ia64/exception.S#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/exception.S,v 1.56 2004/09/25 04:27:44 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/exception.S,v 1.57 2005/08/06 20:28:19 marcel Exp $"); #include #include @@ -644,6 +644,7 @@ add r20=24,r18 // collision chain ;; ld8 r21=[r21] // check VHPT tag + ld8 r20=[r20] // bucket head ;; cmp.ne p15,p0=r21,r19 (p15) br.dpnt.few 1f @@ -722,6 +723,7 @@ add r20=24,r18 // collision chain ;; ld8 r21=[r21] // check VHPT tag + ld8 r20=[r20] // bucket head ;; cmp.ne p15,p0=r21,r19 (p15) br.dpnt.few 1f @@ -937,6 +939,8 @@ ttag r19=r16 add r20=24,r18 // collision chain ;; + ld8 r20=[r20] // bucket head + ;; ld8 r20=[r20] // first entry ;; rsm psr.dt // turn off data translations @@ -1003,6 +1007,8 @@ ttag r19=r16 add r20=24,r18 // collision chain ;; + ld8 r20=[r20] // bucket head + ;; ld8 r20=[r20] // first entry ;; rsm psr.dt // turn off data translations @@ -1069,6 +1075,8 @@ ttag r19=r16 add r20=24,r18 // collision chain ;; + ld8 r20=[r20] // bucket head + ;; ld8 r20=[r20] // first entry ;; rsm psr.dt // turn off data translations ==== //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.49 2005/04/12 23:18:54 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.50 2005/08/06 20:28:19 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -147,6 +147,8 @@ if (vector == 0) { vector = ib->ib_inta; printf("ExtINT interrupt: vector=%ld\n", vector); + if (vector == 15) + goto stray; } if (vector == CLOCK_VECTOR) {/* clock interrupt */ @@ -207,9 +209,11 @@ } else if (vector == ipi_vector[IPI_HIGH_FP]) { struct thread *thr = PCPU_GET(fpcurthread); if (thr != NULL) { + mtx_lock(&thr->td_md.md_highfp_mtx); save_high_fp(&thr->td_pcb->pcb_high_fp); thr->td_pcb->pcb_fpcpu = NULL; PCPU_SET(fpcurthread, NULL); + mtx_unlock(&thr->td_md.md_highfp_mtx); } } else if (vector == ipi_vector[IPI_RENDEZVOUS]) { rdvs[PCPU_GET(cpuid)]++; @@ -239,6 +243,7 @@ ia64_dispatch_intr(tf, vector); } +stray: atomic_subtract_int(&td->td_intr_nesting_level, 1); return (TRAPF_USERMODE(tf)); } ==== //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.200 2005/07/05 17:12:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.201 2005/08/06 20:28:19 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -764,8 +765,8 @@ */ proc0kstack = (vm_offset_t)kstack; thread0.td_kstack = proc0kstack; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + thread0.td_kstack_pages = KSTACK_PAGES; + /* * Setup the global data for the bootstrap cpu. */ @@ -774,6 +775,8 @@ pcpu_init(pcpup, 0, PAGE_SIZE); PCPU_SET(curthread, &thread0); + mutex_init(); + /* * Initialize the rest of proc 0's PCB. * @@ -781,14 +784,11 @@ * and make proc0's trapframe pointer point to it for sanity. * Initialise proc0's backing store to start after u area. */ - thread0.td_frame = (struct trapframe *)thread0.td_pcb - 1; - thread0.td_frame->tf_length = sizeof(struct trapframe); + cpu_thread_setup(&thread0); thread0.td_frame->tf_flags = FRAME_SYSCALL; thread0.td_pcb->pcb_special.sp = (u_int64_t)thread0.td_frame - 16; - thread0.td_pcb->pcb_special.bspstore = (u_int64_t)proc0kstack; - - mutex_init(); + thread0.td_pcb->pcb_special.bspstore = thread0.td_kstack; /* * Initialize the virtual memory system. @@ -1428,7 +1428,6 @@ /* * High FP register functions. - * XXX no synchronization yet. */ int @@ -1438,13 +1437,17 @@ struct pcpu *cpu; struct thread *thr; + mtx_lock(&td->td_md.md_highfp_mtx); pcb = td->td_pcb; cpu = pcb->pcb_fpcpu; - if (cpu == NULL) + if (cpu == NULL) { + mtx_unlock(&td->td_md.md_highfp_mtx); return (0); + } pcb->pcb_fpcpu = NULL; thr = cpu->pc_fpcurthread; cpu->pc_fpcurthread = NULL; + mtx_unlock(&td->td_md.md_highfp_mtx); /* Post-mortem sanity checking. */ KASSERT(thr == td, ("Inconsistent high FP state")); @@ -1462,22 +1465,36 @@ if ((td->td_frame->tf_special.psr & IA64_PSR_MFH) == 0) return (ia64_highfp_drop(td)); + mtx_lock(&td->td_md.md_highfp_mtx); pcb = td->td_pcb; cpu = pcb->pcb_fpcpu; - if (cpu == NULL) + if (cpu == NULL) { + mtx_unlock(&td->td_md.md_highfp_mtx); return (0); + } #ifdef SMP + if (td == curthread) + sched_pin(); if (cpu != pcpup) { - ipi_send(cpu->pc_lid, IPI_HIGH_FP); - while (pcb->pcb_fpcpu != cpu) + mtx_unlock(&td->td_md.md_highfp_mtx); + ipi_send(cpu, IPI_HIGH_FP); + if (td == curthread) + sched_unpin(); + while (pcb->pcb_fpcpu == cpu) DELAY(100); return (1); + } else { + save_high_fp(&pcb->pcb_high_fp); + if (td == curthread) + sched_unpin(); } +#else + save_high_fp(&pcb->pcb_high_fp); #endif - save_high_fp(&pcb->pcb_high_fp); pcb->pcb_fpcpu = NULL; thr = cpu->pc_fpcurthread; cpu->pc_fpcurthread = NULL; + mtx_unlock(&td->td_md.md_highfp_mtx); /* Post-mortem sanity cxhecking. */ KASSERT(thr == td, ("Inconsistent high FP state")); ==== //depot/projects/netsmp/src/sys/ia64/ia64/mp_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.55 2005/04/15 00:21:23 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.56 2005/08/06 20:28:19 marcel Exp $"); #include "opt_kstack_pages.h" @@ -64,8 +64,9 @@ void ia64_ap_startup(void); -extern vm_offset_t vhpt_base, vhpt_size; -extern u_int64_t ia64_lapic_address; +extern uint64_t vhpt_base[]; +extern size_t vhpt_size; +extern uint64_t ia64_lapic_address; #define LID_SAPIC_ID(x) ((int)((x) >> 24) & 0xff) #define LID_SAPIC_EID(x) ((int)((x) >> 16) & 0xff) @@ -74,9 +75,10 @@ int mp_ipi_test = 0; -/* Variables used by os_boot_rendez */ +/* Variables used by os_boot_rendez and ia64_ap_startup */ +struct pcpu *ap_pcpu; void *ap_stack; -struct pcpu *ap_pcpu; +uint64_t ap_vhpt; volatile int ap_delay; volatile int ap_awake; volatile int ap_spin; @@ -86,14 +88,15 @@ void ia64_ap_startup(void) { - ap_awake = 1; - ap_delay = 0; + + pcpup = ap_pcpu; + ia64_set_k4((intptr_t)pcpup); __asm __volatile("mov cr.pta=%0;; srlz.i;;" :: - "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1)); + "r" (ap_vhpt + (1<<8) + (vhpt_size<<2) + 1)); - pcpup = ap_pcpu; - ia64_set_k4((intptr_t)pcpup); + ap_awake = 1; + ap_delay = 0; map_pal_code(); map_gateway_page(); @@ -102,7 +105,7 @@ /* Wait until it's time for us to be unleashed */ while (ap_spin) - /* spin */; + DELAY(0); __asm __volatile("ssm psr.i;; srlz.d;;"); @@ -119,7 +122,7 @@ ap_awake++; while (!smp_started) - /* spin */; + DELAY(0); CTR1(KTR_SMP, "SMP: cpu%d launched", PCPU_GET(cpuid)); @@ -242,16 +245,17 @@ pc->pc_current_pmap = kernel_pmap; pc->pc_other_cpus = all_cpus & ~pc->pc_cpumask; if (pc->pc_cpuid > 0) { + ap_pcpu = pc; ap_stack = malloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK); - ap_pcpu = pc; + ap_vhpt = vhpt_base[pc->pc_cpuid]; ap_delay = 2000; ap_awake = 0; if (bootverbose) printf("SMP: waking up cpu%d\n", pc->pc_cpuid); - ipi_send(pc->pc_lid, IPI_AP_WAKEUP); + ipi_send(pc, IPI_AP_WAKEUP); do { DELAY(1000); @@ -292,7 +296,7 @@ ap_spin = 0; while (ap_awake != smp_cpus) - /* spin */; + DELAY(0); if (smp_cpus != cpus || cpus != mp_ncpus) { printf("SMP: %d CPUs found; %d CPUs usable; %d CPUs woken\n", @@ -307,13 +311,13 @@ * send an IPI to a set of cpus. */ void -ipi_selected(u_int64_t cpus, int ipi) +ipi_selected(cpumask_t cpus, int ipi) { struct pcpu *pc; SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { if (cpus & pc->pc_cpumask) - ipi_send(pc->pc_lid, ipi); + ipi_send(pc, ipi); } } @@ -326,7 +330,7 @@ struct pcpu *pc; SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { - ipi_send(pc->pc_lid, ipi); + ipi_send(pc, ipi); } } @@ -340,7 +344,7 @@ SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { if (pc != pcpup) - ipi_send(pc->pc_lid, ipi); + ipi_send(pc, ipi); } } @@ -351,7 +355,7 @@ ipi_self(int ipi) { - ipi_send(ia64_get_lid(), ipi); + ipi_send(pcpup, ipi); } /* @@ -360,17 +364,17 @@ * fields are used here. */ void -ipi_send(u_int64_t lid, int ipi) +ipi_send(struct pcpu *cpu, int ipi) { - volatile u_int64_t *pipi; - u_int64_t vector; + volatile uint64_t *pipi; + uint64_t vector; pipi = __MEMIO_ADDR(ia64_lapic_address | - ((lid & LID_SAPIC_MASK) >> 12)); - vector = (u_int64_t)(ipi_vector[ipi] & 0xff); + ((cpu->pc_lid & LID_SAPIC_MASK) >> 12)); + vector = (uint64_t)(ipi_vector[ipi] & 0xff); + *pipi = vector; CTR3(KTR_SMP, "ipi_send(%p, %ld), cpuid=%d", pipi, vector, PCPU_GET(cpuid)); - *pipi = vector; } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); ==== //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.160 2005/06/10 03:33:36 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.161 2005/08/06 20:28:19 marcel Exp $"); #include #include @@ -155,8 +155,15 @@ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ -vm_offset_t vhpt_base, vhpt_size; -struct mtx pmap_vhptmutex; +struct ia64_bucket { + uint64_t chain; + struct mtx mutex; + u_int length; +}; + +struct ia64_bucket *vhpt_bucket; +uint64_t vhpt_base[MAXCPU]; +size_t vhpt_size; /* * Kernel virtual memory management. @@ -177,6 +184,7 @@ static uint64_t pmap_ptc_e_count2 = 2; static uint64_t pmap_ptc_e_stride1 = 0x2000; static uint64_t pmap_ptc_e_stride2 = 0x100000000; +struct mtx pmap_ptcmutex; /* * Data for the RID allocator @@ -204,14 +212,11 @@ * VHPT instrumentation. */ static int pmap_vhpt_inserts; -static int pmap_vhpt_collisions; static int pmap_vhpt_resident; SYSCTL_DECL(_vm_stats); SYSCTL_NODE(_vm_stats, OID_AUTO, vhpt, CTLFLAG_RD, 0, ""); SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, inserts, CTLFLAG_RD, &pmap_vhpt_inserts, 0, ""); -SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, collisions, CTLFLAG_RD, - &pmap_vhpt_collisions, 0, ""); SYSCTL_INT(_vm_stats_vhpt, OID_AUTO, resident, CTLFLAG_RD, &pmap_vhpt_resident, 0, ""); @@ -257,8 +262,11 @@ void pmap_bootstrap() { + struct ia64_pal_result res; + struct ia64_lpte *pte; + vm_offset_t base, limit; + size_t size; int i, j, count, ridbits; - struct ia64_pal_result res; /* * Query the PAL Code to find the loop parameters for the @@ -280,6 +288,7 @@ pmap_ptc_e_count2, pmap_ptc_e_stride1, pmap_ptc_e_stride2); + mtx_init(&pmap_ptcmutex, "Global PTC lock", NULL, MTX_SPIN); /* * Setup RIDs. RIDs 0..7 are reserved for the kernel. @@ -335,7 +344,8 @@ kernel_vm_end = NKPT * PAGE_SIZE * NKPTEPG + VM_MIN_KERNEL_ADDRESS - VM_GATEWAY_SIZE; - for (i = 0; phys_avail[i+2]; i+= 2) ; + for (i = 0; phys_avail[i+2]; i+= 2) + ; count = i+2; /* @@ -345,19 +355,20 @@ * size and aligned to a natural boundary). */ vhpt_size = 15; - while ((1<>= 1; + } else + vhpt_base[0] = IA64_PHYS_TO_RR7(base); } if (vhpt_size < 15) panic("Can't find space for VHPT"); if (bootverbose) - printf("Putting VHPT at %p\n", (void *) vhpt_base); - if (vhpt_base != phys_avail[i]) { - /* - * Split this region. - */ + printf("Putting VHPT at 0x%lx\n", base); + + if (base != phys_avail[i]) { + /* Split this region. */ if (bootverbose) - printf("Splitting [%p-%p]\n", - (void *) phys_avail[i], - (void *) phys_avail[i+1]); + printf("Splitting [%p-%p]\n", (void *)phys_avail[i], + (void *)phys_avail[i+1]); for (j = count; j > i; j -= 2) { phys_avail[j] = phys_avail[j-2]; phys_avail[j+1] = phys_avail[j-2+1]; } - phys_avail[count+2] = 0; - phys_avail[count+3] = 0; - phys_avail[i+1] = vhpt_base; - phys_avail[i+2] = vhpt_base + (1L << vhpt_size); - } else { - phys_avail[i] = vhpt_base + (1L << vhpt_size); + phys_avail[i+1] = base; + phys_avail[i+2] = limit; + } else + phys_avail[i] = limit; + + count = size / sizeof(struct ia64_lpte); + + vhpt_bucket = (void *)pmap_steal_memory(count * sizeof(struct ia64_bucket)); + pte = (struct ia64_lpte *)vhpt_base[0]; + for (i = 0; i < count; i++) { + pte[i].pte = 0; + pte[i].itir = 0; + pte[i].tag = 1UL << 63; /* Invalid tag */ + pte[i].chain = (uintptr_t)(vhpt_bucket + i); + /* Stolen memory is zeroed! */ + mtx_init(&vhpt_bucket[i].mutex, "VHPT bucket lock", NULL, + MTX_SPIN); } - vhpt_base = IA64_PHYS_TO_RR7(vhpt_base); - bzero((void *) vhpt_base, (1L << vhpt_size)); + for (i = 1; i < MAXCPU; i++) { + vhpt_base[i] = vhpt_base[i - 1] + size; + bcopy((void *)vhpt_base[i - 1], (void *)vhpt_base[i], size); + } - mtx_init(&pmap_vhptmutex, "VHPT collision chain lock", NULL, MTX_DEF); - - __asm __volatile("mov cr.pta=%0;; srlz.i;;" - :: "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1)); + __asm __volatile("mov cr.pta=%0;; srlz.i;;" :: + "r" (vhpt_base[0] + (1<<8) + (vhpt_size<<2) + 1)); virtual_avail = VM_MIN_KERNEL_ADDRESS; virtual_end = VM_MAX_KERNEL_ADDRESS; @@ -494,12 +512,73 @@ * Manipulate TLBs for a pmap ***************************************************/ +#if 0 +static __inline void +pmap_invalidate_page_locally(void *arg) +{ + vm_offset_t va = (uintptr_t)arg; + struct ia64_lpte *pte; + + pte = (struct ia64_lpte *)ia64_thash(va); + if (pte->tag == ia64_ttag(va)) + pte->tag = 1UL << 63; + ia64_ptc_l(va, PAGE_SHIFT << 2); +} + +#ifdef SMP static void +pmap_invalidate_page_1(void *arg) +{ + void **args = arg; + pmap_t oldpmap; + + critical_enter(); + oldpmap = pmap_install(args[0]); + pmap_invalidate_page_locally(args[1]); + pmap_install(oldpmap); + critical_exit(); +} +#endif + +static void +pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +{ + + KASSERT((pmap == kernel_pmap || pmap == PCPU_GET(current_pmap)), + ("invalidating TLB for non-current pmap")); + +#ifdef SMP + if (mp_ncpus > 1) { + void *args[2]; + args[0] = pmap; + args[1] = (void *)va; + smp_rendezvous(NULL, pmap_invalidate_page_1, NULL, args); + } else +#endif + pmap_invalidate_page_locally((void *)va); +} +#endif /* 0 */ + +static void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { + struct ia64_lpte *pte; + int i, vhpt_ofs; + KASSERT((pmap == kernel_pmap || pmap == PCPU_GET(current_pmap)), ("invalidating TLB for non-current pmap")); - ia64_ptc_g(va, PAGE_SHIFT << 2); + + vhpt_ofs = ia64_thash(va) - vhpt_base[PCPU_GET(cpuid)]; + critical_enter(); + for (i = 0; i < MAXCPU; i++) { + pte = (struct ia64_lpte *)(vhpt_base[i] + vhpt_ofs); + if (pte->tag == ia64_ttag(va)) + pte->tag = 1UL << 63; + } + critical_exit(); + mtx_lock_spin(&pmap_ptcmutex); + ia64_ptc_ga(va, PAGE_SHIFT << 2); + mtx_unlock_spin(&pmap_ptcmutex); } static void @@ -507,9 +586,8 @@ { uint64_t addr; int i, j; - register_t psr; - psr = intr_disable(); + critical_enter(); addr = pmap_ptc_e_base; for (i = 0; i < pmap_ptc_e_count1; i++) { for (j = 0; j < pmap_ptc_e_count2; j++) { @@ -518,21 +596,22 @@ } addr += pmap_ptc_e_stride1; } - intr_restore(psr); + critical_exit(); } static void pmap_invalidate_all(pmap_t pmap) { + KASSERT((pmap == kernel_pmap || pmap == PCPU_GET(current_pmap)), ("invalidating TLB for non-current pmap")); - #ifdef SMP - smp_rendezvous(0, pmap_invalidate_all_1, 0, 0); -#else - pmap_invalidate_all_1(0); + if (mp_ncpus > 1) + smp_rendezvous(NULL, pmap_invalidate_all_1, NULL, NULL); + else #endif + pmap_invalidate_all_1(NULL); } static uint32_t @@ -582,48 +661,7 @@ mtx_unlock(&pmap_ridmutex); } -/*************************************************** - * Low level helper routines..... - ***************************************************/ - /* - * Install a pte into the VHPT - */ -static PMAP_INLINE void -pmap_install_pte(struct ia64_lpte *vhpte, struct ia64_lpte *pte) -{ - uint64_t *vhp, *p; - - vhp = (uint64_t *)vhpte; - p = (uint64_t *)pte; - - critical_enter(); - - /* Invalidate the tag so the VHPT walker will not match this entry. */ - vhp[2] = 1UL << 63; - ia64_mf(); - - vhp[0] = p[0]; - vhp[1] = p[1]; - ia64_mf(); - - /* Install a proper tag now that we're done. */ - vhp[2] = p[2]; - ia64_mf(); - - critical_exit(); -} - -/* - * Compare essential parts of pte. - */ -static PMAP_INLINE int -pmap_equal_pte(struct ia64_lpte *pte1, struct ia64_lpte *pte2) -{ - return *(uint64_t *) pte1 == *(uint64_t *) pte2; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 7 14:49:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7664216A421; Sun, 7 Aug 2005 14:49:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E88A16A41F for ; Sun, 7 Aug 2005 14:49:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42DE443D7D for ; Sun, 7 Aug 2005 14:49:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77En8Tp093638 for ; Sun, 7 Aug 2005 14:49:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77En7WK093635 for perforce@freebsd.org; Sun, 7 Aug 2005 14:49:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 14:49:07 GMT Message-Id: <200508071449.j77En7WK093635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 14:49:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=81600 Change 81600 by rwatson@rwatson_peppercorn on 2005/08/07 14:48:20 Catch up with if_pcn driver changes. Affected files ... .. //depot/projects/netsmp/src/sys/pci/if_pcn.c#6 edit Differences ... ==== //depot/projects/netsmp/src/sys/pci/if_pcn.c#6 (text+ko) ==== @@ -927,7 +927,7 @@ sc = xsc; ifp = sc->pcn_ifp; PCN_LOCK(sc); - if (!(ifp->if_flags & IFF_RUNNING)) { + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { PCN_UNLOCK(sc); return; } @@ -1087,7 +1087,7 @@ idx = sc->pcn_cdata.pcn_tx_prod; - if (ifp->if_drv_flags & IFF_DRV_OACTIVE) { + if (ifp->if_drv_flags & IFF_DRV_OACTIVE) return; while(sc->pcn_cdata.pcn_tx_chain[idx] == NULL) { From owner-p4-projects@FreeBSD.ORG Sun Aug 7 15:06:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77FA616A420; Sun, 7 Aug 2005 15:06:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5008116A422 for ; Sun, 7 Aug 2005 15:06:30 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BF8343D48 for ; Sun, 7 Aug 2005 15:06:30 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77F6T8J094378 for ; Sun, 7 Aug 2005 15:06:29 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77F6T8N094375 for perforce@freebsd.org; Sun, 7 Aug 2005 15:06:29 GMT (envelope-from soc-chenk@freebsd.org) Date: Sun, 7 Aug 2005 15:06:29 GMT Message-Id: <200508071506.j77F6T8N094375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 81602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 15:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=81602 Change 81602 by soc-chenk@soc-chenk_leavemealone on 2005/08/07 15:06:07 First commit of a module which aims to provide the kernel interface needed to make use of Fuse based filesystem daemons. This commit implements messaging between kernel and userspace. Affected files ... .. //depot/projects/soc2005/fuse4bsd/Makefile#1 add .. //depot/projects/soc2005/fuse4bsd/fmaster.c#1 add .. //depot/projects/soc2005/fuse4bsd/fuse.c#1 add .. //depot/projects/soc2005/fuse4bsd/fuse.h#1 add .. //depot/projects/soc2005/fuse4bsd/fuselib/fuselib.diff#1 add .. //depot/projects/soc2005/fuse4bsd/fuselib/fusermount.c#1 add .. //depot/projects/soc2005/fuse4bsd/kernel-header.diff#1 add .. //depot/projects/soc2005/fuse4bsd/linux_compat.h#1 add .. //depot/projects/soc2005/fuse4bsd/tools/fuse-structs.yml#1 add .. //depot/projects/soc2005/fuse4bsd/tools/fuse_vfsemu.rb#1 add .. //depot/projects/soc2005/fuse4bsd/tools/genopnames.rb#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 7 15:46:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 908EF16A421; Sun, 7 Aug 2005 15:46:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6890216A41F for ; Sun, 7 Aug 2005 15:46:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCE7F43D5E for ; Sun, 7 Aug 2005 15:46:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77FkKDg096485 for ; Sun, 7 Aug 2005 15:46:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77FkIYv096482 for perforce@freebsd.org; Sun, 7 Aug 2005 15:46:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 15:46:18 GMT Message-Id: <200508071546.j77FkIYv096482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 15:46:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=81604 Change 81604 by rwatson@rwatson_peppercorn on 2005/08/07 15:45:57 Remove unused local variable. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_suidacl/mac_suidacl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_suidacl/mac_suidacl.c#2 (text+ko) ==== @@ -381,7 +381,6 @@ check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) { - int er; struct vattr *vap; vap = imgp->attr; From owner-p4-projects@FreeBSD.ORG Sun Aug 7 15:54:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0820D16A422; Sun, 7 Aug 2005 15:54:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAD9616A420 for ; Sun, 7 Aug 2005 15:54:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E2FC43D55 for ; Sun, 7 Aug 2005 15:54:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77FsVHe096895 for ; Sun, 7 Aug 2005 15:54:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77FsVeP096889 for perforce@freebsd.org; Sun, 7 Aug 2005 15:54:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 15:54:31 GMT Message-Id: <200508071554.j77FsVeP096889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 15:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=81605 Change 81605 by rwatson@rwatson_peppercorn on 2005/08/07 15:53:56 Replace clone_dev with clone_dev_cred, rather than supplementing it, in order to avoid multiple event handlers for device cloning. Requested by: phk Affected files ... .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#16 edit .. //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#13 edit .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewirereg.h#17 edit .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwdev.c#17 edit .. //depot/projects/trustedbsd/mac/sys/dev/nmdm/nmdm.c#14 edit .. //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#16 edit .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#17 edit .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer.c#13 edit .. //depot/projects/trustedbsd/mac/sys/dev/vkbd/vkbd.c#5 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#59 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#21 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#23 edit .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#39 edit .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#25 edit .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#33 edit .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#18 edit .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#16 (text+ko) ==== @@ -141,8 +141,8 @@ static struct targ_cmd_descr * targgetdescr(struct targ_softc *softc); static periph_init_t targinit; -static void targclone(void *arg, char *name, int namelen, - struct cdev **dev); +static void targclone(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **dev); static void targasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg); static void abort_all_pending(struct targ_softc *softc); @@ -1025,7 +1025,8 @@ } static void -targclone(void *arg, char *name, int namelen, struct cdev **dev) +targclone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { int u; ==== //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#13 (text+ko) ==== @@ -70,8 +70,8 @@ #define VCDEBUG if (vcdebug) printf /* for DEVFS, using bpf & tun drivers as examples*/ -static void coda_fbsd_clone(void *arg, char *name, int namelen, - struct cdev **dev); +static void coda_fbsd_clone(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **dev); static int codadev_modevent(module_t mod, int type, void *data) @@ -105,8 +105,9 @@ }; DECLARE_MODULE(codadev, codadev_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -static void coda_fbsd_clone(arg, name, namelen, dev) +static void coda_fbsd_clone(arg, cred, name, namelen, dev) void *arg; + struct ucred *cred; char *name; int namelen; struct cdev **dev; ==== //depot/projects/trustedbsd/mac/sys/dev/firewire/firewirereg.h#17 (text+ko) ==== @@ -303,7 +303,7 @@ void fw_drain_txq (struct firewire_comm *); int fwdev_makedev (struct firewire_softc *); int fwdev_destroydev (struct firewire_softc *); -void fwdev_clone (void *, char *, int, struct cdev **); +void fwdev_clone (void *, struct ucred *, char *, int, struct cdev **); extern int firewire_debug; extern devclass_t firewire_devclass; ==== //depot/projects/trustedbsd/mac/sys/dev/firewire/fwdev.c#17 (text+ko) ==== @@ -840,7 +840,8 @@ #if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #define NDEVTYPE 2 void -fwdev_clone(void *arg, char *name, int namelen, struct cdev **dev) +fwdev_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { struct firewire_softc *sc; char *devnames[NDEVTYPE] = {"fw", "fwmem"}; ==== //depot/projects/trustedbsd/mac/sys/dev/nmdm/nmdm.c#14 (text+ko) ==== @@ -104,7 +104,8 @@ static TAILQ_HEAD(,nm_softc) nmdmhead = TAILQ_HEAD_INITIALIZER(nmdmhead); static void -nmdm_clone(void *arg, char *name, int nameen, struct cdev **dev) +nmdm_clone(void *arg, struct ucred *cred, char *name, int nameen, + struct cdev **dev) { int i, unit; char *p; ==== //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#16 (text+ko) ==== @@ -114,7 +114,7 @@ static struct clonedevs *snpclones; static struct tty *snpdevtotty(struct cdev *dev); -static void snp_clone(void *arg, char *name, +static void snp_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev); static int snp_detach(struct snoop *snp); static int snp_down(struct snoop *snp); @@ -627,8 +627,9 @@ } static void -snp_clone(arg, name, namelen, dev) +snp_clone(arg, cred, name, namelen, dev) void *arg; + struct ucred *cred; char *name; int namelen; struct cdev **dev; ==== //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#17 (text+ko) ==== @@ -1123,7 +1123,8 @@ * if xN.i isn't busy, return its dev_t */ static void -dsp_clone(void *arg, char *name, int namelen, struct cdev **dev) +dsp_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { struct cdev *pdev; struct snddev_info *pcm_dev; ==== //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer.c#13 (text+ko) ==== @@ -486,7 +486,8 @@ #ifdef USING_DEVFS static void -mixer_clone(void *arg, char *name, int namelen, struct cdev **dev) +mixer_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { struct snddev_info *sd; ==== //depot/projects/trustedbsd/mac/sys/dev/vkbd/vkbd.c#5 (text+ko) ==== @@ -124,7 +124,8 @@ ***************************************************************************** *****************************************************************************/ -static void vkbd_dev_clone(void *, char *, int, struct cdev **); +static void vkbd_dev_clone(void *, struct ucred *, char *, int, + struct cdev **); static d_open_t vkbd_dev_open; static d_close_t vkbd_dev_close; static d_read_t vkbd_dev_read; @@ -152,7 +153,8 @@ /* Clone device */ static void -vkbd_dev_clone(void *arg, char *name, int namelen, struct cdev **dev) +vkbd_dev_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { int unit; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#59 (text+ko) ==== @@ -703,13 +703,10 @@ goto notfound; cdev = NULL; - EVENTHANDLER_INVOKE(dev_clone_cred, td->td_ucred, pname, - strlen(pname), &cdev); - if (cdev == NULL) { - EVENTHANDLER_INVOKE(dev_clone, pname, strlen(pname), &cdev); - if (cdev == NULL) - goto notfound; - } + EVENTHANDLER_INVOKE(dev_clone, td->td_ucred, pname, strlen(pname), + &cdev); + if (cdev == NULL) + goto notfound; devfs_populate(dmp); ==== //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#21 (text+ko) ==== @@ -720,7 +720,7 @@ ptc_drvinit(void *unused) { - EVENTHANDLER_REGISTER(dev_clone_cred, pty_clone, 0, 1000); + EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); } SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ptc_drvinit,NULL) ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#23 (text+ko) ==== @@ -52,7 +52,8 @@ } static void -ctty_clone(void *arg, char *name, int namelen, struct cdev **dev) +ctty_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { if (*dev != NULL) ==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#39 (text+ko) ==== @@ -121,7 +121,7 @@ static void filt_bpfdetach(struct knote *); static int filt_bpfread(struct knote *, long); static void bpf_drvinit(void *); -static void bpf_clone(void *, char *, int, struct cdev **); +static void bpf_clone(void *, struct ucred *, char *, int, struct cdev **); static d_open_t bpfopen; static d_close_t bpfclose; @@ -1602,8 +1602,9 @@ } static void -bpf_clone(arg, name, namelen, dev) +bpf_clone(arg, cred, name, namelen, dev) void *arg; + struct ucred *cred; char *name; int namelen; struct cdev **dev; ==== //depot/projects/trustedbsd/mac/sys/net/if_tap.c#25 (text+ko) ==== @@ -82,7 +82,8 @@ static int tapmodevent(module_t, int, void *); /* device */ -static void tapclone(void *, char *, int, struct cdev **); +static void tapclone(void *, struct ucred *, char *, int, + struct cdev **); static void tapcreate(struct cdev *); /* network interface */ @@ -231,8 +232,9 @@ * We need to support two kind of devices - tap and vmnet */ static void -tapclone(arg, name, namelen, dev) +tapclone(arg, cred, name, namelen, dev) void *arg; + struct ucred *cred; char *name; int namelen; struct cdev **dev; ==== //depot/projects/trustedbsd/mac/sys/net/if_tun.c#33 (text+ko) ==== @@ -114,7 +114,8 @@ static TAILQ_HEAD(,tun_softc) tunhead = TAILQ_HEAD_INITIALIZER(tunhead); SYSCTL_INT(_debug, OID_AUTO, if_tun_debug, CTLFLAG_RW, &tundebug, 0, ""); -static void tunclone(void *arg, char *name, int namelen, struct cdev **dev); +static void tunclone(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **dev); static void tuncreate(struct cdev *dev); static int tunifioctl(struct ifnet *, u_long, caddr_t); static int tuninit(struct ifnet *); @@ -143,7 +144,8 @@ }; static void -tunclone(void *arg, char *name, int namelen, struct cdev **dev) +tunclone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { int u, i; ==== //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#18 (text+ko) ==== @@ -99,7 +99,8 @@ static eventhandler_tag nsmb_dev_tag; static void -nsmb_dev_clone(void *arg, char *name, int namelen, struct cdev **dev) +nsmb_dev_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { int u; ==== //depot/projects/trustedbsd/mac/sys/sys/conf.h#27 (text+ko) ==== @@ -68,7 +68,7 @@ uid_t si_uid; gid_t si_gid; mode_t si_mode; - struct ucred *si_cred; + struct ucred *si_cred; /* cached clone-time credential */ u_int si_drv0; int si_refcount; LIST_ENTRY(cdev) si_list; @@ -279,15 +279,12 @@ #define GID_GAMES 13 #define GID_DIALER 68 -typedef void (*dev_clone_fn)(void *arg, char *name, int namelen, struct cdev **result); +typedef void (*dev_clone_fn)(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **result); int dev_stdclone(char *_name, char **_namep, const char *_stem, int *_unit); EVENTHANDLER_DECLARE(dev_clone, dev_clone_fn); -typedef void (*dev_clone_cred_fn)(void *arg, struct ucred *cred, char *name, - int namelen, struct cdev **result); -EVENTHANDLER_DECLARE(dev_clone_cred, dev_clone_cred_fn); - /* Stuff relating to kernel-dump */ struct dumperinfo { From owner-p4-projects@FreeBSD.ORG Sun Aug 7 20:25:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25D5416A42B; Sun, 7 Aug 2005 20:25:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8DA816A420 for ; Sun, 7 Aug 2005 20:25:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2A8244178 for ; Sun, 7 Aug 2005 20:03:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77K3lvG013190 for ; Sun, 7 Aug 2005 20:03:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77K3bnV013110 for perforce@freebsd.org; Sun, 7 Aug 2005 20:03:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 20:03:37 GMT Message-Id: <200508072003.j77K3bnV013110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 20:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=81611 Change 81611 by rwatson@rwatson_zoo on 2005/08/07 20:03:02 Integrate TrustedBSD base branch: - geom_eli - geom_zero - bsdiff/bsdpatch - delete target sfor old libs/etc - bind0 update - libpcap update - tcpdump update - libmemstat - MPSAFE flag cleanup and scrubbery in emulators. - subr_stack.c - compat_freebsd5 - drm update - if_ed re-if_ed'd - acpi battery newbus methods - if_addr_mtx, in_multi_mtx - sparc64 frame buffer work - if_gem mpsafe - sound driver locking, etc. - loop back of dev_clone_cred and MAC Framework changes to support credential access on cloned devices. - MAC Framework policy ABI version 3 - malloc(9) + uma(9) + mbuf(9) changes to support libmemstat - various SMP VFS bug fixes - if_de locking, scrubbing, etc. - bpfstat - much network stack de-spling. - natm locking, mpsafe - beginnings of nfsclient mpsafety - if_pcn locking Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#31 integrate .. //depot/projects/trustedbsd/base/Makefile#40 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#63 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/base/UPDATING#57 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#11 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.2#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#13 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#13 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/FILES#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL.txt#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.septel#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-gifc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-glifc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/inet.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/nametoaddr.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-namedb.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-nit.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-pf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snit.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snoop.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#7 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/opie/libopie/readrec.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opie/libopie/writerec.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.os.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pflog.4#6 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/dumptree.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/acconfig.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/atm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip6.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pcap-missing.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bfd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cnfp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-decnet.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-domain.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-esp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-frag6.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-hsrp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igrp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6opts.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobility.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mpls.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ntp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pppoe.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rt6.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-snmp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunrpc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vrrp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-zephyr.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#43 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#46 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#31 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#29 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#13 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/encswap#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/gbde_swap#3 delete .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#19 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#12 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#21 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#15 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/bc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#26 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/Makefile#2 integrate .. //depot/projects/trustedbsd/base/include/Makefile#47 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#11 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#37 integrate .. //depot/projects/trustedbsd/base/lib/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/config.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#5 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive-formats.5#6 integrate .. //depot/projects/trustedbsd/base/lib/libautofs/libautofs.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libbegemot/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libbz2/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sem_post.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sem_wait.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iscntrl.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isdigit.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isgraph.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/islower.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isprint.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ispunct.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isspace.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isupper.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isxdigit.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/nextwctype.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rpmatch.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/tolower.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/toupper.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_rth_space.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_pton.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ip6opt.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmd.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rthdr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_entry.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_prepare.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/uuidgen.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libcam/camlib.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libedit/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libedit/el.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libedit/map.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libedit/tokenizer.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libexpat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libftpio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libgpib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libkiconv/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libkiconv/xlat16_iconv.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/libmemstat.3#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat.c#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat.h#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_all.c#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_internal.h#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_malloc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_uma.c#1 branch .. //depot/projects/trustedbsd/base/lib/libmp/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libncp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libngatm/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libopie/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libpam/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libradius/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libtacplus/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libusbhid/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libvgl/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/liby/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libypclnt/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libz/inftrees.h#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#15 integrate .. //depot/projects/trustedbsd/base/release/Makefile#67 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#93 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#16 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atmconfig/diag.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#13 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.h#5 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.hh#3 integrate .. //depot/projects/trustedbsd/base/sbin/devd/parse.y#5 integrate .. //depot/projects/trustedbsd/base/sbin/devd/token.l#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/tables.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#24 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#23 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggated/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggated/ggated.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatel/ggatel.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#30 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#26 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.h#9 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/mount_ext2fs/mount_ext2fs.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/boot_i386.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/restore/interactive.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/routed/input.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/startslip/startslip.1#6 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.8#15 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#24 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#17 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/doc/IPv6/IMPLEMENTATION#5 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/px/Makefile#4 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig1.1.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig1.2.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig1.3.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig2.3.raw#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig2.4.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig3.2.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/fig3.3.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/pxin0.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/pxin1.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/pxin2.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/pxin3.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/pxin4.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/table2.1.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/table2.2.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/table2.3.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/table3.1.n#2 delete .. //depot/projects/trustedbsd/base/share/doc/papers/px/tmac.p#2 delete .. //depot/projects/trustedbsd/base/share/doc/usd/18.msdiffs/ms.diffs#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#58 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#23 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_thermal.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_video.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/agp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/an.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aue.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/awi.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/axe.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bfe.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cdce.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cm.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cue.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dc.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/de.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ed.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/em.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/en.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwe.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwip.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fxp.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gif.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hme.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/inet.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipw.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/kue.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/led.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lge.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_asus.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_fujitsu.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_panasonic.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_toshiba.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/arl.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cp.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cs.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cx.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/el.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ep.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ex.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/fe.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ie.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/lnc.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/mse.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/pbio.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/pnp.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/pnpbios.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ray.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/snc.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/vx.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/snd_audiocs.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/my.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/natm.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_ccatm.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nge.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nve.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/oldcard.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcn.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/psm.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/re.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rl.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rue.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sf.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sis.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sk.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sn.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_es137x.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ess.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ste.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ti.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tl.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twe.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tx.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/txp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/udav.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhid.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ural.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vge.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vkbd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vr.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wb.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/witness.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/xe.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/xl.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/man/man5/devfs.conf.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/disktab.5#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#49 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#8 integrate .. //depot/projects/trustedbsd/base/share/man/man7/development.7#7 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ffs.7#9 integrate .. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#12 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#14 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#44 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS_START.9#7 delete .. //depot/projects/trustedbsd/base/share/man/man9/bios.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_get_softc.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ifnet.9#17 integrate .. //depot/projects/trustedbsd/base/share/man/man9/printf.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vhold.9#4 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#22 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#25 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#26 integrate .. //depot/projects/trustedbsd/base/share/termcap/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/termcap/map3270#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_trace.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#31 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#36 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC.hints#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/atomic.h#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_proto.h#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_syscall.h#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysent.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.master#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sys_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus_dma.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/clock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/endian.h#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/console.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#26 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#22 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_copy.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4.h#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ipc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#62 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#88 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#62 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdDebug.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdHardware.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdInterrupt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdMemory.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdStream.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSynch.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdTable.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_acad.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cmbat.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_package.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpiio.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_isa.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_isa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_cmdbuf.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/eisa/eisaconf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_epreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_epvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_ex.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_ex_pccard.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/creator.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemvar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbdmux/kbdmux.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/fc_log.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#13 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.h#8 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/owi/if_owi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/owi/if_owi_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccardvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbreg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdq_ifsubr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbsh/if_sbsh.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn_pccard.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/ositech.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/snc/dp83932.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ess.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb8.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sbc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/als4000.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/fake.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_fmt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/mixer.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_ebus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_cpu_sparc64.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hs.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/vx/if_vx.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/xe/if_xe.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/xe/if_xe_pccard.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#37 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_crypt.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/gate/g_gate.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#27 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smapi_bios.S#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/smbios.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#50 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#58 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/bios.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/exception.s#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/geode.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#51 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#41 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#42 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ipc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.master#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/atomic.h#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_pir.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#33 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/db_trace.c#14 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/exception.S#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/interrupt.c#24 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#54 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#46 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#35 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#40 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/ia64_cpu.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/param.h#13 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/proc.h#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/smp.h#6 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_pmc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_hints.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_kobj.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mchain.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_stack.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#65 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#54 integrate .. //depot/projects/trustedbsd/base/sys/libkern/iconv.c#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#66 integrate .. //depot/projects/trustedbsd/base/sys/modules/de/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/ed/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/ep/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/kbdmux/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mpt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/slhci/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/ukbd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#35 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#15 integrate .. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#38 integrate .. //depot/projects/trustedbsd/base/sys/net/if_arcsubr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#43 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fddisubr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_iso88025subr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#32 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_parse.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet/icmp6.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip6.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#44 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.h#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_cksum.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/mld6.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/route6.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/scope6.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_output.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netkey/key.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm_pcb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm_proto.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_rq.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfs/nfs_common.c#10 integrate .. //depot/projects/trustedbsd/base/sys/nfs/nfs_common.h#6 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs.h#19 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#28 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#19 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#30 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_subs.c#21 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#12 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 7 21:14:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC7BA16A439; Sun, 7 Aug 2005 21:14:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 430F116A46E for ; Sun, 7 Aug 2005 21:14:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71F9B43E22 for ; Sun, 7 Aug 2005 20:44:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77KiffN026395 for ; Sun, 7 Aug 2005 20:44:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77KicAV026392 for perforce@freebsd.org; Sun, 7 Aug 2005 20:44:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Aug 2005 20:44:38 GMT Message-Id: <200508072044.j77KicAV026392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2005 21:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=81614 Change 81614 by rwatson@rwatson_zoo on 2005/08/07 20:44:03 Integrate TrustedBSD MAC branch: - geom_eli - geom_zero - bsdiff/bsdpatch - delete target sfor old libs/etc - bind0 update - libpcap update - tcpdump update - libmemstat - MPSAFE flag cleanup and scrubbery in emulators. - subr_stack.c - compat_freebsd5 - drm update - if_ed re-if_ed'd - acpi battery newbus methods - if_addr_mtx, in_multi_mtx - sparc64 frame buffer work - if_gem mpsafe - sound driver locking, etc. - loop back of dev_clone_cred and MAC Framework changes to support credential access on cloned devices. - MAC Framework policy ABI version 3 - malloc(9) + uma(9) + mbuf(9) changes to support libmemstat - various SMP VFS bug fixes - if_de locking, scrubbing, etc. - bpfstat - much network stack de-spling. - natm locking, mpsafe - beginnings of nfsclient mpsafety - if_pcn locking Probably doesn't quite build/etc in this pass. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#28 integrate .. //depot/projects/trustedbsd/mac/Makefile#35 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#58 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#1 branch .. //depot/projects/trustedbsd/mac/UPDATING#49 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.2#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#13 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CREDITS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/FILES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/INSTALL.txt#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/README.septel#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/VERSION#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/config.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-gifc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-glifc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/grammar.y#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/inet.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/nametoaddr.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dlpi.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-int.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-linux.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-namedb.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-nit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-pf.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snoop.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/savefile.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/scanner.l#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/opie/libopie/readrec.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/opie/libopie/writerec.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.os.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pflog.4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pfctl/pfctl.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/dumptree.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CREDITS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/FILES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/VERSION#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/acconfig.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/addrtoname.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/interface.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ip6.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pcap-missing.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bgp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bootp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cnfp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-decnet.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-domain.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-esp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ether.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-frag6.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-hsrp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp6.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igrp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6opts.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isoclns.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-l2tp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-llc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobility.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mpls.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-nfs.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ntp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-null.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ospf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pim.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ppp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pppoe.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rt6.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sll.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-smb.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-snmp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-stp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunrpc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-vrrp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-zephyr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/smbutil.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/util.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#44 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#42 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#15 integrate .. //depot/projects/trustedbsd/mac/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#37 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#27 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/bgfsck#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/encswap#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde_swap#3 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/power_profile#5 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#19 integrate .. //depot/projects/trustedbsd/mac/games/fortune/fortune/fortune.c#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libg2c/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/bc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#24 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#50 integrate .. //depot/projects/trustedbsd/mac/include/netdb.h#11 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#36 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/config.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#5 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/libarchive-formats.5#5 integrate .. //depot/projects/trustedbsd/mac/lib/libautofs/libautofs.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libbegemot/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libbz2/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getnetgrent.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sem_post.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sem_wait.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/usleep.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isalnum.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isalpha.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isblank.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iscntrl.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isdigit.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isgraph.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/islower.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isprint.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ispunct.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isspace.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isupper.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isxdigit.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/nextwctype.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rpmatch.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/tolower.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/toupper.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_rth_space.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/ip6opt.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/rcmd.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/rthdr.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_get_entry.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_prepare.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mmap.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/uuidgen.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libcam/camlib.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/el.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/map.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libedit/tokenizer.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libexpat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/lib/libftpio/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libgpib/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libkiconv/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libkiconv/xlat16_iconv.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libmagic/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libmemstat/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/libmemstat.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_all.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_internal.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_malloc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_uma.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmp/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libncp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/lib/libnetgraph/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libngatm/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libopie/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/pthread.map#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/sys/lock.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sleep.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/lib/libtacplus/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_syscalls.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libusbhid/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/lib/libvgl/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libwrap/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/liby/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libypclnt/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inftrees.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#64 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#80 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#15 integrate .. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/atm/atmconfig/diag.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#13 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.cc#10 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.h#5 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.hh#3 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/parse.y#5 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/token.l#6 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/tables.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/dump.8#22 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#21 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggated/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggated/ggated.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatel/ggatel.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#29 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#26 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.h#10 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/boot_i386.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/interactive.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/routed/input.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/startslip/startslip.1#5 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.8#14 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssl/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/doc/IPv6/IMPLEMENTATION#5 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/px/Makefile#4 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig1.1.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig1.2.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig1.3.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig2.3.raw#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig2.4.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig3.2.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/fig3.3.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/pxin0.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/pxin1.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/pxin2.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/pxin3.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/pxin4.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/table2.1.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/table2.2.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/table2.3.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/table3.1.n#2 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/px/tmac.p#2 delete .. //depot/projects/trustedbsd/mac/share/doc/usd/18.msdiffs/ms.diffs#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/fpgetround.3#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#54 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#20 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi_thermal.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi_video.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/agp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/an.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aue.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/awi.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/axe.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bfe.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bge.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cdce.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cm.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cue.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dc.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/de.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ed.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/em.4#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/en.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwe.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwip.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fxp.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gif.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hme.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipw.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iwi.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/kbdmux.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/kue.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/led.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lge.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_asus.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_fujitsu.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_panasonic.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_toshiba.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/arl.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cp.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cs.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cx.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/el.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ep.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ex.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/fe.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ie.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/lnc.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/mse.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/pbio.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/pnp.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/pnpbios.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ray.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/vx.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/snd_audiocs.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/my.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/natm.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_ccatm.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nge.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nve.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/oldcard.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcn.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/psm.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ral.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/re.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/rl.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/rue.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sf.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sis.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sk.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sn.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_es137x.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ess.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ste.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ti.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tl.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twe.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tx.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/txp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/udav.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uhid.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uplcom.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ural.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vge.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vkbd.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vr.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wb.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#20 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/witness.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/xe.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/xl.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/devfs.conf.5#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/disktab.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#41 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/build.7#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/development.7#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ffs.7#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/security.7#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#42 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VFS.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VFS_START.9#7 delete .. //depot/projects/trustedbsd/mac/share/man/man9/bios.9#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/device_get_softc.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ifnet.9#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/printf.9#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vhold.9#4 integrate .. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#21 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#22 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#24 integrate .. //depot/projects/trustedbsd/mac/share/termcap/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/termcap/map3270#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#35 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC.hints#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/atomic.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_proto.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_syscall.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_sysent.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/syscalls.master#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/vm_machdep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus_dma.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/clock.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/endian.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/console.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#15 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#29 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/boot2.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/ofw_copy.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ipc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_proto.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#67 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#120 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.mk#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/newvers.sh#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#77 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdHardware.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdInterrupt.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdMemory.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdStream.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSynch.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdTable.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_acad.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_battery.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cmbat.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_package.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pci_link.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_thermal.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpiio.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adv_isa.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drmP.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/r300_cmdbuf.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/r300_reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_cp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drm.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_state.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/eisa/eisaconf.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/README#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_epreg.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_epvar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex_pccard.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/creator.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem_pci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gemvar.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichsmb/ichsmb.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichsmb/ichsmb_pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbdmux/kbdmux.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.c#11 delete .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.h#7 delete .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/owi/if_owi.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/owi/if_owi_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard_cis.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard_cis.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccardvar.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbreg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbvar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pdq/pdq_ifsubr.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbsh/if_sbsh.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_pccard.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/ositech.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/snc/dp83932.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/ad1816.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/ess.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/mss.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sb8.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sbc.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/als4000.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/cmi.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/es137x.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/buffer.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/channel.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/fake.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_fmt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/txp/if_txp.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus_ebus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_cpu_sparc64.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_axe.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_rue.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/sl811hs.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vkbd/vkbd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe_pccard.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#60 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_conv.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde_crypt.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/gate/g_gate.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi_bios.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/smbios.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#43 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#56 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/PAE#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/bios.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/db_trace.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/exception.s#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_ipc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_proto.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/atomic.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_proto.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysent.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_pir.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#32 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/db_trace.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/interrupt.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/ia64_cpu.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/param.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/proc.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/smp.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/isa/isa_common.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lock.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#446 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_pmc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_hints.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_kobj.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mchain.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_stack.c#1 branch .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf2.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#67 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#76 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#78 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/iconv.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#81 integrate .. //depot/projects/trustedbsd/mac/sys/modules/de/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ed/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ep/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/geom/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/kbdmux/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/mpt/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/slhci/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ukbd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridge.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#33 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_crypto.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_parse.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_socket.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/icmp6.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip6.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/icmp6.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_cksum.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_mroute.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/raw_ip6.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/scope6.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netkey/key.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_pcb.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_proto.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_rq.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/nfs/nfs_common.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfs/nfs_common.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#32 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 8 06:48:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95FA816A421; Mon, 8 Aug 2005 06:48:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 574CC16A41F for ; Mon, 8 Aug 2005 06:48:55 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18C0443D45 for ; Mon, 8 Aug 2005 06:48:55 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j786msEF088895 for ; Mon, 8 Aug 2005 06:48:54 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j786msem088892 for perforce@freebsd.org; Mon, 8 Aug 2005 06:48:54 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 8 Aug 2005 06:48:54 GMT Message-Id: <200508080648.j786msem088892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 06:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=81632 Change 81632 by soc-cjones@soc-cjones_ishtar on 2005/08/08 06:48:06 Renaming volumes now works, both recursively and non-. Next up, drives, subdisks, and plexes. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#3 (text+ko) ==== @@ -180,11 +180,58 @@ int err; struct gv_plex *p; struct gv_sd *s; + char oldvolname[GV_MAXVOLNAME]; + char oldplexname[GV_MAXPLEXNAME]; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_vol: NULL v")); - printf("gv_rename_vol:\n"); + printf("gv_rename_vol: flags = %x\n", flags); + + /* Rename the volume. We need to hold on to the old volume name. */ + strncpy(oldvolname, v->name, GV_MAXVOLNAME); + printf("Renaming volume %s to %s\n", v->name, newname); + strncpy(v->name, newname, GV_MAXVOLNAME); + + /* Rename the associated plexes. For each plex, iterate across + list of all subdisks and check to see if its plex is the one + we're renaming. Yes, this is icky and O(N_{plexes} x N_{sds}), + but it works. */ + + LIST_FOREACH(p, &sc->plexes, plex) { + if (!strncmp(p->volume, oldvolname, GV_MAXVOLNAME)) { + strncpy(p->volume, v->name, GV_MAXVOLNAME); + if (flags && GV_FLAG_R) { + char plexnumber[GV_MAXPLEXNAME]; + char *pplexnumber = plexnumber; + printf("Modifying plex %s, p->volume = %s\n", p->name, p->volume); + strncpy(oldplexname, p->name, GV_MAXPLEXNAME); + strncpy(plexnumber, p->name, GV_MAXPLEXNAME); + strsep(&pplexnumber, "."); + printf("Renaming plex %s to %s.%s\n", p->name, v->name, pplexnumber); + snprintf(p->name, GV_MAXPLEXNAME, "%s.%s", v->name, pplexnumber); + LIST_FOREACH(s, &sc->subdisks, sd) { + if (!strncmp(s->plex, oldplexname, GV_MAXPLEXNAME)) { + char sdnumber[GV_MAXSDNAME]; + char *psdnumber = sdnumber; + printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); + strncpy(sdnumber, s->name, GV_MAXSDNAME); + strsep(&psdnumber, "."); + strsep(&psdnumber, "."); + printf("Renaming subdisk %s to %s.%s\n", s->name, p->name, psdnumber); + snprintf(s->name, GV_MAXSDNAME, "%s.%s", p->name, psdnumber); + strncpy(s->plex, p->name, GV_MAXPLEXNAME); + } else { + printf("Ignoring subdisk %s, s->plex = %s\n", s->name, s->plex); + } + } + } + } else { + printf("Ignoring plex %s, p->volume = %s\n", p->name, p->volume); + } + } + + printf("Debugging output:\n"); printf("\tsc = %p\n", sc); printf("\treq = %p\n", req); printf("\tv = %p\n", v); @@ -193,23 +240,25 @@ printf("\t\tv->plexcount = %d\n", v->plexcount); printf("\tnewname = \"%s\"\n", newname); printf("\tflags = %x\n", flags); - - printf("iterating across plexes list...\n"); - LIST_FOREACH(p, &v->plexes, plex) { - if (strcmp(p->volume, v->name)) { - continue; /* Not a plex we're looking for. */ + + LIST_FOREACH(p, &sc->plexes, plex) { + if (!strncmp(p->volume, v->name, GV_MAXVOLNAME)) { + printf("\tp->name = %s\n", p->name); + printf("\tp->size = %d\n", (int) p->size); + printf("\tp->volume = %s\n", p->volume); + printf("\tp->sdcount = %d\n", p->sdcount); + printf("\tp->sddown = %d\n", p->sddown); + LIST_FOREACH(s, &sc->subdisks, sd) { + if (!strncmp(s->plex, p->name, GV_MAXPLEXNAME)) { + printf("\t\ts->name = %s\n", s->name); + printf("\t\ts->size = %d\n", (int) s->size); + printf("\t\ts->drive = %s\n", s->drive); + printf("\t\ts->plex = %s\n", s->plex); + } + } } - printf("\tp->name = %s\n", p->name); - printf("\tp->size = %d\n", (int) p->size); - printf("\tp->volume = %s\n", p->volume); -/* LIST_FOREACH(s, &p->subdisks, sd) { - printf("\t\ts->name = %s\n", s->name); - printf("\t\ts->size = %d\n", (int) s->size); - printf("\t\ts->drive = %s\n", s->drive); - printf("\t\ts->plex = %s\n", s->plex); - } */ } + printf("\n\n"); return (0); - } From owner-p4-projects@FreeBSD.ORG Mon Aug 8 07:46:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 614A016A421; Mon, 8 Aug 2005 07:46:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1174116A41F for ; Mon, 8 Aug 2005 07:46:07 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B283143D45 for ; Mon, 8 Aug 2005 07:46:06 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j787k6VE093343 for ; Mon, 8 Aug 2005 07:46:06 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j787k68P093340 for perforce@freebsd.org; Mon, 8 Aug 2005 07:46:06 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 8 Aug 2005 07:46:06 GMT Message-Id: <200508080746.j787k68P093340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 07:46:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=81635 Change 81635 by soc-bushman@soc-bushman_stinger on 2005/08/08 07:46:01 cached in working condition, cachelib is going to be multipart Affected files ... .. //depot/projects/soc2005/nsswitch_cached/cached/Makefile#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/cached.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/config.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/config.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/debug.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/debug.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/log.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/log.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/protocol.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/cached/protocol.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/cached/query.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/query.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/singletons.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/cached/singletons.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/cachelib.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/cachelib_test.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/hashfuncs.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/hashfuncs.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/hashtable.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/hashtable.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/include/cachelib.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/policies.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/cachelib_test/policies.h#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/cached/Makefile#3 (text+ko) ==== @@ -4,10 +4,10 @@ PROGNAME=cached MAN= -SRCS=cached.c debug.c log.c config.c query.c singletons.c protocol.c +SRCS=cached.c debug.c log.c config.c query.c singletons.c protocol.c parser.c CFLAGS+= -I${.CURDIR}/../ WARNS?=2 -LDADD+=${.CURDIR}/../cachelib/libcachelib.a +LDADD+=${.CURDIR}/../cachelib/libcachelib.a -lm STRIP= .include ==== //depot/projects/soc2005/nsswitch_cached/cached/cached.c#3 (text+ko) ==== @@ -27,14 +27,28 @@ static cache init_cache_(struct configuration *config) { - struct cache_params params; + struct cache_params params; cache retval; + + struct configuration_entry *config_entry; + size_t size, i; TRACE_IN(init_cache_); + memset(¶ms, 0, sizeof(struct cache_params)); - params.num_levels = 2; + params.num_levels = 2; + retval = init_cache(¶ms); - retval = init_cache(¶ms); +/* memset(&entry_params, 0, sizeof(struct common_cache_entry_params)); + entry_params.entry_type = CEL_COMMON; + entry_params.entry_name = "users"; + entry_params.policy = CPT_FIFO; + register_cache_entry(retval, (struct cache_entry_params *)&entry_params);*/ + size = configuration_get_entries_size(config); + for (i = 0; i < size; ++i) { + config_entry = configuration_get_entry(config, i); + register_cache_entry(retval, config_entry->c_params); + } TRACE_OUT(init_cache_); return (retval); @@ -118,12 +132,15 @@ struct sockaddr addr; size_t addr_len; int fd; + int res; TRACE_IN(accept_connection); addr_len = sizeof(struct sockaddr); fd = accept(event_data->ident, &addr, &addr_len); if (fd == -1) { /* do something */ + TRACE_POINT(); + return; } qstate = init_query_state(fd, sizeof(int)); @@ -133,7 +150,9 @@ NOTE_LOWAT, qstate->kevent_watermark, qstate); EV_SET(&eventlist[1], fd, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, config->query_timeout, qstate); - kevent(env->queue, eventlist, 2, NULL, 0, &timeout); + res = kevent(env->queue, eventlist, 2, NULL, 0, &timeout); + TRACE_INT(res); + TRACE_INT(fd); TRACE_OUT(accept_connection); } @@ -142,25 +161,54 @@ process_socket_event(struct kevent *event_data, struct runtime_env *env, struct configuration *config) { - struct kevent eventlist[1]; + struct kevent eventlist[2]; struct timespec timeout; int nevents; + int res; + struct query_state *qstate; TRACE_IN(process_socket_event); memset(&timeout, 0, sizeof(struct timespec)); + TRACE_INT(event_data->ident); EV_SET(&eventlist[0], event_data->ident, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); nevents = kevent(env->queue, eventlist, 1, NULL, 0, &timeout); if (nevents == -1) { if (errno == ENOENT) { /* the timer is already handling this event */ + TRACE_POINT(); + TRACE_OUT(process_socket_event); return; } else { /* some other error happened */ + TRACE_POINT(); + TRACE_OUT(process_socket_event); return; } } + qstate = (struct query_state *)event_data->udata; + do { + res = qstate->process_func(qstate); + } while ((qstate->kevent_watermark == 0) && + (qstate->process_func != NULL) && + (res == 0)); + + TRACE_INT(qstate->kevent_watermark); + TRACE_PTR(qstate->process_func); + if ((qstate->process_func == NULL) || (res != 0)) { + destroy_query_state(qstate); + TRACE_POINT(); + TRACE_OUT(process_socket_event); + return; + } + + EV_SET(&eventlist[0], event_data->ident, qstate->kevent_filter, + EV_ADD | EV_ONESHOT, NOTE_LOWAT, qstate->kevent_watermark, qstate); + EV_SET(&eventlist[1], event_data->ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, + 0, config->query_timeout, qstate); + kevent(env->queue, eventlist, 2, NULL, 0, &timeout); + TRACE_OUT(process_socket_event); } @@ -221,6 +269,9 @@ int main(int argc, char *argv[]) { + char const *error_str; + int error_line; + int res; /* startup output */ print_version_info(); @@ -228,6 +279,16 @@ s_configuration = init_configuration(); fill_configuration_defaults(s_configuration); + error_str = NULL; + error_line = 0; + res = read_configuration("cached.conf", s_configuration, &error_str, &error_line); + if (res != 0) { + printf("error in configuration file(%s, %d): %s\n", "cached.conf", + error_line, error_str); + destroy_configuration(s_configuration); + return (-1); + } + /* cache initialization */ s_cache = init_cache_(s_configuration); ==== //depot/projects/soc2005/nsswitch_cached/cached/config.c#3 (text+ko) ==== @@ -1,12 +1,385 @@ #include "config.h" #include +#include #include #include #include "debug.h" +#include "parser.h" +#define INITIAL_ENTRIES_CAPACITY 8 #define DEFAULT_SOCKET_PATH "/tmp/cached" +static int configuration_entry_cmp(const void *, const void *); +static struct configuration_entry *create_configuration_entry(const char *, + uid_t, int, struct cache_entry_params const *); +static void destroy_configuration_entry(struct configuration_entry *); +static int add_configuration_entry(struct configuration *, + struct configuration_entry *); + +static int process_root_parser_pair(struct configuration *, struct parser_pair_ *, char const **, int *); +static int process_parser_common_group_pair(struct common_cache_entry_params *, struct parser_pair_ *, char const **, int *); +static int process_parser_mp_group_pair(struct mp_cache_entry_params *, struct parser_pair_ *, char const **, int *); +static int process_parser_group(struct configuration *, struct parser_group_ *, char const **, int *); + +static int +configuration_entry_cmp(const void *e1, const void *e2) +{ + struct configuration_entry *entry1; + struct configuration_entry *entry2; + int res; + + entry1 = (struct configuration_entry *)e1; + entry2 = (struct configuration_entry *)e2; + + res = strcmp(entry1->name, entry2->name); + if (res == 0) { + if ((entry1->use_desired_euid == 0) && (entry2->use_desired_euid != 0)) + return (-1); + else if ((entry1->use_desired_euid != 0) && (entry2->use_desired_euid == 0)) + return (1); + else if ((entry1->use_desired_euid != 0) && (entry2->use_desired_euid != 0)) + return (entry1->desired_euid - entry2->desired_euid); + else + return (0); + } + + return (res); +} + +static struct configuration_entry * +create_configuration_entry(const char *name, uid_t desired_euid, int use_desired_euid, + struct cache_entry_params const *params) +{ + struct configuration_entry *retval; + size_t size; + + TRACE_IN(create_configuration_entry); + assert(name != NULL); + + switch (params->entry_type) { + case CEL_COMMON: + size = sizeof(struct common_cache_entry_params); + break; + case CEL_MULTIPART: + size = sizeof(struct mp_cache_entry_params); + break; + default: + assert(0); + TRACE_OUT(create_configuration_entry); + return (NULL); + } + + retval = (struct configuration_entry *)malloc(sizeof(struct configuration_entry)); + assert(retval != NULL); + memset(retval, 0, sizeof(struct configuration_entry)); + + retval->c_params = (struct cache_entry_params *)malloc(size); + assert(retval->c_params != NULL); + memcpy(retval->c_params, params, size); + + size = strlen(name); + retval->name = (char *)malloc(size + 1); + assert(retval->name != NULL); + memset(retval->name, 0, size + 1); + strncpy(retval->name, name, size); + + if (use_desired_euid == 0) + retval->c_params->entry_name = retval->name; + else { + size = strlen(name) + floor(log(desired_euid)) + 1; + retval->c_params->entry_name = (char *)malloc(size + 1); + assert(retval->c_params->entry_name != NULL); + memset(retval->c_params->entry_name, 0, size + 1); + snprintf(retval->c_params->entry_name, size, "%s_%d", name, desired_euid); + } + + retval->desired_euid = desired_euid; + retval->use_desired_euid = use_desired_euid; + + TRACE_OUT(create_configuration_entry); + return (retval); +} + +static void +destroy_configuration_entry(struct configuration_entry *entry) +{ + TRACE_IN(destroy_configuration_entry); + assert(entry != NULL); + free(entry->name); + if (entry->use_desired_euid != 0) + free(entry->c_params->entry_name); + free(entry->c_params); + free(entry); + TRACE_OUT(destroy_configuration_entry); +} + +static int +add_configuration_entry(struct configuration *config, + struct configuration_entry *entry) +{ + TRACE_IN(add_configuration_entry); + if (config->entries_size == config->entries_capacity) { + struct configuration_entry **new_entries; + + config->entries_capacity *= 2; + new_entries = (struct configuration_entry **)malloc( + sizeof(struct configuration_entry *) * config->entries_capacity); + assert(new_entries != NULL); + memset(new_entries, 0, sizeof(struct configuration_entry *) * + config->entries_capacity); + memcpy(new_entries, config->entries, sizeof(struct configuration_entry *) * + config->entries_size); + + free(config->entries); + config->entries = new_entries; + } + + config->entries[config->entries_size++] = entry; + qsort(config->entries, config->entries_size, sizeof(struct configuration_entry *), + configuration_entry_cmp); + + TRACE_OUT(add_configuration_entry); + return (0); +} + +static int +process_root_parser_pair(struct configuration *config, struct parser_pair_ *pair, + char const **error_str, int *error_line) +{ + char *endp; + long l; + size_t size; + int res; + + TRACE_IN(process_root_parser_pair); + assert(config != NULL); + assert(pair != NULL); + + res = 0; + if (strcmp(pair->key, "socket_path") == 0) { + free(config->socket_path); + + size = strlen(pair->value); + config->socket_path = (char *)malloc(size + 1); + memset(config->socket_path, 0, size + 1); + strncpy(config->socket_path, pair->value, size); + } else if (strcmp(pair->key, "query_timeout") == 0) { + l = strtol(pair->value, &endp, 10); + if ((*endp == '\0') && (l >= 0)) + config->query_timeout = l; + else { + *error_str = "query timeout must be a positive integer"; + *error_line = pair->fline; + res = -1; + } + } else { + *error_str = "unknown parameter"; + *error_line = pair->fline; + res = -1; + } + + TRACE_OUT(process_root_parser_pair); + return (res); +} + +static int +process_parser_common_group_pair(struct common_cache_entry_params *params, + struct parser_pair_ *pair, char const **error_str, int *error_line) +{ + char *endp; + long l; + int res; + + TRACE_IN(process_parser_common_group_pair); + res = 0; + if (strcmp(pair->key, "policy") == 0) { + if (strcmp(pair->value, "fifo") == 0) { + params->policy = CPT_FIFO; + } else if (strcmp(pair->value, "lru") == 0) { + params->policy = CPT_LRU; + } else if (strcmp(pair->value, "lfu") == 0) { + params->policy = CPT_LFU; + } else { + *error_str = "policy must be one of 'fifo', 'lru' or 'lfu' values"; + *error_line = pair->fline; + res = -1; + } + } else if (strcmp(pair->key, "max_lifetime") == 0) { + l = strtol(pair->value, &endp, 10); + if ((*endp == '\0') && (l >= 0)) { + params->max_lifetime.tv_sec = l; + } else { + *error_str = "max_lifetime must be a positive integer"; + *error_line = pair->fline; + res = -1; + } + } else if (strcmp(pair->key, "max_elemsize") == 0) { + l = strtol(pair->value, &endp, 10); + if ((*endp == '\0') && (l >= 0)) { + params->max_elemsize = l; + } else { + *error_str = "max_elemsize must be a positive integer"; + *error_line = pair->fline; + res = -1; + } + } else { + *error_str = "unexpected parameter"; + *error_line = pair->fline; + res = -1; + } + + TRACE_OUT(process_parser_common_group_pair); + return (res); +} + +static int +process_parser_mp_group_pair(struct mp_cache_entry_params *params, + struct parser_pair_ *pair, char const **error_str, int *error_line) +{ + int res; + + TRACE_IN(process_parser_mp_group_pair); + res = -1; + TRACE_OUT(process_parser_mp_group_pair); + + return (res); +} + +static int +process_parser_group(struct configuration *config, struct parser_group_ *group, + char const **error_str, int *error_line) +{ + char *endp; + long l; + + struct configuration_entry *config_entry; + struct cache_entry_params *params; + uid_t desired_euid; + int use_desired_euid; + + struct parser_pair_ *pair; + size_t size, i; + int res; + + TRACE_IN(process_parser_group); + assert(config != NULL); + assert(group != NULL); + + res = 0; + params = NULL; + desired_euid = -1; + use_desired_euid = 0; + size = parser_group_get_pairs_size(group); + if (size > 1) { + pair = parser_group_get_pair(group, 0); + if (strcmp(pair->key, "type") == 0) { + TRACE_STR(pair->value); + if (strcmp(pair->value, "common") == 0) { + params = (struct cache_entry_params *)malloc(sizeof( + struct common_cache_entry_params)); + assert(params != NULL); + memset(params, 0, sizeof(struct common_cache_entry_params)); + + params->entry_type = CEL_COMMON; + } else if (strcmp(pair->value, "multipart") == 0) { + params = (struct cache_entry_params *)malloc(sizeof( + struct mp_cache_entry_params)); + assert(params != NULL); + memset(params, 0, sizeof(struct mp_cache_entry_params)); + + params->entry_type = CEL_MULTIPART; + } else { + *error_str = "entry type must be one of 'common' and 'multipart' values"; + *error_line = pair->fline; + res = -1; + goto fin; + } + } else { + *error_str = "'type' parameter expected"; + *error_line = pair->fline; + res = -1; + goto fin; + } + + for (i = 1; i < size; ++i) { + pair = parser_group_get_pair(group, i); + if (params->entry_type == CEL_COMMON) { + res = process_parser_common_group_pair((struct common_cache_entry_params *)params, + pair, error_str, error_line); + } else { + res = process_parser_mp_group_pair((struct mp_cache_entry_params *)params, + pair, error_str, error_line); + } + + if (res != 0) { + if (strcmp(pair->key, "euid") == 0) { + l = strtol(pair->value, &endp, 10); + if ((*endp != '\0') && (l >= 0)) { + desired_euid = l; + use_desired_euid = 1; + } else { + *error_str = "euid parameter must be a positive integer"; + *error_line = pair->fline; + res = -1; + goto fin; + } + } else + goto fin; + } + } + + config_entry = create_configuration_entry(group->name, desired_euid, use_desired_euid, params); + res = add_configuration_entry(config, config_entry); + if (res != 0) { + *error_str = "duplicate entry"; + *error_line = group->fline; + } + } else { + *error_str = "at least entry type ('common' or 'multipart') must be specified"; + *error_line = group->fline; + res = -1; + } + +fin: + free(params); + TRACE_OUT(process_parser_group); + return (res); +} + +size_t +configuration_get_entries_size(struct configuration *config) +{ + TRACE_IN(configuration_get_entries_size); + assert(config != NULL); + TRACE_OUT(configuration_get_entries_size); + return (config->entries_size); +} + +struct configuration_entry * +configuration_get_entry(struct configuration *config, size_t index) +{ + TRACE_IN(configuration_get_entry); + assert(config != NULL); + assert(index < config->entries_size); + TRACE_OUT(configuration_get_entry); + return (config->entries[index]); +} + +struct configuration_entry * +configuration_find_entry(struct configuration *config, + struct configuration_entry const *model) +{ + struct configuration_entry **retval; + + TRACE_IN(configuration_find_entry); + retval = bsearch(model, config->entries, config->entries_size, + sizeof(struct configuration_entry *), configuration_entry_cmp); + TRACE_OUT(configuration_find_entry); + + return ((retval != NULL) ? *retval : NULL); +} + struct configuration * init_configuration(void) { @@ -16,15 +389,22 @@ retval = (struct configuration *)malloc(sizeof(struct configuration)); assert(retval != NULL); memset(retval, 0, sizeof(struct configuration)); - TRACE_OUT(init_configuration); - + + retval->entries_capacity = INITIAL_ENTRIES_CAPACITY; + retval->entries = (struct configuration_entry **)malloc( + sizeof(struct configuration_entry *) * retval->entries_capacity); + assert(retval->entries != NULL); + memset(retval->entries, 0, sizeof(struct configuration_entry *) * + retval->entries_capacity); + + TRACE_OUT(init_configuration); return (retval); } void fill_configuration_defaults(struct configuration *config) { - size_t def_sockpath_len; + size_t def_sockpath_len, i; TRACE_IN(fill_configuration_defaults); assert(config != NULL); @@ -42,24 +422,77 @@ config->force_unlink = 1; config->query_timeout = 8000; - + + for (i = 0; i < config->entries_size; ++i) + destroy_configuration_entry(config->entries[i]); + config->entries_size = 0; TRACE_OUT(fill_configuration_defaults); } int -read_configuration(const char *fname, struct configuration *config) +read_configuration(const char *fname, struct configuration *config, + char const **error_str, int *error_line) { + parser config_parser; + struct parser_pair_ *pair; + struct parser_group_ *group; + size_t size, i; + int res; + TRACE_IN(read_configuration); + config_parser = init_parser(fname); + if (config_parser == NULL) { + TRACE_POINT(); + TRACE_OUT(read_configuration); + return (-1); + } + + res = parser_process(config_parser); + parser_dump(config_parser); + if (res == PARSER_SUCCESS) { + for (i = 0; i < config->entries_size; ++i) + destroy_configuration_entry(config->entries[i]); + config->entries_size = 0; + + size = parser_group_get_pairs_size(get_parser_root_group(config_parser)); + for (i = 0; i < size; ++i) { + pair = parser_group_get_pair(get_parser_root_group(config_parser), i); + res = process_root_parser_pair(config, pair, error_str, error_line); + if (res != 0) + goto fin; + } + + size = parser_get_groups_size(config_parser); + for (i = 0; i < size; ++i) { + group = parser_get_group(config_parser, i); + res = process_parser_group(config, group, error_str, error_line); + if ( res != 0) + goto fin; + } + } else { + *error_str = get_parser_error_str(res); + *error_line = config_parser->cur_line; + TRACE_STR(get_parser_error_str(res)); + } + +fin: + destroy_parser(config_parser); TRACE_OUT(read_configuration); - return (-1); + return (res); } void destroy_configuration(struct configuration *config) { + int i; TRACE_IN(destroy_configuration); assert(config != NULL); free(config->socket_path); + + for (i = 0; i < config->entries_size; ++i) + destroy_configuration_entry(config->entries[i]); + free(config->entries); + free(config); TRACE_OUT(destroy_configuration); } ==== //depot/projects/soc2005/nsswitch_cached/cached/config.h#3 (text+ko) ==== @@ -1,20 +1,40 @@ #ifndef __CACHED_CONFIG_H__ #define __CACHED_CONFIG_H__ +#include #include +#include +#include +struct configuration_entry { + char *name; + + uid_t desired_euid; + int use_desired_euid; + + struct cache_entry_params *c_params; +}; + /* the cached configuration parameters */ struct configuration { char *socket_path; mode_t socket_mode; - int force_unlink; + int force_unlink; + int query_timeout; - int query_timeout; + struct configuration_entry **entries; + size_t entries_capacity; + size_t entries_size; }; struct configuration *init_configuration(void); void fill_configuration_defaults(struct configuration *); -int read_configuration(const char *, struct configuration *); +int read_configuration(const char *, struct configuration *, char const **, int *); void destroy_configuration(struct configuration *); + +size_t configuration_get_entries_size(struct configuration *); +struct configuration_entry *configuration_get_entry(struct configuration *, size_t); +struct configuration_entry *configuration_find_entry(struct configuration *, + struct configuration_entry const *); #endif ==== //depot/projects/soc2005/nsswitch_cached/cached/debug.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/cached/debug.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/cached/log.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/cached/log.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/cached/protocol.c#2 (text+ko) ==== @@ -73,6 +73,7 @@ init_cache_write_request(struct cache_write_request *write_request) { TRACE_IN(init_cache_write_request); + memset(write_request, 0, sizeof(struct cache_write_request)); TRACE_OUT(init_cache_write_request); } @@ -80,6 +81,9 @@ finalize_cache_write_request(struct cache_write_request *write_request) { TRACE_IN(finalize_cache_write_request); + free(write_request->entry); + free(write_request->cache_key); + free(write_request->data); TRACE_OUT(finalize_cache_write_request); } @@ -96,6 +100,7 @@ init_cache_write_response(struct cache_write_response *write_response) { TRACE_IN(init_cache_write_response); + memset(write_response, 0, sizeof(struct cache_write_response)); TRACE_OUT(init_cache_write_response); } @@ -119,6 +124,7 @@ init_cache_read_request(struct cache_read_request *read_request) { TRACE_IN(init_cache_read_request); + memset(read_request, 0, sizeof(struct cache_read_request)); TRACE_OUT(init_cache_read_request); } @@ -126,6 +132,8 @@ finalize_cache_read_request(struct cache_read_request *read_request) { TRACE_IN(finalize_cache_read_request); + free(read_request->entry); + free(read_request->cache_key); TRACE_OUT(finalize_cache_read_request); } @@ -142,6 +150,7 @@ init_cache_read_response(struct cache_read_response *read_response) { TRACE_IN(init_cache_read_response); + memset(read_response, 0, sizeof(struct cache_read_response)); TRACE_OUT(init_cache_read_response); } @@ -149,6 +158,7 @@ finalize_cache_read_response(struct cache_read_response *read_response) { TRACE_IN(finalize_cache_read_response); + free(read_response->data); TRACE_OUT(finalize_cache_read_response); } @@ -165,6 +175,7 @@ init_cache_transform_request(struct cache_transform_request *transform_request) { TRACE_IN(init_cache_transform_request); + memset(transform_request, 0, sizeof(struct cache_transform_request)); TRACE_OUT(init_cache_transform_request); } @@ -172,6 +183,7 @@ finalize_cache_transform_request(struct cache_transform_request *transform_request) { TRACE_IN(finalize_cache_transform_request); + free(transform_request->entry); TRACE_OUT(finalize_cache_transform_request); } @@ -188,6 +200,7 @@ init_cache_transform_response(struct cache_transform_response *transform_response) { TRACE_IN(init_cache_transform_request); + memset(transform_response, 0, sizeof(struct cache_transform_response)); TRACE_OUT(init_cache_transform_request); } ==== //depot/projects/soc2005/nsswitch_cached/cached/protocol.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ struct cache_write_request { size_t entry_length; - char *entry; // ignored if entry_length is 0 + char *entry; size_t cache_key_length; char *cache_key; @@ -23,7 +23,7 @@ struct cache_read_request { size_t entry_length; - char *entry; // ignored if error_code is 0 + char *entry; size_t cache_key_length; char *cache_key; @@ -33,8 +33,8 @@ { int error_code; - size_t data_size; // ignored if error_code is 0 - void *data; // ignored if error_code is 0 + size_t data_size; // ignored if error_code is not 0 + void *data; // ignored if error_code is not 0 }; struct cache_transform_request ==== //depot/projects/soc2005/nsswitch_cached/cached/query.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ #include "query.h" +#include #include #include #include @@ -8,6 +9,7 @@ #include #include "debug.h" #include "log.h" +#include "singletons.h" static int on_query_startup(struct query_state *); static void on_query_destroy(struct query_state *); @@ -19,9 +21,9 @@ static int on_read_request_read1(struct query_state *); static int on_read_request_read2(struct query_state *); -//static int on_read_request_process(struct query_state *); -//static int on_read_response_write1(struct query_state *); -//static int on_read_response_write2(struct query_state *); +static int on_read_request_process(struct query_state *); +static int on_read_response_write1(struct query_state *); +static int on_read_response_write2(struct query_state *); static int on_transform_request_read1(struct query_state *); //static int on_transform_request_process(struct query_state *); @@ -69,6 +71,10 @@ qstate->euid = cmsg.creds.cmcred_euid; qstate->pid = cmsg.creds.cmcred_pid; + TRACE_INT(qstate->uid); + TRACE_INT(qstate->euid); + TRACE_INT(qstate->pid); + switch (elem_type) { case CET_WRITE_REQUEST: qstate->process_func = on_write_request_read1; @@ -116,6 +122,7 @@ result += qstate->read_func(qstate, &write_request->data_size, sizeof(size_t)); if (result != sizeof(size_t) * 3) { + TRACE_INT(result); TRACE_OUT(on_write_request_read1); return (-1); } @@ -162,6 +169,7 @@ result += qstate->read_func(qstate, write_request->data, write_request->data_size); if (result != qstate->kevent_watermark) { + TRACE_INT(result); TRACE_OUT(on_write_request_read2); return (-1); } @@ -175,9 +183,34 @@ static int on_write_request_process(struct query_state *qstate) { + struct cache_write_request *write_request; + struct cache_write_response *write_response; + cache_entry c_entry; + TRACE_IN(on_write_request_process); init_comm_element(&qstate->response, CET_WRITE_RESPONSE); + write_response = get_cache_write_response(&qstate->response); + write_request = get_cache_write_request(&qstate->request); + TRACE_INT(write_request->entry_length); + TRACE_STR(write_request->entry); + TRACE_INT(write_request->cache_key_length); + TRACE_STR(write_request->cache_key); + TRACE_INT(write_request->data_size); + + c_entry = find_cache_entry(s_cache, write_request->entry); + if (c_entry != NULL) { + TRACE_POINT(); + write_response->error_code = cache_write(c_entry, write_request->cache_key, + write_request->data, write_request->data_size); + } else { + TRACE_POINT(); + write_response->error_code = -1; + } + + TRACE_INT(write_response->error_code); + + qstate->kevent_filter = EVFILT_WRITE; qstate->kevent_watermark = sizeof(int); qstate->process_func = on_write_response_write1; TRACE_OUT(on_write_request_process); @@ -221,10 +254,17 @@ result += qstate->read_func(qstate, &read_request->cache_key_length, sizeof(size_t)); if (result != sizeof(size_t) * 2) { + TRACE_INT(result); TRACE_OUT(on_read_request_read1); return (-1); } + if ((read_request->entry_length == 0) || + (read_request->cache_key_length == 0)) { + TRACE_OUT(on_read_request_read1); + return (-1); + } + read_request->entry = (char *)malloc(read_request->entry_length + 1); assert(read_request->entry != NULL); memset(read_request->entry, 0, read_request->entry_length + 1); @@ -245,7 +285,136 @@ static int on_read_request_read2(struct query_state *qstate) { - return (-1); + struct cache_read_request *read_request; + ssize_t result; + + TRACE_IN(on_read_request_read2); + read_request = get_cache_read_request(&qstate->request); + + result = qstate->read_func(qstate, read_request->entry, + read_request->entry_length); + result += qstate->read_func(qstate, read_request->cache_key, + read_request->cache_key_length); + + if (result != qstate->kevent_watermark) { + TRACE_INT(result); + TRACE_OUT(on_read_request_read2); + return (-1); + } + + qstate->kevent_watermark = 0; + qstate->process_func = on_read_request_process; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 8 07:47:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13F5016A422; Mon, 8 Aug 2005 07:47:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1CF216A41F for ; Mon, 8 Aug 2005 07:47:08 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 765D143D46 for ; Mon, 8 Aug 2005 07:47:08 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j787l8jD093469 for ; Mon, 8 Aug 2005 07:47:08 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j787l82d093466 for perforce@freebsd.org; Mon, 8 Aug 2005 07:47:08 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 8 Aug 2005 07:47:08 GMT Message-Id: <200508080747.j787l82d093466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 07:47:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=81636 Change 81636 by soc-bushman@soc-bushman_stinger on 2005/08/08 07:46:37 test for cached Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/cached_client_test/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/cached_client_test/cached_client.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/cached_client_test/cached_client.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/cached_client_test/cached_client_test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 8 07:48:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5A5416A41F; Mon, 8 Aug 2005 07:48:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9523B16A41F for ; Mon, 8 Aug 2005 07:48:10 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A62643D45 for ; Mon, 8 Aug 2005 07:48:10 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j787mAI8093561 for ; Mon, 8 Aug 2005 07:48:10 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j787mAai093558 for perforce@freebsd.org; Mon, 8 Aug 2005 07:48:10 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 8 Aug 2005 07:48:10 GMT Message-Id: <200508080748.j787mAai093558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 07:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=81637 Change 81637 by soc-bushman@soc-bushman_stinger on 2005/08/08 07:47:08 configuration file support added Affected files ... .. //depot/projects/soc2005/nsswitch_cached/cached/cached.conf#1 add .. //depot/projects/soc2005/nsswitch_cached/cached/parser.c#1 add .. //depot/projects/soc2005/nsswitch_cached/cached/parser.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 8 08:15:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D55FC16A421; Mon, 8 Aug 2005 08:15:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A296916A41F for ; Mon, 8 Aug 2005 08:15:45 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52DEF43D46 for ; Mon, 8 Aug 2005 08:15:45 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j788FiSE094634 for ; Mon, 8 Aug 2005 08:15:45 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j788FiPH094631 for perforce@freebsd.org; Mon, 8 Aug 2005 08:15:44 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 8 Aug 2005 08:15:44 GMT Message-Id: <200508080815.j788FiPH094631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 08:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=81638 Change 81638 by soc-cjones@soc-cjones_ishtar on 2005/08/08 08:15:21 Renaming now works for drives, volumes, plexes, and subdisks, in both recursive and non-recursive modes. Plenty of debugging crud in this check-in; removing some of the excess in the next. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#4 (text+ko) ==== @@ -57,9 +57,8 @@ struct gv_drive *d; int *argc, *flags; - char *argv, buf[20]; char *object, *newname; - int i, type, err; + int type, err; sc = gp->softc; @@ -71,12 +70,6 @@ gctl_error(req, "no new name given"); return; } - type = gv_object_type(sc, newname); - printf("gv_object_type(sc, \"%s\") = %d\n", newname, type); - if (-1 != type) { - gctl_error(req, "new name is already in use"); - return; - } object = gctl_get_param(req, "object", NULL); if (NULL == object) { @@ -102,8 +95,6 @@ gctl_error(req, "unknown plex '%s'", object); return; } - gctl_error(req, "calling gv_rename_plex(,, %s, %s,)", p, newname); - return; err = gv_rename_plex(sc, req, p, newname, *flags); if (err) return; @@ -114,8 +105,6 @@ gctl_error(req, "unknown subdisk '%s'", object); return; } - gctl_error(req, "calling gv_rename_sd(,, %s, %s,)", s, newname); - return; err = gv_rename_sd(sc, req, s, newname, *flags); if (err) return; @@ -126,8 +115,6 @@ gctl_error(req, "unknown drive '%s'", object); return; } - gctl_error(req, "calling gv_rename_drive(,, %s, %s,)", d, newname); - return; err = gv_rename_drive(sc, req, d, newname, *flags); if (err) return; @@ -143,11 +130,26 @@ static int gv_rename_drive(struct gv_softc *sc, struct gctl_req *req, struct gv_drive *d, char *newname, int flags) { - int err; + char olddrivename[GV_MAXDRIVENAME]; + struct gv_sd *s; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_drive: NULL d")); + if (-1 != gv_object_type(sc, newname)) { + gctl_error(req, "drive name %s already in use", newname); + return 2; + } + + strncpy(olddrivename, d->name, GV_MAXDRIVENAME); + strncpy(d->name, newname, GV_MAXDRIVENAME); + + LIST_FOREACH(s, &sc->subdisks, sd) { + if (!strncmp(s->drive, olddrivename, GV_MAXDRIVENAME)) { + strncpy(s->drive, d->name, GV_MAXDRIVENAME); + } + } + return (0); } @@ -156,21 +158,90 @@ gv_rename_plex(struct gv_softc *sc, struct gctl_req *req, struct gv_plex *p, char *newname, int flags) { int err; + char plexnumber[GV_MAXPLEXNAME]; + char *pplexnumber = plexnumber; + char oldplexname[GV_MAXPLEXNAME]; + char *poldplexname = oldplexname; + struct gv_sd *s; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_plex: NULL p")); + if (-1 != gv_object_type(sc, newname)) { + gctl_error(req, "plex name %s already in use", newname); + return 2; + } + + strncpy(oldplexname, p->name, GV_MAXPLEXNAME); + strsep(&poldplexname, "."); + strncpy(plexnumber, p->name, GV_MAXPLEXNAME); + strsep(&pplexnumber, "."); + if (strcmp(poldplexname, pplexnumber)) { + gctl_error(req, "current and proposed plex numbers (%s, %s) do not match", pplexnumber, poldplexname); + return 1; + } + + printf("oldplexname = %s\n", oldplexname); + strncpy(oldplexname, p->name, GV_MAXPLEXNAME); + strncpy(p->name, newname, GV_MAXPLEXNAME); + + /* Fix up references and potentially rename subdisks. */ + LIST_FOREACH(s, &sc->subdisks, sd) { + if (!strncmp(s->plex, oldplexname, GV_MAXPLEXNAME)) { + printf("Fixing plex reference for subdisk %s from %s to %s\n", s->name, s->plex, p->name); + strncpy(s->plex, p->name, GV_MAXPLEXNAME); + if (flags && GV_FLAG_R) { + char newsdname[GV_MAXSDNAME]; + char oldsdname[GV_MAXSDNAME]; + char *poldsdname = oldsdname; + printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); + strncpy(oldsdname, s->name, GV_MAXSDNAME); + strsep(&poldsdname, "."); + strsep(&poldsdname, "."); + snprintf(newsdname, GV_MAXSDNAME, "%s.%s", p->name, poldsdname); + if ((err = gv_rename_sd(sc, req, s, newsdname, flags))) + return err; + } + } else { + printf("Ignoring subdisk %s\n", s->name); + } + } return (0); } +/* gv_rename_sd: renames a subdisk. Note that the 'flags' argument is ignored, since + there are no structures below a subdisk. Similarly, we don't have + to clean up any references elsewhere to the subdisk's name. */ static int gv_rename_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, char * newname, int flags) { - int err; + char newsdnumber[GV_MAXSDNAME]; + char *pnewsdnumber = newsdnumber; + char oldsdnumber[GV_MAXSDNAME]; + char *poldsdnumber = oldsdnumber; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_sd: NULL s")); + if (-1 != gv_object_type(sc, newname)) { + gctl_error(req, "subdrive name %s already in use", newname); + return 2; + } + + strncpy(oldsdnumber, s->name, GV_MAXSDNAME); + strsep(&poldsdnumber, "."); + strsep(&poldsdnumber, "."); + strncpy(newsdnumber, newname, GV_MAXSDNAME); + strsep(&pnewsdnumber, "."); + strsep(&pnewsdnumber, "."); + if (strcmp(pnewsdnumber, poldsdnumber)) { + gctl_error(req, "current and proposed sd numbers (%s, %s) do not match", poldsdnumber, pnewsdnumber); + return 1; + } + + printf("Renaming subdisk %s to %s\n", s->name, newname); + strncpy(s->name, newname, GV_MAXSDNAME); + return (0); } @@ -179,13 +250,17 @@ { int err; struct gv_plex *p; - struct gv_sd *s; + /* struct gv_sd *s; */ char oldvolname[GV_MAXVOLNAME]; - char oldplexname[GV_MAXPLEXNAME]; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_vol: NULL v")); + if (-1 != gv_object_type(sc, newname)) { + gctl_error(req, "volume name %s already in use", newname); + return 2; + } + printf("gv_rename_vol: flags = %x\n", flags); /* Rename the volume. We need to hold on to the old volume name. */ @@ -200,37 +275,51 @@ LIST_FOREACH(p, &sc->plexes, plex) { if (!strncmp(p->volume, oldvolname, GV_MAXVOLNAME)) { + printf("Fixing volume reference for plex %s from %s to %s\n", p->name, p->volume, v->name); strncpy(p->volume, v->name, GV_MAXVOLNAME); if (flags && GV_FLAG_R) { - char plexnumber[GV_MAXPLEXNAME]; - char *pplexnumber = plexnumber; + char newplexname[GV_MAXPLEXNAME]; + char oldplexname[GV_MAXPLEXNAME]; + char *poldplexname = oldplexname; printf("Modifying plex %s, p->volume = %s\n", p->name, p->volume); strncpy(oldplexname, p->name, GV_MAXPLEXNAME); - strncpy(plexnumber, p->name, GV_MAXPLEXNAME); - strsep(&pplexnumber, "."); - printf("Renaming plex %s to %s.%s\n", p->name, v->name, pplexnumber); - snprintf(p->name, GV_MAXPLEXNAME, "%s.%s", v->name, pplexnumber); - LIST_FOREACH(s, &sc->subdisks, sd) { + strsep(&poldplexname, "."); + snprintf(newplexname, GV_MAXPLEXNAME, "%s.%s", v->name, poldplexname); + if ((err = gv_rename_plex(sc, req, p, newplexname, flags))) + return err; + + /* + char plexnumber[GV_MAXPLEXNAME]; + char *pplexnumber = plexnumber; + printf("Modifying plex %s, p->volume = %s\n", p->name, p->volume); + strncpy(oldplexname, p->name, GV_MAXPLEXNAME); + strncpy(plexnumber, p->name, GV_MAXPLEXNAME); + strsep(&pplexnumber, "."); + printf("Renaming plex %s to %s.%s\n", p->name, v->name, pplexnumber); + snprintf(p->name, GV_MAXPLEXNAME, "%s.%s", v->name, pplexnumber); + LIST_FOREACH(s, &sc->subdisks, sd) { if (!strncmp(s->plex, oldplexname, GV_MAXPLEXNAME)) { - char sdnumber[GV_MAXSDNAME]; - char *psdnumber = sdnumber; - printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); - strncpy(sdnumber, s->name, GV_MAXSDNAME); - strsep(&psdnumber, "."); - strsep(&psdnumber, "."); - printf("Renaming subdisk %s to %s.%s\n", s->name, p->name, psdnumber); - snprintf(s->name, GV_MAXSDNAME, "%s.%s", p->name, psdnumber); - strncpy(s->plex, p->name, GV_MAXPLEXNAME); + char sdnumber[GV_MAXSDNAME]; + char *psdnumber = sdnumber; + printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); + strncpy(sdnumber, s->name, GV_MAXSDNAME); + strsep(&psdnumber, "."); + strsep(&psdnumber, "."); + printf("Renaming subdisk %s to %s.%s\n", s->name, p->name, psdnumber); + snprintf(s->name, GV_MAXSDNAME, "%s.%s", p->name, psdnumber); + strncpy(s->plex, p->name, GV_MAXPLEXNAME); } else { - printf("Ignoring subdisk %s, s->plex = %s\n", s->name, s->plex); + printf("Ignoring subdisk %s, s->plex = %s\n", s->name, s->plex); + } } - } + */ } - } else { + } else { printf("Ignoring plex %s, p->volume = %s\n", p->name, p->volume); } } + /* printf("Debugging output:\n"); printf("\tsc = %p\n", sc); printf("\treq = %p\n", req); @@ -259,6 +348,7 @@ } } printf("\n\n"); + */ return (0); } From owner-p4-projects@FreeBSD.ORG Mon Aug 8 08:17:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C07C16A41F; Mon, 8 Aug 2005 08:17:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 933B716A41F for ; Mon, 8 Aug 2005 08:17:49 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56AD243D45 for ; Mon, 8 Aug 2005 08:17:49 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j788HnNN094704 for ; Mon, 8 Aug 2005 08:17:49 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j788Hml4094696 for perforce@freebsd.org; Mon, 8 Aug 2005 08:17:48 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 8 Aug 2005 08:17:48 GMT Message-Id: <200508080817.j788Hml4094696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 08:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=81639 Change 81639 by soc-cjones@soc-cjones_ishtar on 2005/08/08 08:17:46 Get rid of excess debugging cruft that's no longer needed. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#5 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#5 (text+ko) ==== @@ -146,6 +146,7 @@ LIST_FOREACH(s, &sc->subdisks, sd) { if (!strncmp(s->drive, olddrivename, GV_MAXDRIVENAME)) { + printf("Fixing drive reference for subdisk %s from %s to %s\n", s->name, s->drive, d->name); strncpy(s->drive, d->name, GV_MAXDRIVENAME); } } @@ -286,69 +287,12 @@ strsep(&poldplexname, "."); snprintf(newplexname, GV_MAXPLEXNAME, "%s.%s", v->name, poldplexname); if ((err = gv_rename_plex(sc, req, p, newplexname, flags))) - return err; - - /* - char plexnumber[GV_MAXPLEXNAME]; - char *pplexnumber = plexnumber; - printf("Modifying plex %s, p->volume = %s\n", p->name, p->volume); - strncpy(oldplexname, p->name, GV_MAXPLEXNAME); - strncpy(plexnumber, p->name, GV_MAXPLEXNAME); - strsep(&pplexnumber, "."); - printf("Renaming plex %s to %s.%s\n", p->name, v->name, pplexnumber); - snprintf(p->name, GV_MAXPLEXNAME, "%s.%s", v->name, pplexnumber); - LIST_FOREACH(s, &sc->subdisks, sd) { - if (!strncmp(s->plex, oldplexname, GV_MAXPLEXNAME)) { - char sdnumber[GV_MAXSDNAME]; - char *psdnumber = sdnumber; - printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); - strncpy(sdnumber, s->name, GV_MAXSDNAME); - strsep(&psdnumber, "."); - strsep(&psdnumber, "."); - printf("Renaming subdisk %s to %s.%s\n", s->name, p->name, psdnumber); - snprintf(s->name, GV_MAXSDNAME, "%s.%s", p->name, psdnumber); - strncpy(s->plex, p->name, GV_MAXPLEXNAME); - } else { - printf("Ignoring subdisk %s, s->plex = %s\n", s->name, s->plex); - } - } - */ + return err; } - } else { + } else { printf("Ignoring plex %s, p->volume = %s\n", p->name, p->volume); } } - - /* - printf("Debugging output:\n"); - printf("\tsc = %p\n", sc); - printf("\treq = %p\n", req); - printf("\tv = %p\n", v); - printf("\t\tv->name = %s\n", v->name); - printf("\t\tv->size = %d\n", (int) v->size); - printf("\t\tv->plexcount = %d\n", v->plexcount); - printf("\tnewname = \"%s\"\n", newname); - printf("\tflags = %x\n", flags); - - LIST_FOREACH(p, &sc->plexes, plex) { - if (!strncmp(p->volume, v->name, GV_MAXVOLNAME)) { - printf("\tp->name = %s\n", p->name); - printf("\tp->size = %d\n", (int) p->size); - printf("\tp->volume = %s\n", p->volume); - printf("\tp->sdcount = %d\n", p->sdcount); - printf("\tp->sddown = %d\n", p->sddown); - LIST_FOREACH(s, &sc->subdisks, sd) { - if (!strncmp(s->plex, p->name, GV_MAXPLEXNAME)) { - printf("\t\ts->name = %s\n", s->name); - printf("\t\ts->size = %d\n", (int) s->size); - printf("\t\ts->drive = %s\n", s->drive); - printf("\t\ts->plex = %s\n", s->plex); - } - } - } - } - printf("\n\n"); - */ - + return (0); } From owner-p4-projects@FreeBSD.ORG Mon Aug 8 08:38:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DF4916A421; Mon, 8 Aug 2005 08:38:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AF2316A41F for ; Mon, 8 Aug 2005 08:38:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0275D43D46 for ; Mon, 8 Aug 2005 08:38:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j788cEFN095429 for ; Mon, 8 Aug 2005 08:38:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j788cEIm095426 for perforce@freebsd.org; Mon, 8 Aug 2005 08:38:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 08:38:14 GMT Message-Id: <200508080838.j788cEIm095426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 08:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=81640 Change 81640 by rwatson@rwatson_zoo on 2005/08/08 08:37:32 When exporting ifnet flag information via a routing socket message, or in the if_drv_flags. Affected files ... .. //depot/projects/netsmp/src/sys/net/rtsock.c#3 edit Differences ... ==== //depot/projects/netsmp/src/sys/net/rtsock.c#3 (text+ko) ==== @@ -859,7 +859,7 @@ return; ifm = mtod(m, struct if_msghdr *); ifm->ifm_index = ifp->if_index; - ifm->ifm_flags = ifp->if_flags; + ifm->ifm_flags = ifp->if_flags | ifp->if_drv_flags; ifm->ifm_data = ifp->if_data; ifm->ifm_addrs = 0; rt_dispatch(m, NULL); @@ -1124,7 +1124,7 @@ ifm = (struct if_msghdr *)w->w_tmem; ifm->ifm_index = ifp->if_index; - ifm->ifm_flags = ifp->if_flags; + ifm->ifm_flags = ifp->if_flags | ifp->if_drv_flags; ifm->ifm_data = ifp->if_data; ifm->ifm_addrs = info.rti_addrs; error = SYSCTL_OUT(w->w_req,(caddr_t)ifm, len); From owner-p4-projects@FreeBSD.ORG Mon Aug 8 08:58:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DC6316A421; Mon, 8 Aug 2005 08:58:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4037D16A41F for ; Mon, 8 Aug 2005 08:58:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4805043D46 for ; Mon, 8 Aug 2005 08:58:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j788wgF8003309 for ; Mon, 8 Aug 2005 08:58:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j788wfQn003306 for perforce@freebsd.org; Mon, 8 Aug 2005 08:58:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 08:58:41 GMT Message-Id: <200508080858.j788wfQn003306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 08:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=81641 Change 81641 by rwatson@rwatson_zoo on 2005/08/08 08:57:48 Integrate netsmp: - Removal of some number of FreeBSD version ifdefs. - 802.11 nit fixes. Affected files ... .. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/awi/awi.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/queue.h#2 integrate Differences ... ==== //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516 2005/06/10 03:33:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.517 2005/08/07 22:00:46 alc Exp $"); /* * Manages physical address maps. @@ -1763,7 +1763,6 @@ */ if ((ptpaddr & PG_PS) != 0) { *pde &= ~(PG_M|PG_RW); - pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; anychanged = 1; continue; } ==== //depot/projects/netsmp/src/sys/dev/amr/amr_disk.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.35 2005/01/16 07:34:26 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.36 2005/08/07 23:51:53 scottl Exp $"); /* * Disk driver for AMI MegaRaid controllers @@ -111,9 +111,6 @@ amrd_open(struct disk *dp) { struct amrd_softc *sc = (struct amrd_softc *)dp->d_drv1; -#if __FreeBSD_version < 500000 /* old buf style */ - struct disklabel *label; -#endif debug_called(1); @@ -124,23 +121,6 @@ if (sc->amrd_controller->amr_state & AMR_STATE_SHUTDOWN) return(ENXIO); -#if __FreeBSD_version < 500000 /* old buf style */ - label = &sc->amrd_disk.d_label; - bzero(label, sizeof(*label)); - label->d_type = DTYPE_SCSI; - label->d_secsize = AMR_BLKSIZE; - label->d_nsectors = sc->amrd_drive->al_sectors; - label->d_ntracks = sc->amrd_drive->al_heads; - label->d_ncylinders = sc->amrd_drive->al_cylinders; - label->d_secpercyl = sc->amrd_drive->al_sectors * sc->amrd_drive->al_heads; - label->d_secperunit = sc->amrd_drive->al_size; -#else - sc->amrd_disk->d_sectorsize = AMR_BLKSIZE; - sc->amrd_disk->d_mediasize = (off_t)sc->amrd_drive->al_size * AMR_BLKSIZE; - sc->amrd_disk->d_fwsectors = sc->amrd_drive->al_sectors; - sc->amrd_disk->d_fwheads = sc->amrd_drive->al_heads; -#endif - return (0); } /******************************************************************************** @@ -257,10 +237,11 @@ sc->amrd_disk->d_dump = (dumper_t *)amrd_dump; sc->amrd_disk->d_unit = sc->amrd_unit; sc->amrd_disk->d_flags = 0; + sc->amrd_disk->d_sectorsize = AMR_BLKSIZE; + sc->amrd_disk->d_mediasize = (off_t)sc->amrd_drive->al_size * AMR_BLKSIZE; + sc->amrd_disk->d_fwsectors = sc->amrd_drive->al_sectors; + sc->amrd_disk->d_fwheads = sc->amrd_drive->al_heads; disk_create(sc->amrd_disk, DISK_VERSION); -#ifdef FREEBSD_4 - disks_registered++; -#endif return (0); } ==== //depot/projects/netsmp/src/sys/dev/amr/amrvar.h#2 (text+ko) ==== @@ -53,14 +53,12 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.26 2005/01/23 23:25:41 scottl Exp $ + * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.27 2005/08/07 23:53:00 scottl Exp $ */ -#if __FreeBSD_version >= 500005 -# include -# include -# include -#endif +#include +#include +#include #define LSI_DESC_PCI "LSILogic MegaRAID 1.51" ==== //depot/projects/netsmp/src/sys/dev/awi/awi.c#6 (text+ko) ==== @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.39 2005/08/03 00:18:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.40 2005/08/08 03:30:57 sam Exp $"); #endif #include "opt_inet.h" @@ -660,7 +660,7 @@ if (ic->ic_opmode == IEEE80211_M_AHDEMO || ic->ic_opmode == IEEE80211_M_HOSTAP) { ni->ni_chan = ic->ic_ibss_chan; - ni->ni_intval = ic->ic_lintval; + ni->ni_intval = ic->ic_bintval; ni->ni_rssi = 0; ni->ni_rstamp = 0; memset(&ni->ni_tstamp, 0, sizeof(ni->ni_tstamp)); ==== //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.8 2005/07/22 17:36:12 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.9 2005/08/08 03:30:57 sam Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.8 2005/07/22 17:36:12 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.9 2005/08/08 03:30:57 sam Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -2001,7 +2001,7 @@ #endif if (ic->ic_opmode == IEEE80211_M_IBSS) { - data = htole32(ic->ic_lintval); + data = htole32(ic->ic_bintval); DPRINTF(("Setting beacon interval to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_BEACON_INTERVAL, &data, sizeof data); ==== //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.183 2005/08/05 04:56:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.184 2005/08/08 03:30:57 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -739,7 +739,7 @@ if (ic->ic_opmode == IEEE80211_M_HOSTAP && sc->sc_firmware_type == WI_INTERSIL) { - wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_lintval); + wi_write_val(sc, WI_RID_OWN_BEACON_INT, ic->ic_bintval); wi_write_val(sc, WI_RID_BASIC_RATE, 0x03); /* 1, 2 */ wi_write_val(sc, WI_RID_SUPPORT_RATE, 0x0f); /* 1, 2, 5.5, 11 */ wi_write_val(sc, WI_RID_DTIM_PERIOD, 1); ==== //depot/projects/netsmp/src/sys/dev/xe/if_xe.c#5 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.58 2005/08/03 00:18:34 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.59 2005/08/07 23:16:22 imp Exp $"); /* * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters. The @@ -1275,11 +1275,7 @@ /* Iterate over multicast address list */ count = 0; IF_ADDR_LOCK(ifp); -#if __FreeBSD_version < 500000 - LIST_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { -#else TAILQ_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { -#endif if (maddr->ifma_addr->sa_family != AF_LINK) continue; ==== //depot/projects/netsmp/src/sys/i386/i386/pmap.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.524 2005/07/29 19:03:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.525 2005/08/07 22:00:47 alc Exp $"); /* * Manages physical address maps. @@ -1788,7 +1788,6 @@ */ if ((ptpaddr & PG_PS) != 0) { pmap->pm_pdir[pdirindex] &= ~(PG_M|PG_RW); - pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; anychanged = 1; continue; } ==== //depot/projects/netsmp/src/sys/net80211/ieee80211.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.20 2005/07/22 16:50:16 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.21 2005/08/08 03:30:56 sam Exp $"); /* * IEEE 802.11 generic handler @@ -182,12 +182,14 @@ #endif (void) ieee80211_setmode(ic, ic->ic_curmode); - if (ic->ic_lintval == 0) - ic->ic_lintval = IEEE80211_BINTVAL_DEFAULT; - ic->ic_bmisstimeout = 7*ic->ic_lintval; /* default 7 beacons */ + if (ic->ic_bintval == 0) + ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; + ic->ic_bmisstimeout = 7*ic->ic_bintval; /* default 7 beacons */ ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); + if (ic->ic_lintval == 0) + ic->ic_lintval = ic->ic_bintval; ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; ieee80211_node_attach(ic); ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.79 2005/08/06 04:57:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.80 2005/08/08 03:30:56 sam Exp $"); #include #include @@ -1901,6 +1901,16 @@ ic->ic_stats.is_rx_chanmismatch++; return; } + if (!(IEEE80211_BINTVAL_MIN <= bintval && + bintval <= IEEE80211_BINTVAL_MAX)) { + IEEE80211_DISCARD(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "bogus beacon interval", bintval); + ic->ic_stats.is_rx_badbintval++; + return; + } /* * Count frame now that we know it's to be processed. @@ -2201,7 +2211,7 @@ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { - u_int16_t capinfo, bintval; + u_int16_t capinfo, lintval; struct ieee80211_rsnparms rsn; u_int8_t reason; @@ -2238,7 +2248,7 @@ return; } capinfo = le16toh(*(u_int16_t *)frm); frm += 2; - bintval = le16toh(*(u_int16_t *)frm); frm += 2; + lintval = le16toh(*(u_int16_t *)frm); frm += 2; if (reassoc) frm += 6; /* ignore current AP info */ ssid = rates = xrates = wpa = wme = NULL; @@ -2366,7 +2376,7 @@ } ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; - ni->ni_intval = bintval; + ni->ni_intval = lintval; ni->ni_capinfo = capinfo; ni->ni_chan = ic->ic_bss->ni_chan; ni->ni_fhdwell = ic->ic_bss->ni_fhdwell; ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.28 2005/07/22 17:36:11 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.30 2005/08/08 05:49:29 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) @@ -1075,18 +1075,57 @@ return error; } +struct stainforeq { + struct ieee80211com *ic; + struct ieee80211req_sta_info *si; + size_t space; +}; + +static size_t +sta_space(const struct ieee80211_node *ni, size_t *ielen) +{ + *ielen = 0; + if (ni->ni_wpa_ie != NULL) + *ielen += 2+ni->ni_wpa_ie[1]; + if (ni->ni_wme_ie != NULL) + *ielen += 2+ni->ni_wme_ie[1]; + return roundup(sizeof(struct ieee80211req_sta_info) + *ielen, + sizeof(u_int32_t)); +} + static void -get_sta_info(struct ieee80211req_sta_info *si, const struct ieee80211_node *ni) +get_sta_space(void *arg, struct ieee80211_node *ni) { + struct stainforeq *req = arg; struct ieee80211com *ic = ni->ni_ic; + size_t ielen; - si->isi_ie_len = 0; - if (ni->ni_wpa_ie != NULL) - si->isi_ie_len += 2+ni->ni_wpa_ie[1]; - if (ni->ni_wme_ie != NULL) - si->isi_ie_len += 2+ni->ni_wme_ie[1]; - si->isi_len = sizeof(*si) + si->isi_ie_len, sizeof(u_int32_t); - si->isi_len = roundup(si->isi_len, sizeof(u_int32_t)); + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + ni->ni_associd == 0) /* only associated stations */ + return; + req->space += sta_space(ni, &ielen); +} + +static void +get_sta_info(void *arg, struct ieee80211_node *ni) +{ + struct stainforeq *req = arg; + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211req_sta_info *si; + size_t ielen, len; + u_int8_t *cp; + + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + ni->ni_associd == 0) /* only associated stations */ + return; + if (ni->ni_chan == IEEE80211_CHAN_ANYC) /* XXX bogus entry */ + return; + len = sta_space(ni, &ielen); + if (len > req->space) + return; + si = req->si; + si->isi_len = len; + si->isi_ie_len = ielen; si->isi_freq = ni->ni_chan->ic_freq; si->isi_flags = ni->ni_chan->ic_flags; si->isi_state = ni->ni_flags; @@ -1110,55 +1149,60 @@ si->isi_txseqs[0] = ni->ni_txseqs[0]; si->isi_rxseqs[0] = ni->ni_rxseqs[0]; } - if (ic->ic_opmode == IEEE80211_M_IBSS || ni->ni_associd != 0) + /* NB: leave all cases in case we relax ni_associd == 0 check */ + if (ieee80211_node_is_authorized(ni)) si->isi_inact = ic->ic_inact_run; - else if (ieee80211_node_is_authorized(ni)) + else if (ni->ni_associd != 0) si->isi_inact = ic->ic_inact_auth; else si->isi_inact = ic->ic_inact_init; si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT; + + cp = (u_int8_t *)(si+1); + if (ni->ni_wpa_ie != NULL) { + memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); + cp += 2+ni->ni_wpa_ie[1]; + } + if (ni->ni_wme_ie != NULL) { + memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); + cp += 2+ni->ni_wme_ie[1]; + } + + req->si = (struct ieee80211req_sta_info *)(((u_int8_t *)si) + len); + req->space -= len; } static int ieee80211_ioctl_getstainfo(struct ieee80211com *ic, struct ieee80211req *ireq) { - union { - struct ieee80211req_sta_info info; - char data[512]; /* XXX shrink? */ - } u; - struct ieee80211req_sta_info *si = &u.info; - struct ieee80211_node_table *nt; - struct ieee80211_node *ni; - int error, space; - u_int8_t *p, *cp; + struct stainforeq req; + int error; + + if (ireq->i_len < sizeof(struct stainforeq)) + return EFAULT; - nt = &ic->ic_sta; - p = ireq->i_data; - space = ireq->i_len; error = 0; - /* XXX locking */ - TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - get_sta_info(si, ni); - if (si->isi_len > sizeof(u)) - continue; /* XXX */ - if (space < si->isi_len) - break; - cp = (u_int8_t *)(si+1); - if (ni->ni_wpa_ie != NULL) { - memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); - cp += 2+ni->ni_wpa_ie[1]; - } - if (ni->ni_wme_ie != NULL) { - memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); - cp += 2+ni->ni_wme_ie[1]; - } - error = copyout(si, p, si->isi_len); - if (error) - break; - p += si->isi_len; - space -= si->isi_len; - } - ireq->i_len -= space; + req.space = 0; + ieee80211_iterate_nodes(&ic->ic_sta, get_sta_space, &req); + if (req.space > ireq->i_len) + req.space = ireq->i_len; + if (req.space > 0) { + size_t space; + void *p; + + space = req.space; + /* XXX M_WAITOK after driver lock released */ + MALLOC(p, void *, space, M_TEMP, M_NOWAIT); + if (p == NULL) + return ENOMEM; + req.si = p; + ieee80211_iterate_nodes(&ic->ic_sta, get_sta_info, &req); + ireq->i_len = space - req.space; + error = copyout(p, ireq->i_data, ireq->i_len); + FREE(p, M_TEMP); + } else + ireq->i_len = 0; + return error; } @@ -2318,7 +2362,7 @@ return EINVAL; if (IEEE80211_BINTVAL_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_BINTVAL_MAX) { - ic->ic_lintval = ireq->i_val; + ic->ic_bintval = ireq->i_val; error = ENETRESET; /* requires restart */ } else error = EINVAL; ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_ioctl.h,v 1.12 2005/07/22 17:50:13 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_ioctl.h,v 1.13 2005/08/08 03:30:56 sam Exp $ */ #ifndef _NET80211_IEEE80211_IOCTL_H_ #define _NET80211_IEEE80211_IOCTL_H_ @@ -180,7 +180,8 @@ u_int32_t is_ff_split; /* fast frame rx split error */ u_int32_t is_ff_decap; /* fast frames decap'd */ u_int32_t is_ff_encap; /* fast frames encap'd for tx */ - u_int32_t is_spare[10]; + u_int32_t is_rx_badbintval; /* rx frame w/ bogus bintval */ + u_int32_t is_spare[9]; }; /* ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.60 2005/08/06 04:56:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.61 2005/08/08 03:30:56 sam Exp $"); #include #include @@ -389,7 +389,7 @@ ni->ni_esslen = ic->ic_des_esslen; memcpy(ni->ni_essid, ic->ic_des_essid, ni->ni_esslen); copy_bss(ni, ic->ic_bss); - ni->ni_intval = ic->ic_lintval; + ni->ni_intval = ic->ic_bintval; if (ic->ic_flags & IEEE80211_F_PRIVACY) ni->ni_capinfo |= IEEE80211_CAPINFO_PRIVACY; if (ic->ic_phytype == IEEE80211_T_FH) { @@ -441,7 +441,7 @@ ic->ic_bss = ieee80211_ref_node(ni); if (obss != NULL) { copy_bss(ni, obss); - ni->ni_intval = ic->ic_lintval; + ni->ni_intval = ic->ic_bintval; ieee80211_free_node(obss); } } ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.32 2005/07/31 06:12:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.33 2005/08/08 03:30:56 sam Exp $"); #include "opt_inet.h" @@ -1686,13 +1686,13 @@ * using this information. */ /* XXX handle overflow? */ - age = ((ni->ni_intval * ic->ic_lintval) << 2) / 1024; /* TU -> secs */ + age = ((ni->ni_intval * ic->ic_bintval) << 2) / 1024; /* TU -> secs */ _IEEE80211_NODE_SAVEQ_ENQUEUE(ni, m, qlen, age); IEEE80211_NODE_SAVEQ_UNLOCK(ni); IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, - "[%s] save frame, %u now queued\n", - ether_sprintf(ni->ni_macaddr), qlen); + "[%s] save frame with age %d, %u now queued\n", + ether_sprintf(ni->ni_macaddr), age, qlen); if (qlen == 1) ic->ic_set_tim(ni, 1); ==== //depot/projects/netsmp/src/sys/net80211/ieee80211_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.28 2005/07/22 17:57:16 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.29 2005/08/08 03:30:56 sam Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_ @@ -65,7 +65,8 @@ #define IEEE80211_DTIM_MIN 1 /* min DTIM period */ #define IEEE80211_DTIM_DEFAULT 1 /* default DTIM period */ -#define IEEE80211_BINTVAL_MAX 500 /* max beacon interval (TU's) */ +/* NB: min+max come from WiFi requirements */ +#define IEEE80211_BINTVAL_MAX 1000 /* max beacon interval (TU's) */ #define IEEE80211_BINTVAL_MIN 25 /* min beacon interval (TU's) */ #define IEEE80211_BINTVAL_DEFAULT 100 /* default beacon interval (TU's) */ @@ -143,6 +144,7 @@ void (*ic_node_cleanup)(struct ieee80211_node *); u_int8_t (*ic_node_getrssi)(const struct ieee80211_node*); u_int16_t ic_lintval; /* listen interval */ + u_int16_t ic_bintval; /* beacon interval */ u_int16_t ic_holdover; /* PM hold over duration */ u_int16_t ic_txmin; /* min tx retry count */ u_int16_t ic_txmax; /* max tx retry count */ ==== //depot/projects/netsmp/src/sys/sys/queue.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.60 2005/03/02 21:33:29 joerg Exp $ + * $FreeBSD: src/sys/sys/queue.h,v 1.61 2005/08/08 05:43:57 phk Exp $ */ #ifndef _SYS_QUEUE_H_ @@ -403,7 +403,7 @@ (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ (head1)->tqh_last = (head2)->tqh_last; \ TAILQ_INIT((head2)); \ - QMD_TRACE_HEAD(head); \ + QMD_TRACE_HEAD(head1); \ QMD_TRACE_HEAD(head2); \ } \ } while (0) From owner-p4-projects@FreeBSD.ORG Mon Aug 8 10:35:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5892416A421; Mon, 8 Aug 2005 10:35:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B6A516A41F for ; Mon, 8 Aug 2005 10:35:40 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99D0043D49 for ; Mon, 8 Aug 2005 10:35:39 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78AZd1c008802 for ; Mon, 8 Aug 2005 10:35:39 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78AZdnf008799 for perforce@freebsd.org; Mon, 8 Aug 2005 10:35:39 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 8 Aug 2005 10:35:39 GMT Message-Id: <200508081035.j78AZdnf008799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 10:35:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=81642 Change 81642 by soc-bushman@soc-bushman_stinger on 2005/08/08 10:35:28 adding NIS support for openssh keys Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth-rh-rsa.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2-hostbased.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/config.h.in#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/configure.ac#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/initial_copy.sh#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/key.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/make.sh#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth-rh.rsa.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth2-hostbased.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-config.h.in#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure.ac#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-sshconnect.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/Makefile#5 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/distinfo#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/batch.patch#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/gss-serv.c.patch#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-pam.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-rh.rsa.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth1.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2-hostbased.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-clientloop.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-config.h.in#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-configure.ac#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-fake-rfc2553.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-loginrec.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-regress-test-exec.sh#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-session.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshconnect.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd_config#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshpty.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/servconf.c.patch#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/sshd.sh#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-descr#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-message#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-plist#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/result_copy.sh#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/sshconnect.c#3 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth-rh-rsa.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2-hostbased.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/config.h.in#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/configure.ac#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.c#3 (text+ko) ==== @@ -59,6 +59,13 @@ #if defined (HAVE_NSDISPATCH) && defined (USE_NSSWITCH) +#ifdef YP +#include +#include +#include +#include +#endif + #ifndef NSDB_SSH_HOSTKEYS #define NSDB_SSH_HOSTKEYS "ssh_hostkeys" #endif /* NSDB_SSH_HOSTKEYS */ @@ -82,6 +89,10 @@ static HostStatus check_host_in_hostfile_by_key_or_type(const char *, const char *, const Key *, int, Key *, int *); +#ifdef YP +static HostStatus check_host_in_nis_by_key_or_type(const char *, + const Key *, int, Key *, int *); +#endif enum constants { CHECK_HOST, @@ -90,10 +101,16 @@ static const ns_src defaultsrc[] = { { NSSRC_FILES, NS_SUCCESS }, +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif { NULL, 0 } }; static int files_check_host_by_key_or_type(void *, void *, va_list); +#ifdef YP +static int nis_check_host_by_key_or_type(void *, void *, va_list); +#endif /* files backend implementation */ static int @@ -159,12 +176,181 @@ return (NS_NOTFOUND); } +#ifdef YP +/* NIS backend implementation */ +static HostStatus +check_host_in_hostfile_by_key_or_type(const char *host, const Key *key, + int keytype, Key *found, int *numret) +{ + u_int kbits; + int linenum; + char *cp, *cp2, *hashed_host; + HostStatus end_return; + + char buf[YPMAXRECORD]; + char domain[MAXHOSTNAMELEN]; + + char *lastkey; + char *current; + int current_len; + + char *resultbuf; + int resultbuf_len; + + int rv; + + if (getdomainname(domain, sizeof(domain)) != 0) + return (HOST_NEW); + + current = NULL; + current_len = 0; + resultbuf = NULL; + resultbuf_len = 0; + linenum = 0; + + rv = yp_first(domain, "ssh_hostkeys", ¤t, ¤t_len, + &resultbuf, &resultbuf_len); + + end_return = HOST_NEW; + while (rv) { + cp = resultbuf; + + /* comments, trailing spaces and tabs should be deleted during + NIS map making, but we still should check for them - just in case */ + for (; *cp == ' ' || *cp == '\t'; cp++) + ; + if (!*cp || *cp == '#' || *cp == '\n') + goto next_iter; + + /* Find the end of the host name portion. */ + for (cp2 = cp; *cp2 && *cp2 != ' ' && *cp2 != '\t'; cp2++) + ; + + if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1) { + if (*cp != HASH_DELIM) + goto next_iter; + hashed_host = host_hash(host, cp, (u_int) (cp2 - cp)); + if (hashed_host == NULL) { + debug("Invalid hashed host line %d of NIS source", + linenum); + goto next_iter; + } + if (strncmp(hashed_host, cp, (u_int) (cp2 - cp)) != 0) + goto next_iter; + } + + /* Got a match. Skip host name. */ + cp = cp2; + + /* + * Extract the key from the line. This will skip any leading + * whitespace. Ignore badly formatted lines. + */ + if (!hostfile_read_key(&cp, &kbits, found)) + goto next_iter; + + if (numret != NULL) + *numret = linenum; + + if (key == NULL) { + /* we found a key of the requested type */ + if (found->type == keytype) { + end_return = HOST_FOUND; + goto fin; + } + goto next_iter; + } + + if (!hostfile_check_key(kbits, found, host, "NIS source", linenum)) + goto next_iter; + + /* Check if the current key is the same as the given key. */ + if (key_equal(key, found)) { + /* Ok, they match. */ + debug3("check_host_in_nis: match line %d", linenum); + end_return = HOST_OK; + goto fin; + } + /* + * They do not match. We will continue to go through the + * file; however, we note that we will not return that it is + * new. + */ + end_return = HOST_CHANGED; + +next_iter: + lastkey = current; + rv = yp_next(domain, "ssh_hostkeys", current, current_len, + resultbuf, resultbuf_len); + free(lastkey); + + ++linenum; + } + +fin: + free(resultbuf); + return (end_return); +} + +static int +nis_check_host_by_key_or_type(void *result, void *mdata, va_list ap) +{ + const char *host; + const Key *key; + Key *found; + int keytype; + + int rv, numret; + enum constants how; + + how = (enum constants)mdata; + switch (how) { + case CHECK_HOST: + host = va_arg(ap, const char *); + key = va_arg(ap, const Key *); + found = va_arg(ap, Key *); + break; + case LOOKUP_KEY_BY_TYPE: + host = va_arg(ap, const char *); + keytype = va_arg(ap, int); + found = va_arg(ap, Key *); + break; + default: + return NS_NOTFOUND; + } + + switch (how) { + case CHECK_HOST: + rv = check_host_in_nis_by_key_or_type(host, key, 0, found, &numret); + + debug3("nis_check_host_by_key_or_type: CHECK_HOST - %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); + + case LOOKUP_KEY_BY_TYPE: + rv = (check_host_in_nis_by_key_or_type(host, NULL, keytype, found, + &numret) == HOST_FOUND); + + debug3("nis_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); + } + + return (NS_NOTFOUND); +} +#endif + /* nsswitch interface functions implementation */ HostStatus nsswitch_check_host(const char *host, const Key *key, Key *found) { static const ns_dtab dtab[] = { { NSSRC_FILES, files_check_host_by_key_or_type, (void *)CHECK_HOST }, +#ifdef YP + { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)CHECK_HOST }, +#endif { NULL, NULL, NULL } }; @@ -189,6 +375,9 @@ { static const ns_dtab dtab[] = { { NSSRC_FILES, files_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, +#ifdef YP + { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, +#endif { NULL, NULL, NULL } }; ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/initial_copy.sh#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/key.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/make.sh#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth-rh.rsa.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth2-hostbased.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-config.h.in#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure#2 (text+ko) ==== @@ -1,19363 +1,0 @@ ---- configure.orig Mon Jul 18 14:12:19 2005 -+++ configure Mon Jul 18 14:12:32 2005 -@@ -1,10 +1,19 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59 for OpenSSH Portable. -+# Generated by GNU Autoconf 2.53 for OpenSSH Portable. - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -+# Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -+ -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+ - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -13,57 +22,46 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi --DUALCASE=1; export DUALCASE # for MKS sh - -+# NLS nuisances. - # Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false - fi - -- --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -- --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -- --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && -+ { $as_unset LANG || test "${LANG+set}" != set; } || -+ { LANG=C; export LANG; } -+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && -+ { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || -+ { LC_ALL=C; export LC_ALL; } -+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && -+ { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || -+ { LC_TIME=C; export LC_TIME; } -+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && -+ { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || -+ { LC_CTYPE=C; export LC_CTYPE; } -+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && -+ { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || -+ { LANGUAGE=C; export LANGUAGE; } -+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && -+ { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || -+ { LC_COLLATE=C; export LC_COLLATE; } -+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && -+ { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || -+ { LC_NUMERIC=C; export LC_NUMERIC; } -+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && -+ { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || -+ { LC_MESSAGES=C; export LC_MESSAGES; } - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`(basename "$0") 2>/dev/null || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ -@@ -74,7 +72,6 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -- - # PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -85,15 +82,15 @@ - - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ echo "#! /bin/sh" >conftest.sh -+ echo "exit 0" >>conftest.sh -+ chmod +x conftest.sh -+ if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi -- rm -f conf$$.sh -+ rm -f conftest.sh - fi - - -@@ -141,8 +138,6 @@ - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} -@@ -215,20 +210,13 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- test -d ./-p && rmdir ./-p -- as_mkdir_p=false --fi -- - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - - # IFS -@@ -238,7 +226,7 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH -+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - - - # Name of the host. -@@ -252,7 +240,6 @@ - # Initializations. - # - ac_default_prefix=/usr/local --ac_config_libobj_dir=. - cross_compiling=no - subdirs= - MFLAGS= -@@ -309,8 +296,6 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR CAT KILL PERL SED ENT TEST_MINUS_S_SH SH TEST_SHELL PATH_GROUPADD_PROG PATH_USERADD_PROG MAKE_PACKAGE_SUPPORTED LOGIN_PROGRAM_FALLBACK PATH_PASSWD_PROG LD EGREP LIBWRAP LIBEDIT LIBPAM INSTALL_SSH_RAND_HELPER SSH_PRIVSEP_USER PROG_LS PROG_NETSTAT PROG_ARP PROG_IFCONFIG PROG_JSTAT PROG_PS PROG_SAR PROG_W PROG_WHO PROG_LAST PROG_LASTLOG PROG_DF PROG_VMSTAT PROG_UPTIME PROG_IPCS PROG_TAIL INSTALL_SSH_PRNG_CMDS OPENSC_CONFIG PRIVSEP_PATH xauth_path STRIP_OPT XAUTH_PATH NROFF MANTYPE mansubdir user_path piddir LIBOBJS LTLIBOBJS' --ac_subst_files='' - - # Initialize some variables set by options. - ac_init_help= -@@ -668,7 +653,7 @@ - - # Be sure to have absolute paths. - for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+ localstatedir libdir includedir oldincludedir infodir mandir - do - eval ac_val=$`echo $ac_var` - case $ac_val in -@@ -708,10 +693,10 @@ - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -734,9 +719,6 @@ - { (exit 1); exit 1; }; } - fi - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -803,9 +785,9 @@ - cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -941,45 +923,12 @@ - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -+# absolute. -+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. -@@ -990,7 +939,7 @@ - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -+ test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else -@@ -1004,9 +953,10 @@ - if $ac_init_version; then - cat <<\_ACEOF - OpenSSH configure Portable --generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.53 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -+Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1018,7 +968,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by OpenSSH $as_me Portable, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.53. Invocation command line was - - $ $0 $@ - -@@ -1070,54 +1020,27 @@ - - # Keep a trace of the command line. - # Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. --# Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= --ac_configure_args0= --ac_configure_args1= - ac_sep= --ac_must_keep_next=false --for ac_pass in 1 2 -+for ac_arg - do -- for ac_arg -- do -- case $ac_arg in -- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil) -- continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -- 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -- if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -- else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -- fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -- ;; -- esac -- done -+ case $ac_arg in -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n ) continue ;; -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ continue ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -+ ac_sep=" " ;; -+ esac -+ # Get rid of the leading space. - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there -@@ -1128,7 +1051,6 @@ - # Save into config.log some information that might help in debugging. - { - echo -- - cat <<\_ASBOX - ## ---------------- ## - ## Cache variables. ## -@@ -1141,45 +1063,16 @@ - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; - } - echo -- -- cat <<\_ASBOX --## ----------------- ## --## Output variables. ## --## ----------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_vars -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- -- if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -- echo -- for ac_var in $ac_subst_files -- do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -- done | sort -- echo -- fi -- - if test -s confdefs.h; then - cat <<\_ASBOX - ## ----------- ## -@@ -1187,14 +1080,14 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ sed "/^$/d" confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -+ rm -f core core.* *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -@@ -1274,7 +1167,7 @@ - # value. - ac_cache_corrupted=false - for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" -@@ -1291,13 +1184,13 @@ - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. -@@ -1354,8 +1247,7 @@ - - - -- -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1561,7 +1453,9 @@ - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ set dummy "$as_dir/$ac_word" ${1+"$@"} -+ shift -+ ac_cv_prog_CC="$@" - fi - fi - fi -@@ -1666,10 +1560,8 @@ - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. -@@ -1693,12 +1585,15 @@ - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+#line $LINENO "configure" -+#include "confdefs.h" - -+#ifdef F77_DUMMY_MAIN -+# ifdef __cplusplus -+ extern "C" -+# endif -+ int F77_DUMMY_MAIN() { return 1; } -+#endif - int - main () - { -@@ -1708,12 +1603,12 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.exe" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for C compiler default output" >&5 -+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 -@@ -1727,39 +1622,26 @@ - # Be careful to initialize this variable, since it used to be cached. - # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. - ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out --do -- test -f "$ac_file" || continue -+for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; -+ ls a.out conftest 2>/dev/null; -+ ls a.* conftest.* 2>/dev/null`; do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -- # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -- *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -- break;; -- * ) -- break;; -+ *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; -+ a.out ) # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ # FIXME: I believe we export ac_cv_exeext for Libtool --akim. -+ export ac_cv_exeext -+ break;; -+ * ) break;; - esac - done - else - echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -+cat conftest.$ac_ext >&5 -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 -+echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } - fi - -@@ -1786,11 +1668,9 @@ - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 -+If you meant to cross compile, use \`--host'." >&5 - echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -+If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } - fi - fi -@@ -1798,7 +1678,7 @@ - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f a.out a.exe conftest$ac_cv_exeext - ac_clean_files=$ac_clean_files_save - # Check the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. -@@ -1818,21 +1698,18 @@ - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with - # `rm'. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 8 10:36:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEC9616A421; Mon, 8 Aug 2005 10:36:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9924216A41F for ; Mon, 8 Aug 2005 10:36:41 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E97343D45 for ; Mon, 8 Aug 2005 10:36:41 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78AafuN008830 for ; Mon, 8 Aug 2005 10:36:41 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78Aafd6008827 for perforce@freebsd.org; Mon, 8 Aug 2005 10:36:41 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 8 Aug 2005 10:36:41 GMT Message-Id: <200508081036.j78Aafd6008827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 10:36:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=81643 Change 81643 by soc-bushman@soc-bushman_stinger on 2005/08/08 10:35:55 obsolete patch-configure deleted Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 8 16:38:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 431CE16A421; Mon, 8 Aug 2005 16:38:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17C8116A41F for ; Mon, 8 Aug 2005 16:38:02 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4CCB43D45 for ; Mon, 8 Aug 2005 16:38:01 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78Gc1Fc029588 for ; Mon, 8 Aug 2005 16:38:01 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78Gc1Iu029585 for perforce@freebsd.org; Mon, 8 Aug 2005 16:38:01 GMT (envelope-from soc-saturnero@freebsd.org) Date: Mon, 8 Aug 2005 16:38:01 GMT Message-Id: <200508081638.j78Gc1Iu029585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 16:38:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=81655 Change 81655 by soc-saturnero@soc-saturnero_sberta on 2005/08/08 16:37:17 Adding pkginstall target. Minor fixes to the pkgselect script Affected files ... .. //depot/projects/soc2005/freesbie/Makefile#9 edit .. //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#1 add .. //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#2 edit Differences ... ==== //depot/projects/soc2005/freesbie/Makefile#9 (text+ko) ==== @@ -49,8 +49,15 @@ @sh ./scripts/launch.sh installkernel .tmp_installkernel @mv .tmp_installkernel .done_installkernel +pkginstall: .done_pkginstall +.done_pkginstall: .done_installworld + @-rm -f .tmp_pkginstall + @touch .tmp_pkginstall + @sh ./scripts/launch.sh pkginstall .tmp_pkginstall + @mv .tmp_pkginstall .done_pkginstall + clonefs: .done_clonefs -.done_clonefs: .done_installkernel +.done_clonefs: .done_installkernel .done_pkginstall @-rm -f .tmp_clonefs @touch .tmp_clonefs @sh ./scripts/launch.sh clonefs .tmp_clonefs ==== //depot/projects/soc2005/freesbie/scripts/pkgselect.sh#2 (text+ko) ==== @@ -15,8 +15,6 @@ WORKDIR=$(mktemp -d -t freesbie) PKGFILE=${PKGFILE:-${LOCALDIR}/conf/packages}; -trap "rm -rf ${WORKDIR} && rm -rf ${LOGFILE} && exit 1" INT - create_lists() { cd ${WORKDIR} echo "Creating list of available packages on the build machine..." @@ -42,6 +40,7 @@ echo "Using ${PKGFILE} as source..." while read row; do + if [ -z ${row} ]; then continue; fi pkg=$(echo $row | cut -d\ -f 1) # pkg_info might fail if the listed package isn't present @@ -193,9 +192,10 @@ purge_wd() { cd ${LOCALDIR} rm -rf ${WORKDIR} - exit } +trap "purge_wd && exit 1" INT + create_lists main_dialog purge_wd From owner-p4-projects@FreeBSD.ORG Mon Aug 8 18:39:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B85DB16A421; Mon, 8 Aug 2005 18:39:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9356516A41F for ; Mon, 8 Aug 2005 18:39:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78F4043D49 for ; Mon, 8 Aug 2005 18:39:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78IdVt1042520 for ; Mon, 8 Aug 2005 18:39:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78IdVSn042517 for perforce@freebsd.org; Mon, 8 Aug 2005 18:39:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 18:39:31 GMT Message-Id: <200508081839.j78IdVSn042517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 18:39:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=81663 Change 81663 by rwatson@rwatson_peppercorn on 2005/08/08 18:39:17 Correct loop-back problems from integrate. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#23 edit .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#23 (text+ko) ==== @@ -720,7 +720,7 @@ ptc_drvinit(void *unused) { - EVENTHANDLER_REGISTER(dev_clone_cred, pty_clone, 0, 1000); + EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); } SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ptc_drvinit,NULL) ==== //depot/projects/trustedbsd/mac/sys/sys/conf.h#29 (text+ko) ==== @@ -285,10 +285,6 @@ int dev_stdclone(char *_name, char **_namep, const char *_stem, int *_unit); EVENTHANDLER_DECLARE(dev_clone, dev_clone_fn); -typedef void (*dev_clone_cred_fn)(void *arg, struct ucred *cred, char *name, - int namelen, struct cdev **result); -EVENTHANDLER_DECLARE(dev_clone_cred, dev_clone_cred_fn); - /* Stuff relating to kernel-dump */ struct dumperinfo { From owner-p4-projects@FreeBSD.ORG Mon Aug 8 19:18:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B5F116A422; Mon, 8 Aug 2005 19:18:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02D6816A420 for ; Mon, 8 Aug 2005 19:18:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36FCC43D48 for ; Mon, 8 Aug 2005 19:18:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78JINCe044275 for ; Mon, 8 Aug 2005 19:18:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78JILvY044271 for perforce@freebsd.org; Mon, 8 Aug 2005 19:18:21 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Aug 2005 19:18:21 GMT Message-Id: <200508081918.j78JILvY044271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 19:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=81668 Change 81668 by sam@sam_ebb on 2005/08/08 19:18:01 IFC @ 81665 Affected files ... .. //depot/projects/wifi/MAINTAINERS#7 integrate .. //depot/projects/wifi/Makefile#11 integrate .. //depot/projects/wifi/Makefile.inc1#23 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#2 integrate .. //depot/projects/wifi/bin/csh/Makefile#3 integrate .. //depot/projects/wifi/bin/dd/dd.1#6 integrate .. //depot/projects/wifi/bin/sleep/sleep.c#3 integrate .. //depot/projects/wifi/contrib/opie/libopie/readrec.c#2 integrate .. //depot/projects/wifi/contrib/opie/libopie/writerec.c#2 integrate .. //depot/projects/wifi/contrib/pf/man/pf.os.5#3 integrate .. //depot/projects/wifi/contrib/pf/man/pfsync.4#5 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.8#3 integrate .. //depot/projects/wifi/contrib/smbfs/lib/smb/ctx.c#3 integrate .. //depot/projects/wifi/contrib/smbfs/smbutil/dumptree.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#18 integrate .. //depot/projects/wifi/etc/devd.conf#11 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#10 integrate .. //depot/projects/wifi/etc/rc.d/cleanvar#3 integrate .. //depot/projects/wifi/etc/rc.d/encswap#1 branch .. //depot/projects/wifi/etc/rc.d/gbde_swap#2 delete .. //depot/projects/wifi/etc/rc.d/jail#7 integrate .. //depot/projects/wifi/games/fortune/datfiles/freebsd-tips#6 integrate .. //depot/projects/wifi/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/bc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#5 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#6 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/wifi/include/Makefile#14 integrate .. //depot/projects/wifi/include/histedit.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#6 integrate .. //depot/projects/wifi/lib/libautofs/libautofs.3#4 integrate .. //depot/projects/wifi/lib/libc/Makefile#5 integrate .. //depot/projects/wifi/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/wifi/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/wifi/lib/libc/include/namespace.h#2 integrate .. //depot/projects/wifi/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/wifi/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/libc/net/inet6_rth_space.3#5 integrate .. //depot/projects/wifi/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_prepare.3#3 integrate .. //depot/projects/wifi/lib/libc/stdtime/strftime.3#4 integrate .. //depot/projects/wifi/lib/libc/sys/kse.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/read.2#6 integrate .. //depot/projects/wifi/lib/libc/sys/recv.2#5 integrate .. //depot/projects/wifi/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/wifi/lib/libedit/Makefile#3 integrate .. //depot/projects/wifi/lib/libedit/TEST/test.c#2 integrate .. //depot/projects/wifi/lib/libedit/chared.c#2 integrate .. //depot/projects/wifi/lib/libedit/chared.h#2 integrate .. //depot/projects/wifi/lib/libedit/common.c#2 integrate .. //depot/projects/wifi/lib/libedit/editline.3#3 integrate .. //depot/projects/wifi/lib/libedit/editrc.5#3 integrate .. //depot/projects/wifi/lib/libedit/el.c#2 integrate .. //depot/projects/wifi/lib/libedit/el.h#2 integrate .. //depot/projects/wifi/lib/libedit/emacs.c#2 integrate .. //depot/projects/wifi/lib/libedit/hist.c#2 integrate .. //depot/projects/wifi/lib/libedit/hist.h#2 integrate .. //depot/projects/wifi/lib/libedit/history.c#2 integrate .. //depot/projects/wifi/lib/libedit/key.c#2 integrate .. //depot/projects/wifi/lib/libedit/key.h#2 integrate .. //depot/projects/wifi/lib/libedit/makelist#2 integrate .. //depot/projects/wifi/lib/libedit/map.c#2 integrate .. //depot/projects/wifi/lib/libedit/map.h#2 integrate .. //depot/projects/wifi/lib/libedit/parse.c#2 integrate .. //depot/projects/wifi/lib/libedit/parse.h#2 integrate .. //depot/projects/wifi/lib/libedit/prompt.c#2 integrate .. //depot/projects/wifi/lib/libedit/prompt.h#2 integrate .. //depot/projects/wifi/lib/libedit/read.c#2 integrate .. //depot/projects/wifi/lib/libedit/read.h#1 branch .. //depot/projects/wifi/lib/libedit/refresh.c#2 integrate .. //depot/projects/wifi/lib/libedit/refresh.h#2 integrate .. //depot/projects/wifi/lib/libedit/search.c#2 integrate .. //depot/projects/wifi/lib/libedit/search.h#2 integrate .. //depot/projects/wifi/lib/libedit/sig.c#2 integrate .. //depot/projects/wifi/lib/libedit/sig.h#2 integrate .. //depot/projects/wifi/lib/libedit/sys.h#2 integrate .. //depot/projects/wifi/lib/libedit/term.c#2 integrate .. //depot/projects/wifi/lib/libedit/term.h#2 integrate .. //depot/projects/wifi/lib/libedit/tokenizer.c#2 integrate .. //depot/projects/wifi/lib/libedit/tokenizer.h#2 delete .. //depot/projects/wifi/lib/libedit/tty.c#2 integrate .. //depot/projects/wifi/lib/libedit/tty.h#2 integrate .. //depot/projects/wifi/lib/libedit/vi.c#2 integrate .. //depot/projects/wifi/lib/libkiconv/xlat16_iconv.c#2 integrate .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#5 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.c#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.h#5 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_all.c#2 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_internal.h#5 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_malloc.c#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_uma.c#5 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/i386/pthread_md.c#6 integrate .. //depot/projects/wifi/lib/libpthread/pthread.map#3 integrate .. //depot/projects/wifi/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sleep.c#2 integrate .. //depot/projects/wifi/lib/libthr/pthread.map#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/wifi/rescue/librescue/Makefile#4 integrate .. //depot/projects/wifi/sbin/atacontrol/atacontrol.c#5 integrate .. //depot/projects/wifi/sbin/atm/atmconfig/diag.c#2 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/wifi/sbin/dump/dump.8#4 integrate .. //depot/projects/wifi/sbin/fsdb/fsdb.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#5 integrate .. //depot/projects/wifi/sbin/geom/class/eli/Makefile#3 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/wifi/sbin/ggate/ggatec/ggatec.8#3 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/wifi/sbin/mount_ext2fs/mount_ext2fs.c#3 integrate .. //depot/projects/wifi/sbin/routed/input.c#3 integrate .. //depot/projects/wifi/secure/lib/libssl/Makefile#5 integrate .. //depot/projects/wifi/share/Makefile#3 integrate .. //depot/projects/wifi/share/doc/papers/Makefile#4 integrate .. //depot/projects/wifi/share/doc/papers/px/Makefile#3 delete .. //depot/projects/wifi/share/doc/papers/px/fig1.1.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig1.2.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig1.3.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig2.3.raw#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig2.4.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig3.2.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/fig3.3.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/pxin0.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/pxin1.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/pxin2.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/pxin3.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/pxin4.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/table2.1.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/table2.2.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/table2.3.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/table3.1.n#2 delete .. //depot/projects/wifi/share/doc/papers/px/tmac.p#2 delete .. //depot/projects/wifi/share/doc/usd/18.msdiffs/ms.diffs#2 integrate .. //depot/projects/wifi/share/man/man4/ata.4#7 integrate .. //depot/projects/wifi/share/man/man4/hwpmc.4#6 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_ibm.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_panasonic.4#6 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#9 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/pbio.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/snd_audiocs.4#3 integrate .. //depot/projects/wifi/share/man/man4/re.4#6 integrate .. //depot/projects/wifi/share/man/man4/rl.4#7 integrate .. //depot/projects/wifi/share/man/man4/snd_es137x.4#4 integrate .. //depot/projects/wifi/share/man/man4/twe.4#6 integrate .. //depot/projects/wifi/share/man/man4/uhid.4#2 integrate .. //depot/projects/wifi/share/man/man4/witness.4#5 integrate .. //depot/projects/wifi/share/man/man5/Makefile#4 integrate .. //depot/projects/wifi/share/man/man5/devfs.conf.5#3 integrate .. //depot/projects/wifi/share/man/man5/disktab.5#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/wifi/share/man/man7/build.7#4 integrate .. //depot/projects/wifi/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/wifi/share/man/man9/driver.9#3 integrate .. //depot/projects/wifi/share/man/man9/ifnet.9#6 integrate .. //depot/projects/wifi/share/man/man9/mbuf.9#6 integrate .. //depot/projects/wifi/share/man/man9/printf.9#4 integrate .. //depot/projects/wifi/share/mk/bsd.incs.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.lib.mk#5 integrate .. //depot/projects/wifi/share/termcap/Makefile#3 integrate .. //depot/projects/wifi/share/termcap/map3270#2 delete .. //depot/projects/wifi/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/wifi/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/wifi/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/wifi/sys/arm/arm/db_trace.c#6 integrate .. //depot/projects/wifi/sys/boot/common/console.c#3 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/wifi/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/wifi/sys/dev/aac/aac_compat.h#2 delete .. //depot/projects/wifi/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/Makefile#4 integrate .. //depot/projects/wifi/sys/dev/amr/amr.c#10 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/wifi/sys/dev/amr/amr_compat.h#2 delete .. //depot/projects/wifi/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/wifi/sys/dev/amr/amr_pci.c#8 integrate .. //depot/projects/wifi/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#6 integrate .. //depot/projects/wifi/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/wifi/sys/dev/ata/ata-raid.c#11 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#99 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#11 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/wifi/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/wifi/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#12 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/wifi/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb.c#5 integrate .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#8 integrate .. //depot/projects/wifi/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/wifi/sys/dev/mlx/mlx_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/mly/mly.c#4 integrate .. //depot/projects/wifi/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/wifi/sys/dev/my/if_my.c#4 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#7 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#6 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/wifi/sys/dev/puc/puc_ebus.c#4 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#8 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#7 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/wifi/sys/dev/snc/dp83932.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.h#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/fake.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/wifi/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/wifi/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_sparc64.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#6 integrate .. //depot/projects/wifi/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/wifi/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#6 integrate .. //depot/projects/wifi/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/wifi/sys/i386/i386/ptrace_machdep.c#3 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/wifi/sys/ia64/ia64/db_trace.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/wifi/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/wifi/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/wifi/sys/ia64/ia64/vm_machdep.c#8 integrate .. //depot/projects/wifi/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/wifi/sys/ia64/include/param.h#4 integrate .. //depot/projects/wifi/sys/ia64/include/proc.h#4 integrate .. //depot/projects/wifi/sys/ia64/include/smp.h#3 integrate .. //depot/projects/wifi/sys/isa/isa_common.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_environment.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_pmc.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_switch.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#14 integrate .. //depot/projects/wifi/sys/kern/subr_hints.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_mchain.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_stack.c#1 branch .. //depot/projects/wifi/sys/kern/subr_witness.c#11 integrate .. //depot/projects/wifi/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#19 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/wifi/sys/libkern/strcasecmp.c#1 branch .. //depot/projects/wifi/sys/net/if.c#17 integrate .. //depot/projects/wifi/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/wifi/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/wifi/sys/net/if_gre.c#4 integrate .. //depot/projects/wifi/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/wifi/sys/net/if_var.h#15 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#27 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#12 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#12 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#17 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#18 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#60 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#46 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#29 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#62 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#31 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#54 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#34 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/wifi/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/wifi/sys/netinet/igmp.c#4 integrate .. //depot/projects/wifi/sys/netinet/in.c#7 integrate .. //depot/projects/wifi/sys/netinet/in_var.h#3 integrate .. //depot/projects/wifi/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#8 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/wifi/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/wifi/sys/netinet6/mld6.c#6 integrate .. //depot/projects/wifi/sys/netkey/key.c#5 integrate .. //depot/projects/wifi/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/wifi/sys/netsmb/smb_subr.c#3 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#7 integrate .. //depot/projects/wifi/sys/pci/if_de.c#7 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#7 integrate .. //depot/projects/wifi/sys/pci/if_pcnreg.h#5 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#6 integrate .. //depot/projects/wifi/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/wifi/sys/pci/if_sf.c#7 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#7 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#14 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#5 integrate .. //depot/projects/wifi/sys/pci/if_ti.c#9 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#5 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#6 integrate .. //depot/projects/wifi/sys/pci/if_wb.c#5 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#9 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#9 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/db_trace.c#4 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/wifi/sys/sys/ata.h#5 integrate .. //depot/projects/wifi/sys/sys/kobj.h#2 integrate .. //depot/projects/wifi/sys/sys/libkern.h#4 integrate .. //depot/projects/wifi/sys/sys/lockmgr.h#7 integrate .. //depot/projects/wifi/sys/sys/mac_policy.h#7 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#13 integrate .. //depot/projects/wifi/sys/sys/mchain.h#3 integrate .. //depot/projects/wifi/sys/sys/mount.h#12 integrate .. //depot/projects/wifi/sys/sys/pmckern.h#3 integrate .. //depot/projects/wifi/sys/sys/queue.h#4 integrate .. //depot/projects/wifi/sys/sys/shm.h#6 integrate .. //depot/projects/wifi/sys/sys/soundcard.h#3 integrate .. //depot/projects/wifi/sys/sys/stack.h#1 branch .. //depot/projects/wifi/sys/sys/vnode.h#24 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/wifi/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/wifi/sys/vm/uma_int.h#9 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#5 integrate .. //depot/projects/wifi/tools/tools/ath/80211debug.c#8 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/mkhtml.sh#1 branch .. //depot/projects/wifi/tools/tools/build_option_survey/no_list#1 branch .. //depot/projects/wifi/tools/tools/build_option_survey/option_survey.sh#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Customize/files#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/wifi/tools/tools/syscall_timing/syscall_timing.c#3 integrate .. //depot/projects/wifi/tools/tools/tinderbox/tbmaster.pl#5 integrate .. //depot/projects/wifi/usr.bin/Makefile#8 integrate .. //depot/projects/wifi/usr.bin/at/parsetime.c#2 integrate .. //depot/projects/wifi/usr.bin/bsdiff/Makefile#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/Makefile.inc#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bsdiff/Makefile#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bsdiff/bsdiff.1#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bsdiff/bsdiff.c#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bspatch/Makefile#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bspatch/bspatch.1#1 branch .. //depot/projects/wifi/usr.bin/bsdiff/bspatch/bspatch.c#1 branch .. //depot/projects/wifi/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/wifi/usr.bin/file2c/file2c.1#3 integrate .. //depot/projects/wifi/usr.bin/fstat/fstat.c#7 integrate .. //depot/projects/wifi/usr.bin/indent/indent.1#4 integrate .. //depot/projects/wifi/usr.bin/ipcs/ipcs.c#6 integrate .. //depot/projects/wifi/usr.bin/lam/lam.c#2 integrate .. //depot/projects/wifi/usr.bin/lockf/lockf.1#5 integrate .. //depot/projects/wifi/usr.bin/make/make.1#10 integrate .. //depot/projects/wifi/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/wifi/usr.bin/netstat/main.c#5 integrate .. //depot/projects/wifi/usr.bin/passwd/passwd.1#4 integrate .. //depot/projects/wifi/usr.bin/printf/printf.c#6 integrate .. //depot/projects/wifi/usr.bin/rlogin/rlogin.c#3 integrate .. //depot/projects/wifi/usr.bin/rwho/rwho.1#3 integrate .. //depot/projects/wifi/usr.bin/sed/compile.c#3 integrate .. //depot/projects/wifi/usr.bin/systat/systat.1#4 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/wifi/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/wifi/usr.bin/truss/truss.1#2 integrate .. //depot/projects/wifi/usr.bin/vmstat/vmstat.c#7 integrate .. //depot/projects/wifi/usr.bin/xinstall/install.1#4 integrate .. //depot/projects/wifi/usr.bin/xlint/lint1/main1.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint1/mem1.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/chk.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/emit2.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/hash.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/mem2.c#2 integrate .. //depot/projects/wifi/usr.bin/xlint/lint2/read.c#2 integrate .. //depot/projects/wifi/usr.sbin/IPXrouted/trace.c#2 integrate .. //depot/projects/wifi/usr.sbin/Makefile#14 integrate .. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#5 integrate .. //depot/projects/wifi/usr.sbin/amd/Makefile.inc#3 integrate .. //depot/projects/wifi/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/amd/include/config.h#2 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#4 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/sdpd/sdpd.8#3 integrate .. //depot/projects/wifi/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/wifi/usr.sbin/chkgrp/chkgrp.c#3 integrate .. //depot/projects/wifi/usr.sbin/cron/crontab/crontab.5#3 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnd/isdnd.rc.5#3 integrate .. //depot/projects/wifi/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/wifi/usr.sbin/mtree/mtree.8#6 integrate .. //depot/projects/wifi/usr.sbin/ndiscvt/ndiscvt.8#4 integrate .. //depot/projects/wifi/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/wifi/usr.sbin/pppd/pppd.8#2 integrate .. //depot/projects/wifi/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/system.c#3 integrate .. //depot/projects/wifi/usr.sbin/syslogd/syslog.conf.5#4 integrate .. //depot/projects/wifi/usr.sbin/vipw/vipw.8#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/l2_packet.c#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.121 2005/06/04 16:56:35 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.123 2005/08/06 06:46:29 pjd Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -111,6 +111,7 @@ contrib/bzip2 obrien Pre-commit review required. lukemftpd obrien Pre-commit review required. geom_concat pjd Pre-commit review preferred. +geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. geom_mirror pjd Pre-commit review preferred. @@ -118,6 +119,7 @@ geom_raid3 pjd Pre-commit review preferred. geom_shsec pjd Pre-commit review preferred. geom_stripe pjd Pre-commit review preferred. +geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. nfs alfred Will be happy to review code, but not mandatory. rpc.lockd alfred Will be happy to review code, but not mandatory. @@ -125,6 +127,7 @@ rpc alfred Pre-commit review requested. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. +bs{diff,patch} cperciva Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/wifi/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.322 2005/07/23 14:23:30 netchild Exp $ +# $FreeBSD: src/Makefile,v 1.323 2005/07/29 21:51:33 netchild Exp $ # # The user-driven targets are: # ==== //depot/projects/wifi/Makefile.inc1#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.502 2005/07/25 14:44:09 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.510 2005/08/07 13:47:25 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -236,14 +236,8 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML \ - CC="${CC} ${LIB32CC}" \ - CXX="${CXX} ${LIB32CXX}" \ - OBJC="${OBJC} ${LIB32OBJC}" \ - LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ - AS="${AS} --32" \ - LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 + -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML +LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} .endif # install stage @@ -280,6 +274,9 @@ @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} +.if ${TARGET_ARCH} == "amd64" + rm -rf ${LIB32TMP} +.endif .else rm -rf ${WORLDTMP}/legacy/usr/include # XXX - These two can depend on any header file. @@ -338,7 +335,10 @@ @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} +.if ${TARGET_ARCH} == "amd64" + rm -rf ${OBJTREE}/lib32 .endif +.endif _obj: @echo @echo "--------------------------------------------------------------" @@ -397,6 +397,7 @@ .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null + mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} .if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) .for _t in obj depend all @@ -441,12 +442,12 @@ .else mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree .endif - cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if !defined(NO_CRYPT) - cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} .endif @@ -1051,6 +1052,8 @@ .include +.if make(delete-old) || make(delete-old-libs) || make(check-old) + # # check for / delete old files section # @@ -1064,12 +1067,11 @@ .if !defined(BATCH_DELETE_OLD_FILES) RM_I=-i +.else +RM_I=-v .endif delete-old-files: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Removing old files (only deletes safe to delete libs)" .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. @@ -1080,21 +1082,37 @@ && chflags noschg "${DESTDIR}/${file}" \ && rm ${RM_I} "${DESTDIR}/${file}")) .endfor +# Remove catpages without corresponding manpages. + @for dir in ${DESTDIR}/usr/share/man/cat*; do \ + for catpage in $${dir}/*; do \ + manpage=$$(echo $${catpage} \ + | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:') \ + check_empty=$$(echo $${catpage} \ + | sed 's:.*\*:empty:'); \ + [ $${check_empty} != empty -a ! -e $${manpage} ] \ + && rm ${RM_I} $${catpage} || true; \ + done; \ + done @echo ">>> Old files removed" check-old-files: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Checking for old files" .for file in ${OLD_FILES} @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor +# Check for catpages without corresponding manpages. + @for dir in ${DESTDIR}/usr/share/man/cat*; do \ + for catpage in $${dir}/*; do \ + manpage=$$(echo $${catpage} \ + | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:'); \ + check_empty=$$(echo $${catpage} \ + | sed 's:.*\*:empty:'); \ + [ $${check_empty} != empty -a ! -e $${manpage} ] \ + && echo $${catpage} || true; \ + done; \ + done delete-old-libs: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} @@ -1107,18 +1125,12 @@ @echo ">>> Old libraries removed" check-old-libs: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor delete-old-dirs: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. @@ -1127,9 +1139,6 @@ @echo ">>> Old directories removed" check-old-dirs: -.if defined(${TARGET_ARCH}) -.error "You have to run this in a native environment!" -.endif @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" @@ -1142,3 +1151,5 @@ @echo "To remove old files and directories run '${MAKE} delete-old'." @echo "To remove old libraries run '${MAKE} delete-old-libs'." +.endif + ==== //depot/projects/wifi/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.4 2005/07/26 19:21:10 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.11 2005/08/07 13:46:28 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -11,13 +11,36 @@ # In case of a complete directory hierarchy the sorting is in depth first # order. # +# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. +# +# 20050805 tn3270 retired long ago +OLD_FILES+=usr/share/misc/map3270 +# 20050801: too old to be interesting here +OLD_FILES+=usr/share/doc/papers/px.ps.gz # 20050721: moved to ports OLD_FILES+=usr/sbin/vttest +OLD_FILES+=usr/share/man/man1/vttest.1.gz # 20050610: rexecd (insecure by design) OLD_FILES+=etc/pam.d/rexecd OLD_FILES+=usr/share/man/man8/rexecd.8.gz OLD_FILES+=usr/libexec/rexecd +# 20050606: OpenBSD dhclient replaces ISC one +OLD_FILES+=bin/omshell +OLD_FILES+=usr/share/man/man1/omshell.1.gz +OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz +# 200504XX: ipf tools moved from /usr to / +OLD_FILES+=usr/sbin/ipftest +OLD_FILES+=usr/sbin/ipresend +OLD_FILES+=usr/sbin/ipsend +OLD_FILES+=usr/sbin/iptest +OLD_FILES+=usr/share/man/man1/ipnat.1.gz +OLD_FILES+=usr/share/man/man1/ipsend.1.gz +OLD_FILES+=usr/share/man/man1/iptest.1.gz +OLD_FILES+=usr/share/man/man5/ipsend.5.gz +# 200503XX: bsdtar takes over gtar +OLD_FILES+=usr/bin/gtar +OLD_FILES+=usr/share/man/man1/gtar.1.gz # 20050324: updated release infrastructure OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz # 20050317: removed from BIND 9 distribution @@ -26,9 +49,13 @@ OLD_FILES+=sbin/mount_autofs OLD_FILES+=usr/lib/libautofs.a OLD_FILES+=usr/lib/libautofs.so -# 20050203 Merged with fortunes +OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz +# 20050203: Merged with fortunes OLD_FILES+=usr/share/games/fortune/fortunes2 OLD_FILES+=usr/share/games/fortune/fortunes2.dat +# 200411XX: gvinum replaces vinum +OLD_FILES+=bin/vinum +OLD_FILES+=usr/share/man/man8/vinum.8.gz # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -43,13 +70,164 @@ OLD_FILES+=usr/sbin/ndc OLD_FILES+=usr/sbin/nslookup OLD_FILES+=usr/sbin/nsupdate -OLD_DIRS+=usr/share/doc/bind +OLD_FILES+=usr/share/doc/bind/html/acl.html +OLD_FILES+=usr/share/doc/bind/html/address_list.html +OLD_FILES+=usr/share/doc/bind/html/comments.html +OLD_FILES+=usr/share/doc/bind/html/config.html +OLD_FILES+=usr/share/doc/bind/html/controls.html +OLD_FILES+=usr/share/doc/bind/html/docdef.html +OLD_FILES+=usr/share/doc/bind/html/example.html +OLD_FILES+=usr/share/doc/bind/html/include.html +OLD_FILES+=usr/share/doc/bind/html/index.html +OLD_FILES+=usr/share/doc/bind/html/key.html +OLD_FILES+=usr/share/doc/bind/html/logging.html +OLD_FILES+=usr/share/doc/bind/html/master.html +OLD_FILES+=usr/share/doc/bind/html/options.html +OLD_FILES+=usr/share/doc/bind/html/server.html +OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html +OLD_FILES+=usr/share/doc/bind/html/zone.html +OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate +OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2 +OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2 +OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt +OLD_FILES+=usr/share/doc/bind/misc/style.txt +OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz +OLD_FILES+=usr/share/man/man1/dnsquery.1.gz +OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz +OLD_FILES+=usr/share/man/man8/named-xfer.8.gz +OLD_FILES+=usr/share/man/man8/named.restart.8.gz +OLD_FILES+=usr/share/man/man8/ndc.8.gz +OLD_FILES+=usr/share/man/man8/nslookup.8.gz +# 200409XX +OLD_FILES+=usr/share/man/man3/ENSURE.3.gz +OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz +OLD_FILES+=usr/share/man/man3/INSIST.3.gz +OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz +OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz +OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz +OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz +OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz +OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz +OLD_FILES+=usr/share/man/man3/assertions.3.gz +OLD_FILES+=usr/share/man/man3/bitncmp.3.gz +OLD_FILES+=usr/share/man/man3/evAddTime.3.gz +OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz +OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz +OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz +OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz +OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz +OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz +OLD_FILES+=usr/share/man/man3/evConnect.3.gz +OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz +OLD_FILES+=usr/share/man/man3/evConsTime.3.gz +OLD_FILES+=usr/share/man/man3/evCreate.3.gz +OLD_FILES+=usr/share/man/man3/evDefer.3.gz +OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz +OLD_FILES+=usr/share/man/man3/evDestroy.3.gz +OLD_FILES+=usr/share/man/man3/evDispatch.3.gz +OLD_FILES+=usr/share/man/man3/evDo.3.gz +OLD_FILES+=usr/share/man/man3/evDrop.3.gz +OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz +OLD_FILES+=usr/share/man/man3/evGetNext.3.gz +OLD_FILES+=usr/share/man/man3/evHold.3.gz +OLD_FILES+=usr/share/man/man3/evInitID.3.gz +OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz +OLD_FILES+=usr/share/man/man3/evListen.3.gz +OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz +OLD_FILES+=usr/share/man/man3/evNowTime.3.gz +OLD_FILES+=usr/share/man/man3/evPrintf.3.gz +OLD_FILES+=usr/share/man/man3/evRead.3.gz +OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz +OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz +OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz +OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz +OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz +OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz +OLD_FILES+=usr/share/man/man3/evSubTime.3.gz +OLD_FILES+=usr/share/man/man3/evTestID.3.gz +OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz +OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz +OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz +OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz +OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz +OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz +OLD_FILES+=usr/share/man/man3/evUnhold.3.gz +OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz +OLD_FILES+=usr/share/man/man3/evUnwait.3.gz +OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz +OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz +OLD_FILES+=usr/share/man/man3/evWrite.3.gz +OLD_FILES+=usr/share/man/man3/eventlib.3.gz +OLD_FILES+=usr/share/man/man3/heap.3.gz +OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz +OLD_FILES+=usr/share/man/man3/heap_delete.3.gz +OLD_FILES+=usr/share/man/man3/heap_element.3.gz +OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz +OLD_FILES+=usr/share/man/man3/heap_free.3.gz +OLD_FILES+=usr/share/man/man3/heap_increased.3.gz +OLD_FILES+=usr/share/man/man3/heap_insert.3.gz +OLD_FILES+=usr/share/man/man3/heap_new.3.gz +OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz +OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz +OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz +OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_free_context.3.gz +OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz +OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz +OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz +OLD_FILES+=usr/share/man/man3/log_new_context.3.gz +OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz +OLD_FILES+=usr/share/man/man3/log_option.3.gz +OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz +OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz +OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz +OLD_FILES+=usr/share/man/man3/log_write.3.gz +OLD_FILES+=usr/share/man/man3/logging.3.gz +OLD_FILES+=usr/share/man/man3/memcluster.3.gz +OLD_FILES+=usr/share/man/man3/memget.3.gz +OLD_FILES+=usr/share/man/man3/memput.3.gz +OLD_FILES+=usr/share/man/man3/memstats.3.gz +OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3. +OLD_FILES+=usr/share/man/man3/sigwait.3.gz +OLD_FILES+=usr/share/man/man3/tree_add.3.gz +OLD_FILES+=usr/share/man/man3/tree_delete.3.gz +OLD_FILES+=usr/share/man/man3/tree_init.3.gz +OLD_FILES+=usr/share/man/man3/tree_mung.3.gz +OLD_FILES+=usr/share/man/man3/tree_srch.3.gz +OLD_FILES+=usr/share/man/man3/tree_trav.3.gz # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 -.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" +# 200407XX +OLD_FILES+=usr/sbin/kernbb +OLD_FILES+=usr/sbin/ntp-genkeys +OLD_FILES+=usr/sbin/ntptimeset +OLD_FILES+=usr/share/man/man8/kernbb.8.gz +OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz +# 200406XX +OLD_FILES+=usr/bin/gasp +OLD_FILES+=usr/bin/gdbreplay +OLD_FILES+=usr/share/man/man1/gasp.1.gz +# 200405XX: arl +OLD_FILES+=usr/sbin/arlconfig +OLD_FILES+=usr/share/man/man8/arlconfig.8.gz +# 200403XX +OLD_FILES+=bin/raidctl +OLD_FILES+=usr/bin/sasc +OLD_FILES+=usr/sbin/sgsc +OLD_FILES+=usr/sbin/stlload +OLD_FILES+=usr/sbin/stlstats +OLD_FILES+=usr/share/man/man1/sasc.1.gz +OLD_FILES+=usr/share/man/man1/sgsc.1.gz +OLD_FILES+=usr/share/man/man4/i386/stl.4.gz +OLD_FILES+=usr/share/man/man8/raidctl.8.gz +.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64" # 20040130: libkse renamed to libpthread OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse.so @@ -75,6 +253,21 @@ OLD_FILES+=lib/libsbuf.so OLD_FILES+=lib/libufs.so OLD_FILES+=lib/libz.so +# 200312XX +OLD_FILES+=bin/cxconfig +OLD_FILES+=usr/share/man/man8/cxconfig.8.gz +# 200309XX +OLD_FILES+=usr/bin/symorder +OLD_FILES+=usr/share/man/man1/symorder.1.gz +# 200308XX +OLD_FILES+=usr/sbin/amldb +OLD_FILES+=usr/share/man/man8/amldb.8.gz +# 200306XX +OLD_FILES+=bin/mount_nwfs +OLD_FILES+=bin/mount_portalfs +OLD_FILES+=bin/mount_smbfs +OLD_FILES+=usr/sbin/dev_mkdb +OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz # 200304XX OLD_FILES+=usr/lib/libcipher.a OLD_FILES+=usr/lib/libcipher.so @@ -91,6 +284,10 @@ OLD_FILES+=usr/lib/libskey.a OLD_FILES+=usr/lib/libskey.so OLD_FILES+=usr/lib/libskey_p.a +# 200304XX: removal of xten +OLD_FILES+=usr/sbin/xten +OLD_FILES+=usr/share/man/man1/xten.1.gz +OLD_FILES+=usr/share/man/man8/xtend.8.gz # 200303XX OLD_FILES+=usr/lib/libacl.so OLD_FILES+=usr/lib/libdescrypt.so @@ -114,6 +311,166 @@ OLD_FILES+=usr/lib/libkrb.a OLD_FILES+=usr/lib/libkrb.so OLD_FILES+=usr/lib/libkrb_p.a +OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz +OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3 +OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz +OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 8 20:10:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02EB516A47C; Mon, 8 Aug 2005 20:10:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B143816A4D0 for ; Mon, 8 Aug 2005 20:10:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 627EE43D45 for ; Mon, 8 Aug 2005 20:10:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78KAT7v047114 for ; Mon, 8 Aug 2005 20:10:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78KATeg047108 for perforce@freebsd.org; Mon, 8 Aug 2005 20:10:29 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Aug 2005 20:10:29 GMT Message-Id: <200508082010.j78KATeg047108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 20:10:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=81675 Change 81675 by sam@sam_ebb on 2005/08/08 20:10:01 fixup mis-merges Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 (text+ko) ==== @@ -423,11 +423,6 @@ ic->ic_stats.is_crypto_delkey++; /* XXX recovery? */ } - /* - * Clear any unicast key index -> node mapping. - */ - if ((key->wk_flags & IEEE80211_KEY_GROUP) == 0) - ieee80211_node_delkey(&ic->ic_sta, keyix); } cipher_detach(key); memset(key, 0, sizeof(*key)); ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 (text+ko) ==== @@ -2062,13 +2062,13 @@ ic->ic_stats.is_rx_chanmismatch++; return; } - if (!(IEEE80211_BINTVAL_MIN <= bintval && - bintval <= IEEE80211_BINTVAL_MAX)) { + if (!(IEEE80211_BINTVAL_MIN <= scan.bintval && + scan.bintval <= IEEE80211_BINTVAL_MAX)) { IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT, wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - "bogus beacon interval", bintval); + "bogus beacon interval", scan.bintval); ic->ic_stats.is_rx_badbintval++; return; } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 (text+ko) ==== @@ -224,8 +224,6 @@ ieee80211_scan_lock_t nt_scanlock; /* on nt_scangen */ u_int nt_scangen; /* gen# for timeout scan */ int nt_inact_init; /* initial node inact setting */ - struct ieee80211_node **nt_keyixmap; /* key ix -> node map */ - int nt_keyixmax; /* keyixmap size */ }; struct ieee80211_node *ieee80211_alloc_node( ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 (text+ko) ==== @@ -125,7 +125,7 @@ u_int8_t bchan; u_int8_t fhindex; u_int8_t erp; - u_int8_t bintval; + u_int16_t bintval; u_int8_t timoff; u_int8_t *tim; u_int8_t *tstamp; From owner-p4-projects@FreeBSD.ORG Mon Aug 8 20:10:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D46A16A4F7; Mon, 8 Aug 2005 20:10:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0944C16A4D0 for ; Mon, 8 Aug 2005 20:10:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B51FE43D45 for ; Mon, 8 Aug 2005 20:10:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78KATwf047122 for ; Mon, 8 Aug 2005 20:10:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78KATOA047117 for perforce@freebsd.org; Mon, 8 Aug 2005 20:10:29 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Aug 2005 20:10:29 GMT Message-Id: <200508082010.j78KATOA047117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 20:10:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=81676 Change 81676 by sam@sam_ebb on 2005/08/08 20:10:11 mis-merge Affected files ... .. //depot/projects/wifi/sys/sys/mbuf.h#14 edit Differences ... ==== //depot/projects/wifi/sys/sys/mbuf.h#14 (text+ko) ==== @@ -572,7 +572,6 @@ struct uio; -void m_align(struct mbuf *, int); void m_adj(struct mbuf *, int); void m_align(struct mbuf *, int); int m_apply(struct mbuf *, int, int, From owner-p4-projects@FreeBSD.ORG Mon Aug 8 20:12:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F9E116A421; Mon, 8 Aug 2005 20:12:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04E8616A41F for ; Mon, 8 Aug 2005 20:12:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D65D743D62 for ; Mon, 8 Aug 2005 20:12:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78KC2Pi047235 for ; Mon, 8 Aug 2005 20:12:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78KC27U047232 for perforce@freebsd.org; Mon, 8 Aug 2005 20:12:02 GMT (envelope-from sam@freebsd.org) Date: Mon, 8 Aug 2005 20:12:02 GMT Message-Id: <200508082012.j78KC27U047232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 20:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=81678 Change 81678 by sam@sam_ebb on 2005/08/08 20:11:01 add sc_dturbo for future dynamic turbo ap support Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#41 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#41 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.28 2005/07/24 05:11:39 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.29 2005/08/08 18:46:36 sam Exp $ */ /* @@ -226,7 +226,8 @@ sc_mcastkey: 1, /* mcast key cache search */ sc_scanning: 1, /* scanning active */ sc_syncbeacon:1,/* sync/resync beacon timers */ - sc_hasclrkey:1; /* CLR key supported */ + sc_hasclrkey:1, /* CLR key supported */ + sc_dturbo : 1; /* dynamic turbo in use */ /* rate tables */ const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_half_rates; /* half rate table */ From owner-p4-projects@FreeBSD.ORG Mon Aug 8 21:50:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C4BC16A421; Mon, 8 Aug 2005 21:50:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06C7116A41F for ; Mon, 8 Aug 2005 21:50:05 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADEE443D45 for ; Mon, 8 Aug 2005 21:50:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78Lo48O057753 for ; Mon, 8 Aug 2005 21:50:04 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78Lo4J4057750 for perforce@freebsd.org; Mon, 8 Aug 2005 21:50:04 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 8 Aug 2005 21:50:04 GMT Message-Id: <200508082150.j78Lo4J4057750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 81686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 21:50:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=81686 Change 81686 by soc-andrew@soc-andrew_serv on 2005/08/08 21:49:09 Catchup to current Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#4 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#3 (text+ko) ==== @@ -1,31 +1,56 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.33 2005/04/13 10:02:58 phk Exp $ +# $FreeBSD: src/share/Makefile,v 1.35 2005/08/05 14:59:50 phk Exp $ # Do not include `info' in the SUBDIR list, it is handled separately. SUBDIR= bsdinstaller \ - colldef \ + ${_colldef} \ ${_dict} \ ${_doc} \ - examples \ + ${_examples} \ ${_isdn} \ - man \ - me \ + ${_man} \ + ${_me} \ misc \ mk \ - mklocale \ - monetdef \ - msgdef \ - numericdef \ + ${_mklocale} \ + ${_monetdef} \ + ${_msgdef} \ + ${_numericdef} \ ${_sendmail} \ skel \ snmp \ - syscons \ + ${_syscons} \ tabset \ termcap \ - timedef \ + ${_timedef} \ zoneinfo +.if !defined(NO_LOCALES) +_colldef = colldef +_mklocale = mklocale +_monetdef = monetdef +_msgdef = msgdef +_numericdef = numericdef +_timedef = timedef +.endif + +.if !defined(NO_SYSCONS) +_syscons= syscons +.endif + +.if !defined(NO_MAN) +_man= man +.endif + +.if !defined(NO_GROFF) +_me= me +.endif + +.if !defined(NO_EXAMPLES) +_examples= examples +.endif + .if !defined(NO_I4B) _isdn= isdn .endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.333 2005/07/20 22:53:57 marks Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.334 2005/08/03 09:27:26 phk Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -291,7 +291,9 @@ .endif _arlcontrol= arlcontrol _boot0cfg= boot0cfg +.if !defined(NO_PCVT) _pcvt= pcvt +.endif _wlconfig= wlconfig .elif ${MACHINE} == "pc98" _boot98cfg= boot98cfg From owner-p4-projects@FreeBSD.ORG Mon Aug 8 22:52:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F1B816A421; Mon, 8 Aug 2005 22:52:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5143B16A41F for ; Mon, 8 Aug 2005 22:52:21 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE56143D46 for ; Mon, 8 Aug 2005 22:52:20 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78MqKrs060277 for ; Mon, 8 Aug 2005 22:52:20 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78MqKfn060274 for perforce@freebsd.org; Mon, 8 Aug 2005 22:52:20 GMT (envelope-from soc-chenk@freebsd.org) Date: Mon, 8 Aug 2005 22:52:20 GMT Message-Id: <200508082252.j78MqKfn060274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 81689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 22:52:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=81689 Change 81689 by soc-chenk@soc-chenk_leavemealone on 2005/08/08 22:52:20 (Darcs changelog) Tue Aug 9 00:40:46 CEST 2005 at node: creo.hu, nick: csaba * Distribution cleanups - A more comprehensive Makefile was put together - Removed fuselib/fuselib.diff as it's not the appropriate place to keep in sync with Fuse - Added a concise README M ./Makefile -1 +28 A ./README M ./fmaster.c -3 R ./fuselib/fuselib.diff Tue Aug 9 00:39:31 CEST 2005 at node: creo.hu, nick: csaba * Fixed the bug which led to panic when multithreaded daemons were killed M ./fuse.c -2 +8 Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd/Makefile#2 edit .. //depot/projects/soc2005/fuse4bsd/README#1 add .. //depot/projects/soc2005/fuse4bsd/fmaster.c#2 edit .. //depot/projects/soc2005/fuse4bsd/fuse.c#2 edit .. //depot/projects/soc2005/fuse4bsd/fuselib/fuselib.diff#2 delete Differences ... ==== //depot/projects/soc2005/fuse4bsd/Makefile#2 (text+ko) ==== @@ -1,4 +1,31 @@ -SRCS=fuse.c fmaster.c +SRCS=fuse.c + +.if defined(FMASTER) +SRCS+= fmaster.c +CFLAGS+= -DFMASTER +.endif + +.if defined(DEBUG) +CFLAGS+= -D_DEBUG +.endif + +CFLAGS+= -DINVARIANTS + KMOD=fusedummy +CLEANFILES+= fuse_kernel.h fuse_opnames.h + +fusedummy.ko: fuse_opnames fuse_kernel.h + +fuse_kernel.h: + cp fuse_kernel.h.orig fuse_kernel.h + patch fuse_kernel.h < kernel-header.diff + +fuse_opnames: +.if defined(FMASTER) + ruby tools/genopnames.rb fuse_kernel.h.orig > fuse_opnames.h +.endif + + + .include ==== //depot/projects/soc2005/fuse4bsd/fmaster.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -#ifdef FMASTER #include #include /* uprintf */ #include @@ -449,5 +448,3 @@ ticket_drop(caliban->ticket); return (err); } - -#endif ==== //depot/projects/soc2005/fuse4bsd/fuse.c#2 (text+ko) ==== @@ -890,7 +890,13 @@ } DEBUG("FR4,%d\n", uio->uio_td->td_tid); fmsgn = fdata_pop_msg(data); - KASSERT(fmsgn, ("fusecv signalled green tho list head still NULL")); + if (! fmsgn) { + /* We can get here if fuse daemon suddenly terminates, + * eg, by being hit by a SIGKILL + */ + mtx_unlock(&data->msg_mtx); + return (ENODEV); + } } mtx_unlock(&data->msg_mtx); @@ -1043,7 +1049,7 @@ (*dev)->si_flags |= SI_CHEAPCLONE; } - printf("clone done: %d\n",unit); + DEBUG("clone done: %d\n",unit); } } From owner-p4-projects@FreeBSD.ORG Mon Aug 8 23:39:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D1E116A421; Mon, 8 Aug 2005 23:39:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE90516A41F for ; Mon, 8 Aug 2005 23:39:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C2B43D48 for ; Mon, 8 Aug 2005 23:39:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78NdIdb061929 for ; Mon, 8 Aug 2005 23:39:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78NdHbC061926 for perforce@freebsd.org; Mon, 8 Aug 2005 23:39:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 23:39:17 GMT Message-Id: <200508082339.j78NdHbC061926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 23:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=81691 Change 81691 by rwatson@rwatson_peppercorn on 2005/08/08 23:38:23 Integrate netsmp: - dev_clone prototype change - libkern strcasecmp() - more 802.11 - fxp locking fixes - sysctl warnings on locks held over copyin/copyout w/o wiring - ule preemption fixes - mac_policy_ops place holders Affected files ... .. //depot/projects/netsmp/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/netsmp/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/netsmp/src/sys/conf/files#5 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_compat.h#2 delete .. //depot/projects/netsmp/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_compat.h#2 delete .. //depot/projects/netsmp/src/sys/dev/amr/amr_disk.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/netsmp/src/sys/libkern/strcasecmp.c#1 branch .. //depot/projects/netsmp/src/sys/net/bpf.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_tap.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_tun.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.h#4 integrate .. //depot/projects/netsmp/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/netsmp/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/netsmp/src/sys/sys/conf.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/libkern.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/netsmp/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/netsmp/src/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.67 2005/07/01 16:28:30 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.68 2005/08/08 19:55:30 rwatson Exp $"); #include #include @@ -141,8 +141,8 @@ static struct targ_cmd_descr * targgetdescr(struct targ_softc *softc); static periph_init_t targinit; -static void targclone(void *arg, char *name, int namelen, - struct cdev **dev); +static void targclone(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **dev); static void targasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg); static void abort_all_pending(struct targ_softc *softc); @@ -1025,7 +1025,8 @@ } static void -targclone(void *arg, char *name, int namelen, struct cdev **dev) +targclone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { int u; ==== //depot/projects/netsmp/src/sys/coda/coda_fbsd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.42 2005/03/31 12:19:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.43 2005/08/08 19:55:30 rwatson Exp $"); #include #include @@ -70,8 +70,8 @@ #define VCDEBUG if (vcdebug) printf /* for DEVFS, using bpf & tun drivers as examples*/ -static void coda_fbsd_clone(void *arg, char *name, int namelen, - struct cdev **dev); +static void coda_fbsd_clone(void *arg, struct ucred *cred, char *name, + int namelen, struct cdev **dev); static int codadev_modevent(module_t mod, int type, void *data) @@ -105,8 +105,9 @@ }; DECLARE_MODULE(codadev, codadev_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -static void coda_fbsd_clone(arg, name, namelen, dev) +static void coda_fbsd_clone(arg, cred, name, namelen, dev) void *arg; + struct ucred *cred; char *name; int namelen; struct cdev **dev; ==== //depot/projects/netsmp/src/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1039 2005/08/03 04:27:39 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1040 2005/08/08 18:31:13 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1331,6 +1331,7 @@ libkern/rindex.c standard libkern/scanc.c standard libkern/skpc.c standard +libkern/strcasecmp.c standard libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard ==== //depot/projects/netsmp/src/sys/dev/aac/aac_debug.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.20 2004/12/09 22:20:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.21 2005/08/08 12:19:19 scottl Exp $"); /* * Debugging support. @@ -45,7 +45,6 @@ #include #include -#include #include #include #include ==== //depot/projects/netsmp/src/sys/dev/aac/aac_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.55 2005/07/14 17:43:00 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.56 2005/08/08 19:39:58 ps Exp $"); /* * PCI bus interface and resource allocation. @@ -133,6 +133,8 @@ "Adaptec SCSI RAID 2810SA"}, {0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, "Adaptec SCSI RAID 21610SA"}, + {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, + "HP ML110 G2 (Adaptec 2610SA)"}, {0x9005, 0x0286, 0x9005, 0x028c, AAC_HWIF_RKT, 0, "Adaptec SCSI RAID 2230S"}, {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0, ==== //depot/projects/netsmp/src/sys/dev/amr/amr.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.67 2005/07/29 01:53:45 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.68 2005/08/08 12:16:21 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -67,7 +67,7 @@ #include #include -#include +#include #include #include #include @@ -929,7 +929,7 @@ ac->ac_bio = bio; ac->ac_data = bio->bio_data; ac->ac_length = bio->bio_bcount; - if (BIO_IS_READ(bio)) { + if (bio->bio_cmd == BIO_READ) { ac->ac_flags |= AMR_CMD_DATAIN; cmd = AMR_CMD_LREAD; } else { ==== //depot/projects/netsmp/src/sys/dev/amr/amr_cam.c#2 (text+ko) ==== @@ -55,14 +55,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.15 2005/02/09 17:19:12 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.16 2005/08/08 12:16:21 scottl Exp $"); #include #include #include #include -#include +#include #include #include #include ==== //depot/projects/netsmp/src/sys/dev/amr/amr_disk.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.36 2005/08/07 23:51:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.37 2005/08/08 12:16:21 scottl Exp $"); /* * Disk driver for AMI MegaRaid controllers @@ -67,7 +67,7 @@ #include #include -#include +#include #include #include @@ -196,7 +196,7 @@ bio->bio_resid = 0; } - AMR_BIO_FINISH(bio); + biodone(bio); } static int ==== //depot/projects/netsmp/src/sys/dev/amr/amr_pci.c#2 (text+ko) ==== @@ -55,14 +55,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.29 2005/05/29 04:42:17 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.30 2005/08/08 12:16:21 scottl Exp $"); #include #include #include #include -#include +#include #include #include ==== //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.99 2005/08/03 00:18:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.100 2005/08/08 18:46:36 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -112,7 +112,8 @@ static void ath_rxorn_proc(void *, int); static void ath_bmiss_proc(void *, int); static int ath_key_alloc(struct ieee80211com *, - const struct ieee80211_key *); + const struct ieee80211_key *, + ieee80211_keyix *, ieee80211_keyix *); static int ath_key_delete(struct ieee80211com *, const struct ieee80211_key *); static int ath_key_set(struct ieee80211com *, const struct ieee80211_key *, @@ -568,6 +569,7 @@ ic->ic_recv_mgmt = ath_recv_mgmt; sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = ath_newstate; + ic->ic_crypto.cs_max_keyix = sc->sc_keymax; ic->ic_crypto.cs_key_alloc = ath_key_alloc; ic->ic_crypto.cs_key_delete = ath_key_delete; ic->ic_crypto.cs_key_set = ath_key_set; @@ -1263,7 +1265,7 @@ KASSERT(sc->sc_splitmic, ("key cache !split")); if ((k->wk_flags & IEEE80211_KEY_XR) == IEEE80211_KEY_XR) { /* - * TX key goes at first index, RX key at +32. + * TX key goes at first index, RX key at the rx index. * The hal handles the MIC keys at index+64. */ memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); @@ -1358,7 +1360,8 @@ * each key, one for decrypt/encrypt and the other for the MIC. */ static u_int16_t -key_alloc_2pair(struct ath_softc *sc) +key_alloc_2pair(struct ath_softc *sc, + ieee80211_keyix *txkeyix, ieee80211_keyix *rxkeyix) { #define N(a) (sizeof(a)/sizeof(a[0])) u_int i, keyix; @@ -1397,19 +1400,22 @@ "%s: key pair %u,%u %u,%u\n", __func__, keyix, keyix+64, keyix+32, keyix+32+64); - return keyix; + *txkeyix = keyix; + *rxkeyix = keyix+32; + return 1; } } DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: out of pair space\n", __func__); - return IEEE80211_KEYIX_NONE; + return 0; #undef N } /* * Allocate a single key cache slot. */ -static u_int16_t -key_alloc_single(struct ath_softc *sc) +static int +key_alloc_single(struct ath_softc *sc, + ieee80211_keyix *txkeyix, ieee80211_keyix *rxkeyix) { #define N(a) (sizeof(a)/sizeof(a[0])) u_int i, keyix; @@ -1427,11 +1433,12 @@ setbit(sc->sc_keymap, keyix); DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: key %u\n", __func__, keyix); - return keyix; + *txkeyix = *rxkeyix = keyix; + return 1; } } DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: out of space\n", __func__); - return IEEE80211_KEYIX_NONE; + return 0; #undef N } @@ -1445,7 +1452,8 @@ * 64 entries. */ static int -ath_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k) +ath_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k, + ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix) { struct ath_softc *sc = ic->ic_ifp->if_softc; @@ -1461,21 +1469,19 @@ * multi-station operation. */ if ((k->wk_flags & IEEE80211_KEY_GROUP) && !sc->sc_mcastkey) { - u_int keyix; - if (!(&ic->ic_nw_keys[0] <= k && k < &ic->ic_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */ DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: bogus group key\n", __func__); - return IEEE80211_KEYIX_NONE; + return 0; } - keyix = k - ic->ic_nw_keys; /* * XXX we pre-allocate the global keys so * have no way to check if they've already been allocated. */ - return keyix; + *keyix = *rxkeyix = k - ic->ic_nw_keys; + return 1; } /* @@ -1487,12 +1493,12 @@ * those requests to slot 0. */ if (k->wk_flags & IEEE80211_KEY_SWCRYPT) { - return key_alloc_single(sc); + return key_alloc_single(sc, keyix, rxkeyix); } else if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP && (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && sc->sc_splitmic) { - return key_alloc_2pair(sc); + return key_alloc_2pair(sc, keyix, rxkeyix); } else { - return key_alloc_single(sc); + return key_alloc_single(sc, keyix, rxkeyix); } } @@ -1505,32 +1511,17 @@ struct ath_softc *sc = ic->ic_ifp->if_softc; struct ath_hal *ah = sc->sc_ah; const struct ieee80211_cipher *cip = k->wk_cipher; - struct ieee80211_node *ni; u_int keyix = k->wk_keyix; DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: delete key %u\n", __func__, keyix); ath_hal_keyreset(ah, keyix); /* - * Check the key->node map and flush any ref. - */ - ni = sc->sc_keyixmap[keyix]; - if (ni != NULL) { - ieee80211_free_node(ni); - sc->sc_keyixmap[keyix] = NULL; - } - /* * Handle split tx/rx keying required for TKIP with h/w MIC. */ if (cip->ic_cipher == IEEE80211_CIPHER_TKIP && - (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && sc->sc_splitmic) { + (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && sc->sc_splitmic) ath_hal_keyreset(ah, keyix+32); /* RX key */ - ni = sc->sc_keyixmap[keyix+32]; - if (ni != NULL) { /* as above... */ - ieee80211_free_node(ni); - sc->sc_keyixmap[keyix+32] = NULL; - } - } if (keyix >= IEEE80211_WEP_NKID) { /* * Don't touch keymap entries for global keys so @@ -2822,50 +2813,22 @@ /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer - * for its use. If the sender is unknown spam the - * frame; it'll be dropped where it's not wanted. + * for its use. + */ + ni = ieee80211_find_rxnode_withkey(ic, + mtod(m, const struct ieee80211_frame_min *), + ds->ds_rxstat.rs_keyix == HAL_RXKEYIX_INVALID ? + IEEE80211_KEYIX_NONE : ds->ds_rxstat.rs_keyix); + /* + * Track rx rssi and do any rx antenna management. + */ + an = ATH_NODE(ni); + ATH_RSSI_LPF(an->an_avgrssi, ds->ds_rxstat.rs_rssi); + /* + * Send frame up for processing. */ - if (ds->ds_rxstat.rs_keyix != HAL_RXKEYIX_INVALID && - (ni = sc->sc_keyixmap[ds->ds_rxstat.rs_keyix]) != NULL) { - /* - * Fast path: node is present in the key map; - * grab a reference for processing the frame. - */ - an = ATH_NODE(ieee80211_ref_node(ni)); - ATH_RSSI_LPF(an->an_avgrssi, ds->ds_rxstat.rs_rssi); - type = ieee80211_input(ic, m, ni, - ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp); - } else { - /* - * Locate the node for sender, track state, and then - * pass the (referenced) node up to the 802.11 layer - * for its use. - */ - ni = ieee80211_find_rxnode(ic, - mtod(m, const struct ieee80211_frame_min *)); - /* - * Track rx rssi and do any rx antenna management. - */ - an = ATH_NODE(ni); - ATH_RSSI_LPF(an->an_avgrssi, ds->ds_rxstat.rs_rssi); - /* - * Send frame up for processing. - */ - type = ieee80211_input(ic, m, ni, - ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp); - if (ni != ic->ic_bss) { - u_int16_t keyix; - /* - * If the station has a key cache slot assigned - * update the key->node mapping table. - */ - keyix = ni->ni_ucastkey.wk_keyix; - if (keyix != IEEE80211_KEYIX_NONE && - sc->sc_keyixmap[keyix] == NULL) - sc->sc_keyixmap[keyix] = - ieee80211_ref_node(ni); - } - } + type = ieee80211_input(ic, m, ni, + ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp); ieee80211_free_node(ni); if (sc->sc_diversity) { /* @@ -4266,10 +4229,9 @@ { struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; - u_int16_t keyix; + ieee80211_keyix keyix, rxkeyix; - keyix = ath_key_alloc(ic, &ni->ni_ucastkey); - if (keyix == IEEE80211_KEYIX_NONE) { + if (!ath_key_alloc(ic, &ni->ni_ucastkey, &keyix, &rxkeyix)) { /* * Key cache is full; we'll fall back to doing * the more expensive lookup in software. Note @@ -4277,7 +4239,9 @@ */ /* XXX msg+statistic */ } else { + /* XXX locking? */ ni->ni_ucastkey.wk_keyix = keyix; + ni->ni_ucastkey.wk_rxkeyix = rxkeyix; /* NB: this will create a pass-thru key entry */ ath_keyset(sc, &ni->ni_ucastkey, ni->ni_macaddr, ic->ic_bss); } ==== //depot/projects/netsmp/src/sys/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.28 2005/07/24 05:11:39 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.29 2005/08/08 18:46:36 sam Exp $ */ /* @@ -224,7 +224,6 @@ HAL_INT sc_imask; /* interrupt mask copy */ u_int sc_keymax; /* size of key cache */ u_int8_t sc_keymap[ATH_KEYBYTES];/* key use bit map */ - struct ieee80211_node *sc_keyixmap[ATH_KEYMAX];/* key ix->node map */ u_int sc_ledpin; /* GPIO pin for driving LED */ u_int sc_ledon; /* pin setting for LED on */ ==== //depot/projects/netsmp/src/sys/dev/firewire/firewirereg.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.37 2005/01/06 01:42:41 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.38 2005/08/08 19:55:30 rwatson Exp $ * */ @@ -303,7 +303,7 @@ void fw_drain_txq (struct firewire_comm *); int fwdev_makedev (struct firewire_softc *); int fwdev_destroydev (struct firewire_softc *); -void fwdev_clone (void *, char *, int, struct cdev **); +void fwdev_clone (void *, struct ucred *, char *, int, struct cdev **); extern int firewire_debug; extern devclass_t firewire_devclass; ==== //depot/projects/netsmp/src/sys/dev/firewire/fwdev.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.46 2005/03/31 12:19:42 phk Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.47 2005/08/08 19:55:30 rwatson Exp $ * */ @@ -840,7 +840,8 @@ #if defined(__FreeBSD__) && __FreeBSD_version >= 500000 #define NDEVTYPE 2 void -fwdev_clone(void *arg, char *name, int namelen, struct cdev **dev) +fwdev_clone(void *arg, struct ucred *cred, char *name, int namelen, + struct cdev **dev) { struct firewire_softc *sc; char *devnames[NDEVTYPE] = {"fw", "fwmem"}; ==== //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.242 2005/08/03 00:18:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.243 2005/08/08 21:03:53 jhb Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -376,19 +376,17 @@ uint16_t data, myea[ETHER_ADDR_LEN / 2]; u_char eaddr[ETHER_ADDR_LEN]; int i, rid, m1, m2, prefer_iomap; - int error, s; + int error; error = 0; sc = device_get_softc(dev); sc->dev = dev; - callout_init(&sc->stat_ch, CALLOUT_MPSAFE); mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->stat_ch, &sc->sc_mtx, 0); ifmedia_init(&sc->sc_media, 0, fxp_serial_ifmedia_upd, fxp_serial_ifmedia_sts); - s = splimp(); - ifp = sc->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); @@ -811,7 +809,6 @@ } fail: - splx(s); if (error) fxp_release(sc); return (error); @@ -895,18 +892,10 @@ fxp_detach(device_t dev) { struct fxp_softc *sc = device_get_softc(dev); - int s; FXP_LOCK(sc); - s = splimp(); - sc->suspended = 1; /* Do same thing as we do for suspend */ /* - * Close down routes etc. - */ - ether_ifdetach(sc->ifp); - - /* * Stop DMA and drop transmit queue, but disable interrupts first. */ CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE); @@ -914,14 +903,17 @@ FXP_UNLOCK(sc); /* + * Close down routes etc. + */ + ether_ifdetach(sc->ifp); + + /* * Unhook interrupt before dropping lock. This is to prevent * races with fxp_intr(). */ bus_teardown_intr(sc->dev, sc->irq, sc->ih); sc->ih = NULL; - splx(s); - /* Release our allocated resources. */ fxp_release(sc); return (0); @@ -935,12 +927,16 @@ static int fxp_shutdown(device_t dev) { + struct fxp_softc *sc = device_get_softc(dev); + /* * Make sure that DMA is disabled prior to reboot. Not doing * do could allow DMA to corrupt kernel memory during the * reboot before the driver initializes. */ - fxp_stop((struct fxp_softc *) device_get_softc(dev)); + FXP_LOCK(sc); + fxp_stop(sc); + FXP_UNLOCK(sc); return (0); } @@ -953,17 +949,14 @@ fxp_suspend(device_t dev) { struct fxp_softc *sc = device_get_softc(dev); - int s; FXP_LOCK(sc); - s = splimp(); fxp_stop(sc); sc->suspended = 1; FXP_UNLOCK(sc); - splx(s); return (0); } @@ -976,16 +969,8 @@ { struct fxp_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->ifp; - uint16_t pci_command; - int s; FXP_LOCK(sc); - s = splimp(); - - /* reenable busmastering */ - pci_command = pci_read_config(dev, PCIR_COMMAND, 2); - pci_command |= (PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); - pci_write_config(dev, PCIR_COMMAND, pci_command, 2); CSR_WRITE_4(sc, FXP_CSR_PORT, FXP_PORT_SELECTIVE_RESET); DELAY(10); @@ -997,7 +982,6 @@ sc->suspended = 0; FXP_UNLOCK(sc); - splx(s); return (0); } @@ -1752,10 +1736,8 @@ struct fxp_softc *sc = xsc; struct ifnet *ifp = sc->ifp; struct fxp_stats *sp = sc->fxp_stats; - int s; - FXP_LOCK(sc); - s = splimp(); + FXP_LOCK_ASSERT(sc, MA_OWNED); bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, BUS_DMASYNC_POSTREAD); ifp->if_opackets += le32toh(sp->tx_good); ifp->if_collisions += le32toh(sp->tx_total_collisions); @@ -1840,8 +1822,6 @@ * Schedule another timeout one second from now. */ callout_reset(&sc->stat_ch, hz, fxp_tick, sc); - FXP_UNLOCK(sc); - splx(s); } /* @@ -1941,10 +1921,9 @@ struct fxp_cb_tx *tcbp; struct fxp_tx *txp; struct fxp_cb_mcs *mcsp; - int i, prm, s; + int i, prm; FXP_LOCK_ASSERT(sc, MA_OWNED); - s = splimp(); /* * Cancel any pending I/O */ @@ -2195,7 +2174,6 @@ * Start stats updater. */ callout_reset(&sc->stat_ch, hz, fxp_tick, sc); - splx(s); } static int @@ -2222,7 +2200,9 @@ struct mii_data *mii; mii = device_get_softc(sc->miibus); + FXP_LOCK(sc); mii_mediachg(mii); + FXP_UNLOCK(sc); return (0); } @@ -2236,6 +2216,7 @@ struct mii_data *mii; mii = device_get_softc(sc->miibus); + FXP_LOCK(sc); mii_pollstat(mii); ifmr->ifm_active = mii->mii_media_active; ifmr->ifm_status = mii->mii_media_status; @@ -2244,6 +2225,7 @@ sc->cu_resume_bug = 1; else sc->cu_resume_bug = 0; + FXP_UNLOCK(sc); } /* @@ -2377,20 +2359,11 @@ struct fxp_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; struct mii_data *mii; - int flag, mask, s, error = 0; - - /* - * Detaching causes us to call ioctl with the mutex owned. Preclude - * that by saying we're busy if the lock is already held. - */ - if (FXP_LOCKED(sc)) - return (EBUSY); + int flag, mask, error = 0; - FXP_LOCK(sc); - s = splimp(); - switch (command) { case SIOCSIFFLAGS: + FXP_LOCK(sc); if (ifp->if_flags & IFF_ALLMULTI) sc->flags |= FXP_FLAG_ALL_MCAST; else @@ -2408,10 +2381,12 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) fxp_stop(sc); } + FXP_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: + FXP_LOCK(sc); if (ifp->if_flags & IFF_ALLMULTI) sc->flags |= FXP_FLAG_ALL_MCAST; else @@ -2428,6 +2403,7 @@ */ if (sc->flags & FXP_FLAG_ALL_MCAST) fxp_init_body(sc); + FXP_UNLOCK(sc); error = 0; break; @@ -2443,6 +2419,7 @@ break; case SIOCSIFCAP: + FXP_LOCK(sc); mask = ifp->if_capenable ^ ifr->ifr_reqcap; if (mask & IFCAP_POLLING) ifp->if_capenable ^= IFCAP_POLLING; @@ -2456,19 +2433,12 @@ if (ifp->if_flags & IFF_UP) fxp_init_body(sc); } + FXP_UNLOCK(sc); break; default: - /* - * ether_ioctl() will eventually call fxp_start() which - * will result in mutex recursion so drop it first. - */ - FXP_UNLOCK(sc); error = ether_ioctl(ifp, command, data); } - if (FXP_LOCKED(sc)) - FXP_UNLOCK(sc); - splx(s); return (error); } @@ -2486,11 +2456,7 @@ nmcasts = 0; if ((sc->flags & FXP_FLAG_ALL_MCAST) == 0) { IF_ADDR_LOCK(ifp); -#if __FreeBSD_version < 500000 - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { -#else TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { -#endif if (ifma->ifma_addr->sa_family != AF_LINK) continue; if (nmcasts >= MAXMCADDR) { ==== //depot/projects/netsmp/src/sys/dev/fxp/if_fxpvar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.37 2005/06/10 16:49:09 brooks Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.38 2005/08/08 21:03:54 jhb Exp $ */ /* @@ -101,21 +101,9 @@ */ #define TUNABLE_BUNDLE_MAX 6 -#if __FreeBSD_version < 500000 -#define FXP_LOCK(_sc) -#define FXP_UNLOCK(_sc) -#define FXP_LOCKED(_sc) -#define FXP_LOCK_ASSERT(_sc, _what) -#define INTR_MPSAFE 0 -#define mtx_init(a, b, c, d) -#define mtx_destroy(a) -struct mtx { int dummy; }; -#else #define FXP_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define FXP_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define FXP_LOCKED(_sc) mtx_owned(&(_sc)->sc_mtx) #define FXP_LOCK_ASSERT(_sc, _what) mtx_assert(&(_sc)->sc_mtx, (_what)) -#endif /* * Structures to handle TX and RX descriptors. ==== //depot/projects/netsmp/src/sys/dev/mly/mly.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mly.c,v 1.38 2005/05/29 04:42:23 nyan Exp $ + * $FreeBSD: src/sys/dev/mly/mly.c,v 1.39 2005/08/08 12:23:26 scottl Exp $ */ #include @@ -234,12 +234,10 @@ mly_initq_busy(sc); mly_initq_complete(sc); -#if __FreeBSD_version >= 500005 /* * Initialise command-completion task. */ TASK_INIT(&sc->mly_task_complete, 0, mly_complete, sc); -#endif /* disable interrupts before we start talking to the controller */ MLY_MASK_INTERRUPTS(sc); @@ -1605,11 +1603,9 @@ splx(s); if (worked) { -#if __FreeBSD_version >= 500005 if (sc->mly_state & MLY_STATE_INTERRUPTS_ON) taskqueue_enqueue(taskqueue_swi_giant, &sc->mly_task_complete); else -#endif mly_complete(sc, 0); } } ==== //depot/projects/netsmp/src/sys/dev/mly/mlyvar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.6 2004/06/16 09:46:51 phk Exp $ + * $FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.7 2005/08/08 12:23:27 scottl Exp $ */ /******************************************************************************** @@ -57,15 +57,7 @@ ******************************************************************************** ********************************************************************************/ -#if __FreeBSD_version >= 500005 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 8 23:48:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2185F16A421; Mon, 8 Aug 2005 23:48:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFF3716A41F for ; Mon, 8 Aug 2005 23:48:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8DC843D45 for ; Mon, 8 Aug 2005 23:48:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78NmTlx062423 for ; Mon, 8 Aug 2005 23:48:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78NmT44062420 for perforce@freebsd.org; Mon, 8 Aug 2005 23:48:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 23:48:29 GMT Message-Id: <200508082348.j78NmT44062420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 23:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=81692 Change 81692 by rwatson@rwatson_peppercorn on 2005/08/08 23:47:53 Several XXX's that don't need to be. Affected files ... .. //depot/projects/netsmp/src/sys/net/if.c#11 edit Differences ... ==== //depot/projects/netsmp/src/sys/net/if.c#11 (text+ko) ==== @@ -1279,9 +1279,8 @@ if (error) return (error); /* - * XXXRW: Currently, no driver owned flags pass the - * IFF_CANTCHANGE check, so we don't need special handling - * here yet. + * Currently, no driver owned flags pass the IFF_CANTCHANGE + * check, so we don't need special handling here yet. */ new_flags = (ifr->ifr_flags & 0xffff) | (ifr->ifr_flagshigh << 16); @@ -1625,7 +1624,7 @@ * The "pflag" argument can specify a permanent mode flag, * such as IFF_PPROMISC for promiscuous mode; should be 0 if none. * - * XXXRW: Only to be used on stack-owned flags, not driver-owned flags. + * Only to be used on stack-owned flags, not driver-owned flags. */ static int if_setflag(struct ifnet *ifp, int flag, int pflag, int *refcount, int onswitch) @@ -2273,10 +2272,6 @@ ifp->if_obytes += m->m_pkthdr.len + adjust; if (m->m_flags & (M_BCAST|M_MCAST)) ifp->if_omcasts++; - /* - * XXXRW: Technically, we'd like the driver to do this to - * avoid races. - */ active = ifp->if_drv_flags & IFF_DRV_OACTIVE; } _IF_ENQUEUE(ifq, m); From owner-p4-projects@FreeBSD.ORG Mon Aug 8 23:50:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FEE916A41F; Mon, 8 Aug 2005 23:50:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B3B416A41F for ; Mon, 8 Aug 2005 23:50:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF5B843D46 for ; Mon, 8 Aug 2005 23:50:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j78NoWJe062563 for ; Mon, 8 Aug 2005 23:50:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78NoWh5062560 for perforce@freebsd.org; Mon, 8 Aug 2005 23:50:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 8 Aug 2005 23:50:32 GMT Message-Id: <200508082350.j78NoWh5062560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 23:50:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=81693 Change 81693 by rwatson@rwatson_peppercorn on 2005/08/08 23:49:40 De-comment or de-XXX a few places for merge to CVS. Affected files ... .. //depot/projects/netsmp/src/sys/net/if_var.h#10 edit .. //depot/projects/netsmp/src/sys/net/if_vlan.c#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/net/if_var.h#10 (text+ko) ==== @@ -423,8 +423,8 @@ #define IFQ_SET_MAXLEN(ifq, len) ((ifq)->ifq_maxlen = (len)) /* - * XXXRW: The IFF_DRV_OACTIVE test should really occur in the device driver, - * not in the handoff logic, as that flag is locked by the device driver. + * The IFF_DRV_OACTIVE test should really occur in the device driver, not in + * the handoff logic, as that flag is locked by the device driver. */ #define IFQ_HANDOFF_ADJ(ifp, m, adj, err) \ do { \ ==== //depot/projects/netsmp/src/sys/net/if_vlan.c#5 (text+ko) ==== @@ -188,15 +188,6 @@ } /* Now program new ones. */ - - /* - * XXXRW: Really, this should happen in two steps, interlocked by the - * vlan mutex (if any: first, the parent interface's address list - * should be propagated to the softc, then from the softc to the - * child, in order to avoid holding parent's and child's if_addr_mtx - * at the same time. Races can occur, but won't result in - * incorrectness. Assuming there is a vlan mutex. - */ IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) From owner-p4-projects@FreeBSD.ORG Tue Aug 9 00:20:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FFE416A421; Tue, 9 Aug 2005 00:20:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BF3916A41F for ; Tue, 9 Aug 2005 00:20:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25F2043D45 for ; Tue, 9 Aug 2005 00:20:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j790K9wA063530 for ; Tue, 9 Aug 2005 00:20:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j790K8h1063527 for perforce@freebsd.org; Tue, 9 Aug 2005 00:20:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Aug 2005 00:20:08 GMT Message-Id: <200508090020.j790K8h1063527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 00:20:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=81695 Change 81695 by rwatson@rwatson_peppercorn on 2005/08/09 00:19:42 Hard code inpcb lock order with respect to IPv4 multicast, due to reported problems. Affected files ... .. //depot/projects/netsmp/src/sys/kern/subr_witness.c#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/subr_witness.c#5 (text+ko) ==== @@ -286,8 +286,9 @@ { "ifaddr", &lock_class_mtx_sleep }, { NULL, NULL }, /* - * Multicast - protocol locks before interface locks. + * Multicast - protocol locks before interface locks, after UDP locks. */ + { "udpinp", &lock_class_mtx_sleep }, { "in_multi_mtx", &lock_class_mtx_sleep }, { "igmp_mtx", &lock_class_mtx_sleep }, { "if_addr_mtx", &lock_class_mtx_sleep }, From owner-p4-projects@FreeBSD.ORG Tue Aug 9 01:05:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DF3916A421; Tue, 9 Aug 2005 01:05:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB72916A41F for ; Tue, 9 Aug 2005 01:05:06 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B67343D46 for ; Tue, 9 Aug 2005 01:05:06 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79156hw072112 for ; Tue, 9 Aug 2005 01:05:06 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79156TG072109 for perforce@freebsd.org; Tue, 9 Aug 2005 01:05:06 GMT (envelope-from wsalamon@computer.org) Date: Tue, 9 Aug 2005 01:05:06 GMT Message-Id: <200508090105.j79156TG072109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 81698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 01:05:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=81698 Change 81698 by wsalamon@gretsch on 2005/08/09 01:04:37 Add auditing the nstat(), nfstat(), and nlstat() system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#17 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#20 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#17 (text+ko) ==== @@ -307,9 +307,9 @@ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 275 = netbsd_lchown */ { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES }, /* 276 = lutimes */ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 277 = netbsd_msync */ - { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NULL }, /* 278 = nstat */ - { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NULL }, /* 279 = nfstat */ - { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_NULL }, /* 280 = nlstat */ + { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NSTAT }, /* 278 = nstat */ + { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NFSTAT }, /* 279 = nfstat */ + { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_NLSTAT }, /* 280 = nlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = nosys */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#20 (text+ko) ==== @@ -490,9 +490,9 @@ struct timeval *tptr); } 277 AUE_MSYNC MNOPROTO { int msync(void *addr, size_t len, \ int flags); } netbsd_msync msync_args int -278 AUE_NULL MSTD { int nstat(char *path, struct nstat *ub); } -279 AUE_NULL MSTD { int nfstat(int fd, struct nstat *sb); } -280 AUE_NULL MSTD { int nlstat(char *path, struct nstat *ub); } +278 AUE_NSTAT MSTD { int nstat(char *path, struct nstat *ub); } +279 AUE_NFSTAT MSTD { int nfstat(int fd, struct nstat *sb); } +280 AUE_NLSTAT MSTD { int nlstat(char *path, struct nstat *ub); } 281 AUE_NULL UNIMPL nosys 282 AUE_NULL UNIMPL nosys 283 AUE_NULL UNIMPL nosys ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#11 (text+ko) ==== @@ -581,6 +581,8 @@ case AUE_GETFH: case AUE_LSTAT: case AUE_MKFIFO: + case AUE_NLSTAT: + case AUE_NSTAT: case AUE_PATHCONF: case AUE_READLINK: case AUE_REVOKE: @@ -644,6 +646,7 @@ case AUE_FUTIMES: case AUE_GETDIRENTRIES: case AUE_GETDIRENTRIESATTR: + case AUE_NFSTAT: FD_KPATH1_VNODE1_TOKENS; break; From owner-p4-projects@FreeBSD.ORG Tue Aug 9 01:05:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5CC016A470; Tue, 9 Aug 2005 01:05:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D6CC16A42A for ; Tue, 9 Aug 2005 01:05:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06B7A43D46 for ; Tue, 9 Aug 2005 01:05:06 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79156Bm072118 for ; Tue, 9 Aug 2005 01:05:06 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79156JU072115 for perforce@freebsd.org; Tue, 9 Aug 2005 01:05:06 GMT (envelope-from wsalamon@computer.org) Date: Tue, 9 Aug 2005 01:05:06 GMT Message-Id: <200508090105.j79156JU072115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 81699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 01:05:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=81699 Change 81699 by wsalamon@gretsch on 2005/08/09 01:05:05 Add test cases for nstat(), nlstat(), and nfstat(). Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#4 (text+ko) ==== @@ -81,11 +81,26 @@ AUT_PERROR("lstat()"); aut_assert(AUE_LSTAT); + /* Generate a AUE_NSTAT audit record */ + if ((nstat(tempname, &tstat)) < 0) + AUT_PERROR("nstat()"); + aut_assert(AUE_NSTAT); + + /* Generate a AUE_NLSTAT audit record */ + if ((nlstat(tempname, &tstat)) < 0) + AUT_PERROR("nlstat()"); + aut_assert(AUE_NLSTAT); + /* Generate a success AUE_FSTAT record */ if ((fstat(temp_fd, &tstat)) < 0) AUT_PERROR("fstat()"); aut_assert(AUE_FSTAT); + /* Generate a success AUE_NFSTAT record */ + if ((nfstat(temp_fd, &tstat)) < 0) + AUT_PERROR("nfstat()"); + aut_assert(AUE_NFSTAT); + /* Generate a AUE_PATHCONF audit record */ if ((pathconf(tempname, _PC_NAME_MAX)) < 0) AUT_PERROR("pathconf()"); From owner-p4-projects@FreeBSD.ORG Tue Aug 9 03:05:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40FB916A421; Tue, 9 Aug 2005 03:05:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03E6C16A41F for ; Tue, 9 Aug 2005 03:05:32 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C47DD43D45 for ; Tue, 9 Aug 2005 03:05:31 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7935Vwf076316 for ; Tue, 9 Aug 2005 03:05:31 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7935VZ5076311 for perforce@freebsd.org; Tue, 9 Aug 2005 03:05:31 GMT (envelope-from soc-cjones@freebsd.org) Date: Tue, 9 Aug 2005 03:05:31 GMT Message-Id: <200508090305.j7935VZ5076311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 03:05:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=81700 Change 81700 by soc-cjones@soc-cjones_ishtar on 2005/08/09 03:04:48 Fix kasserts to actually be, well, useful. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#6 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#6 (text+ko) ==== @@ -166,7 +166,7 @@ struct gv_sd *s; g_topology_assert(); - KASSERT(d != NULL, ("gv_rename_plex: NULL p")); + KASSERT(p != NULL, ("gv_rename_plex: NULL p")); if (-1 != gv_object_type(sc, newname)) { gctl_error(req, "plex name %s already in use", newname); @@ -222,7 +222,7 @@ char *poldsdnumber = oldsdnumber; g_topology_assert(); - KASSERT(d != NULL, ("gv_rename_sd: NULL s")); + KASSERT(s != NULL, ("gv_rename_sd: NULL s")); if (-1 != gv_object_type(sc, newname)) { gctl_error(req, "subdrive name %s already in use", newname); @@ -251,11 +251,10 @@ { int err; struct gv_plex *p; - /* struct gv_sd *s; */ char oldvolname[GV_MAXVOLNAME]; g_topology_assert(); - KASSERT(d != NULL, ("gv_rename_vol: NULL v")); + KASSERT(v != NULL, ("gv_rename_vol: NULL v")); if (-1 != gv_object_type(sc, newname)) { gctl_error(req, "volume name %s already in use", newname); From owner-p4-projects@FreeBSD.ORG Tue Aug 9 06:01:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51E3316A421; Tue, 9 Aug 2005 06:01:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D328916A41F for ; Tue, 9 Aug 2005 06:01:20 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9824843D53 for ; Tue, 9 Aug 2005 06:01:20 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7961Khh089473 for ; Tue, 9 Aug 2005 06:01:20 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7961KO7089470 for perforce@freebsd.org; Tue, 9 Aug 2005 06:01:20 GMT (envelope-from soc-cjones@freebsd.org) Date: Tue, 9 Aug 2005 06:01:20 GMT Message-Id: <200508090601.j7961KO7089470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 06:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=81706 Change 81706 by soc-cjones@soc-cjones_ishtar on 2005/08/09 06:00:25 First cut at moving subdisks. Let's see whether it works.... Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#4 (text+ko) ==== @@ -70,6 +70,10 @@ gctl_error(req, "no destination given"); return; } + if (GV_TYPE_DRIVE != gv_object_type(sc, destination)) { + gctl_error(req, "destination is not a drive"); + return; + } for (i = 0; i < *argc; i++) { snprintf(buf, sizeof(buf), "argv%d", i); @@ -84,6 +88,8 @@ gctl_error(req, "unknown volume '%s'", object); return; } + gctl_error(req, "no touching volumes!"); + return 1; err = gv_move_vol(sc, req, v, destination, *flags); if (err) return; @@ -94,6 +100,8 @@ gctl_error(req, "unknown plex '%s'", object); return; } + gctl_error(req, "no touching plexes!"); + return 1; err = gv_move_plex(sc, req, p, destination, *flags); if (err) return; @@ -114,6 +122,8 @@ gctl_error(req, "unknown drive '%s'", object); return; } + gctl_err(req, "no touching drives!"); + return 1; err = gv_move_drive(sc, req, d, destination, *flags); if (err) return; @@ -131,10 +141,11 @@ static int gv_move_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_volume *v, char *destination, int flags) { - int err; - g_topology_assert(); - KASSERT(d != NULL, ("gv_move_vol: NULL v")); + KASSERT(v != NULL, ("gv_move_vol: NULL v")); + + gctl_error(req, "moving a volume makes no sense"); + return 99; } /* Move a plex. */ @@ -144,7 +155,9 @@ int err; g_topology_assert(); - KASSERT(d != NULL, ("gv_move_plex: NULL p")); + KASSERT(p != NULL, ("gv_move_plex: NULL p")); + + /* TODO identify all sds for the plex, then move 'em. */ return (0); } @@ -154,9 +167,65 @@ gv_move_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, char *destination, int flags) { int err; - + struct gv_drive *d; + struct gv_sd *s2; + char errstr[ERRBUFSIZ]; + g_topology_assert(); - KASSERT(d != NULL, ("gv_move_sd: NULL s")); + KASSERT(s != NULL, ("gv_move_sd: NULL s")); + + if (!(flags && GV_FLAG_F)) { + gctl_error(req, "-f flag not passed; move would be destructive"); + return 98; + } + + d = gv_find_drive(sc, destination); + if (NULL == d) { + gctl_error(req, "destination drive '%s' not found", destination); + return 97; + } + + if (!strncmp(s->drive, d->name, GV_MAXDRIVENAME)) { + gctl_error(req, "subdisk '%s' already on drive '%s'", s->name, destination); + return 96; + } + + /* Create new sd, set vital stats, and try allocating space + on the new drive. Unfortunately, we can't use gv_new_sd, + since we don't really want to deal with tokenizing stuff. + Oh well. */ + s2 = g_malloc(sizeof(*s2), M_WAITOK | M_ZERO); + printf("A\n"); + snprintf(s2->name, GV_MAXSDNAME, "temp.s0"); /* TODO Come up with temp name. */ + printf("B (s2->name = %s)\n", s2->name); + s2->size = s->size; + printf("C\n"); + s2->drive_sc = d; + s2->drive_offset = -1; + s2->plex_offset = -1; + printf("D\n"); + s2->plex_sc = (struct gv_plex *) NULL; + s2->state = GV_SD_DOWN; + s2->vinumconf = sc; + printf("E\n"); + err = gv_sd_to_drive(sc, d, s2, errstr, sizeof(errstr)); + if (err) { + printf("F errstr = %s\n", errstr); + gctl_error(req, errstr); + g_free(s2); + return err; + } + printf("G\n"); + s2->flags |= GV_SD_NEWBORN; + printf("H\n"); + LIST_INSERT_HEAD(&sc->subdisks, s2, sd); + printf("I\n"); + gv_update_sd_state(s); + printf("J\n"); + gv_save_config_all(sc); + + /* TODO -- move data from old sd to new sd. */ + /* TODO -- delete old sd. */ return (0); } @@ -170,6 +239,8 @@ g_topology_assert(); KASSERT(d != NULL, ("gv_move_drive: NULL d")); + /* TODO find all sds on drive, then move them. */ + return (0); } From owner-p4-projects@FreeBSD.ORG Tue Aug 9 07:24:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A87916A421; Tue, 9 Aug 2005 07:24:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A93216A41F for ; Tue, 9 Aug 2005 07:24:08 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3988643D48 for ; Tue, 9 Aug 2005 07:24:08 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j797O7ZH092409 for ; Tue, 9 Aug 2005 07:24:08 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j797O7u2092406 for perforce@freebsd.org; Tue, 9 Aug 2005 07:24:07 GMT (envelope-from soc-chenk@freebsd.org) Date: Tue, 9 Aug 2005 07:24:07 GMT Message-Id: <200508090724.j797O7u2092406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 81712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 07:24:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=81712 Change 81712 by soc-chenk@soc-chenk_leavemealone on 2005/08/09 07:23:57 darcs changes --last 1 Tue Aug 9 09:23:00 CEST 2005 at node: creo.hu, nick: csaba * smaller changes in genopnames.rb Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd/tools/genopnames.rb#2 edit Differences ... ==== //depot/projects/soc2005/fuse4bsd/tools/genopnames.rb#2 (text+ko) ==== @@ -16,8 +16,10 @@ ops[inside] = $1 } -puts "/* Generated by a ruby script from fuse_kernel.h, don't hand hack it! */ +puts < X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2840916A421; Tue, 9 Aug 2005 07:59:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0A7A16A41F for ; Tue, 9 Aug 2005 07:59:54 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC49443D46 for ; Tue, 9 Aug 2005 07:59:54 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j797xsx0093607 for ; Tue, 9 Aug 2005 07:59:54 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j797xsfo093604 for perforce@freebsd.org; Tue, 9 Aug 2005 07:59:54 GMT (envelope-from soc-cjones@freebsd.org) Date: Tue, 9 Aug 2005 07:59:54 GMT Message-Id: <200508090759.j797xsfo093604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81713 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 07:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=81713 Change 81713 by soc-cjones@soc-cjones_ishtar on 2005/08/09 07:59:24 Broken --- we're unable to correctly remove the temporary subdisk. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#5 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#5 (text+ko) ==== @@ -78,8 +78,11 @@ for (i = 0; i < *argc; i++) { snprintf(buf, sizeof(buf), "argv%d", i); object = gctl_get_param(req, buf, NULL); + printf("%s -> %s\n", buf, object); if (NULL == object) - continue; + continue; + if (0 == i) + continue; type = gv_object_type(sc, object); switch (type) { case GV_TYPE_VOL: @@ -122,7 +125,7 @@ gctl_error(req, "unknown drive '%s'", object); return; } - gctl_err(req, "no touching drives!"); + gctl_error(req, "no touching drives!"); return 1; err = gv_move_drive(sc, req, d, destination, *flags); if (err) @@ -200,6 +203,7 @@ printf("B (s2->name = %s)\n", s2->name); s2->size = s->size; printf("C\n"); + strncpy(s2->drive, d->name, GV_MAXSDNAME); s2->drive_sc = d; s2->drive_offset = -1; s2->plex_offset = -1; @@ -223,6 +227,7 @@ gv_update_sd_state(s); printf("J\n"); gv_save_config_all(sc); + printf("K\n"); /* TODO -- move data from old sd to new sd. */ /* TODO -- delete old sd. */ From owner-p4-projects@FreeBSD.ORG Tue Aug 9 08:29:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C83C16A421; Tue, 9 Aug 2005 08:29:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6726216A41F for ; Tue, 9 Aug 2005 08:29:31 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31E9943D48 for ; Tue, 9 Aug 2005 08:29:31 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j798TVMg094610 for ; Tue, 9 Aug 2005 08:29:31 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j798TUgg094607 for perforce@freebsd.org; Tue, 9 Aug 2005 08:29:30 GMT (envelope-from soc-cjones@freebsd.org) Date: Tue, 9 Aug 2005 08:29:30 GMT Message-Id: <200508090829.j798TUgg094607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 08:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=81714 Change 81714 by soc-cjones@soc-cjones_ishtar on 2005/08/09 08:28:57 Still broken. But less so. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#6 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#6 (text+ko) ==== @@ -224,14 +224,18 @@ printf("H\n"); LIST_INSERT_HEAD(&sc->subdisks, s2, sd); printf("I\n"); - gv_update_sd_state(s); + s2->state = GV_SD_STALE; printf("J\n"); gv_save_config_all(sc); printf("K\n"); /* TODO -- move data from old sd to new sd. */ - /* TODO -- delete old sd. */ + /* TODO -- rename new sd, update plexes, and delete old sd. */ + strncpy(s2->name, s->name, GV_MAXSDNAME); + gv_rm_sd(sc, req, s, flags); + + gv_save_config_all(sc); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Aug 9 10:10:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A223916A421; Tue, 9 Aug 2005 10:10:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A45616A41F for ; Tue, 9 Aug 2005 10:10:23 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B628743D46 for ; Tue, 9 Aug 2005 10:10:22 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79AAMb9007044 for ; Tue, 9 Aug 2005 10:10:22 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79AAMJr007041 for perforce@freebsd.org; Tue, 9 Aug 2005 10:10:22 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 9 Aug 2005 10:10:22 GMT Message-Id: <200508091010.j79AAMJr007041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 10:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=81717 Change 81717 by soc-bushman@soc-bushman_stinger on 2005/08/09 10:09:25 openssh NIS support added, /var/yp/Makefile patch done Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth-rh-rsa.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2-hostbased.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/config.h.in#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/configure.ac#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/initial_copy.sh#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/key.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/make.sh#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth-rh.rsa.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth2-hostbased.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-config.h.in#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure.ac#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-sshconnect.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/var_yp_makefile.patch#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/Makefile#6 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/distinfo#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/batch.patch#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/gss-serv.c.patch#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-pam.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-rh.rsa.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth1.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2-hostbased.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-clientloop.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-config.h.in#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-configure.ac#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-fake-rfc2553.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-loginrec.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-regress-test-exec.sh#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-session.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshconnect.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd_config#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshpty.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/servconf.c.patch#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/sshd.sh#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-descr#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-message#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-plist#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/result_copy.sh#3 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/sshconnect.c#4 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth-rh-rsa.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2-hostbased.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/auth2.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/config.h.in#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/configure.ac#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.c#4 (text+ko) ==== @@ -59,12 +59,10 @@ #if defined (HAVE_NSDISPATCH) && defined (USE_NSSWITCH) -#ifdef YP +#ifndef WITHOUT_NIS #include #include -#include -#include -#endif +#endif /* WITHOUT_NIS */ #ifndef NSDB_SSH_HOSTKEYS #define NSDB_SSH_HOSTKEYS "ssh_hostkeys" @@ -87,12 +85,13 @@ nsswitch_files_conf.system_hostfile2 = system_hostfile2; } +static int hostfile_check_key(int, const Key *, const char *, const char *, int); static HostStatus check_host_in_hostfile_by_key_or_type(const char *, const char *, const Key *, int, Key *, int *); -#ifdef YP +#ifndef WITHOUT_NIS static HostStatus check_host_in_nis_by_key_or_type(const char *, const Key *, int, Key *, int *); -#endif +#endif /* WITHOUT_NIS */ enum constants { CHECK_HOST, @@ -101,16 +100,16 @@ static const ns_src defaultsrc[] = { { NSSRC_FILES, NS_SUCCESS }, -#ifdef YP +#ifndef WITHOUT_NIS { NSSRC_NIS, NS_SUCCESS }, -#endif +#endif /* WITHOUT_NIS */ { NULL, 0 } }; static int files_check_host_by_key_or_type(void *, void *, va_list); -#ifdef YP +#ifndef WITHOUT_NIS static int nis_check_host_by_key_or_type(void *, void *, va_list); -#endif +#endif /* WITHOUT_NIS */ /* files backend implementation */ static int @@ -152,10 +151,10 @@ found, &numret); } - debug3("files_check_host_by_key_or_type: CHECK_HOST - %d", rv); + debug3("files_check_host_by_key_or_type: check_host result %d", rv); if (result != NULL) *((int *)result) = rv; - return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); + return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); case LOOKUP_KEY_BY_TYPE: filename = nsswitch_files_conf.system_hostfile; @@ -167,7 +166,7 @@ keytype, found, &numret) == HOST_FOUND); } - debug3("files_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); + debug3("files_check_host_by_key_or_type: lookup_key_by_type result %d", rv); if (result != NULL) *((int *)result) = rv; return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); @@ -176,10 +175,10 @@ return (NS_NOTFOUND); } -#ifdef YP +#ifndef WITHOUT_NIS /* NIS backend implementation */ static HostStatus -check_host_in_hostfile_by_key_or_type(const char *host, const Key *key, +check_host_in_nis_by_key_or_type(const char *host, const Key *key, int keytype, Key *found, int *numret) { u_int kbits; @@ -187,20 +186,20 @@ char *cp, *cp2, *hashed_host; HostStatus end_return; - char buf[YPMAXRECORD]; - char domain[MAXHOSTNAMELEN]; - + char *domain; char *lastkey; char *current; int current_len; char *resultbuf; - int resultbuf_len; + int resultbuf_len; + int rv; - int rv; - if (getdomainname(domain, sizeof(domain)) != 0) + if (yp_get_default_domain(&domain) != 0) { + debug3("check_host_in_nis: can't get the NIS domain"); return (HOST_NEW); + } current = NULL; current_len = 0; @@ -210,9 +209,8 @@ rv = yp_first(domain, "ssh_hostkeys", ¤t, ¤t_len, &resultbuf, &resultbuf_len); - end_return = HOST_NEW; - while (rv) { + while (rv == 0) { cp = resultbuf; /* comments, trailing spaces and tabs should be deleted during @@ -281,7 +279,7 @@ next_iter: lastkey = current; rv = yp_next(domain, "ssh_hostkeys", current, current_len, - resultbuf, resultbuf_len); + ¤t, ¤t_len, &resultbuf, &resultbuf_len); free(lastkey); ++linenum; @@ -323,16 +321,16 @@ case CHECK_HOST: rv = check_host_in_nis_by_key_or_type(host, key, 0, found, &numret); - debug3("nis_check_host_by_key_or_type: CHECK_HOST - %d", rv); + debug3("nis_check_host_by_key_or_type: check_host result %d", rv); if (result != NULL) *((int *)result) = rv; - return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); + return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); case LOOKUP_KEY_BY_TYPE: rv = (check_host_in_nis_by_key_or_type(host, NULL, keytype, found, &numret) == HOST_FOUND); - debug3("nis_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); + debug3("nis_check_host_by_key_or_type: lookup_key_by_type result %d", rv); if (result != NULL) *((int *)result) = rv; return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); @@ -340,7 +338,7 @@ return (NS_NOTFOUND); } -#endif +#endif /* WITHOUT_NIS */ /* nsswitch interface functions implementation */ HostStatus @@ -348,9 +346,9 @@ { static const ns_dtab dtab[] = { { NSSRC_FILES, files_check_host_by_key_or_type, (void *)CHECK_HOST }, -#ifdef YP +#ifndef WITHOUT_NIS { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)CHECK_HOST }, -#endif +#endif /* WITHOUT_NIS */ { NULL, NULL, NULL } }; @@ -375,9 +373,9 @@ { static const ns_dtab dtab[] = { { NSSRC_FILES, files_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, -#ifdef YP +#ifndef WITHOUT_NIS { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, -#endif +#endif /* WITHOUT_NIS */ { NULL, NULL, NULL } }; ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/hostfile.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/initial_copy.sh#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/key.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/make.sh#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth-rh.rsa.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-auth2-hostbased.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-config.h.in#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-configure.ac#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ ---- hostfile.c.orig Mon Mar 14 15:08:12 2005 -+++ hostfile.c Mon Jul 18 15:27:23 2005 -@@ -38,16 +38,172 @@ +--- /tmp2/usr/ports/security/openssh-portable/work/openssh-4.1p1/hostfile.c Mon Mar 14 15:08:12 2005 ++++ hostfile.c Tue Aug 9 13:13:17 2005 +@@ -38,16 +38,359 @@ #include "includes.h" RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $"); @@ -25,6 +25,11 @@ + +#if defined (HAVE_NSDISPATCH) && defined (USE_NSSWITCH) + ++#ifndef WITHOUT_NIS ++#include ++#include ++#endif /* WITHOUT_NIS */ ++ +#ifndef NSDB_SSH_HOSTKEYS +#define NSDB_SSH_HOSTKEYS "ssh_hostkeys" +#endif /* NSDB_SSH_HOSTKEYS */ @@ -46,8 +51,13 @@ + nsswitch_files_conf.system_hostfile2 = system_hostfile2; +} + ++static int hostfile_check_key(int, const Key *, const char *, const char *, int); +static HostStatus check_host_in_hostfile_by_key_or_type(const char *, + const char *, const Key *, int, Key *, int *); ++#ifndef WITHOUT_NIS ++static HostStatus check_host_in_nis_by_key_or_type(const char *, ++ const Key *, int, Key *, int *); ++#endif /* WITHOUT_NIS */ + +enum constants { + CHECK_HOST, @@ -56,10 +66,16 @@ + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, NS_SUCCESS }, ++#endif /* WITHOUT_NIS */ + { NULL, 0 } +}; + +static int files_check_host_by_key_or_type(void *, void *, va_list); ++#ifndef WITHOUT_NIS ++static int nis_check_host_by_key_or_type(void *, void *, va_list); ++#endif /* WITHOUT_NIS */ + +/* files backend implementation */ +static int @@ -101,10 +117,10 @@ + found, &numret); + } + -+ debug3("files_check_host_by_key_or_type: CHECK_HOST - %d", rv); ++ debug3("files_check_host_by_key_or_type: check_host result %d", rv); + if (result != NULL) + *((int *)result) = rv; -+ return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); ++ return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); + + case LOOKUP_KEY_BY_TYPE: + filename = nsswitch_files_conf.system_hostfile; @@ -116,7 +132,171 @@ + keytype, found, &numret) == HOST_FOUND); + } + -+ debug3("files_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); ++ debug3("files_check_host_by_key_or_type: lookup_key_by_type result %d", rv); ++ if (result != NULL) ++ *((int *)result) = rv; ++ return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); ++ } ++ ++ return (NS_NOTFOUND); ++} ++ ++#ifndef WITHOUT_NIS ++/* NIS backend implementation */ ++static HostStatus ++check_host_in_nis_by_key_or_type(const char *host, const Key *key, ++ int keytype, Key *found, int *numret) ++{ ++ u_int kbits; ++ int linenum; ++ char *cp, *cp2, *hashed_host; ++ HostStatus end_return; ++ ++ char *domain; ++ char *lastkey; ++ char *current; ++ int current_len; ++ ++ char *resultbuf; ++ int resultbuf_len; ++ int rv; ++ ++ ++ if (yp_get_default_domain(&domain) != 0) { ++ debug3("check_host_in_nis: can't get the NIS domain"); ++ return (HOST_NEW); ++ } ++ ++ current = NULL; ++ current_len = 0; ++ resultbuf = NULL; ++ resultbuf_len = 0; ++ linenum = 0; ++ ++ rv = yp_first(domain, "ssh_hostkeys", ¤t, ¤t_len, ++ &resultbuf, &resultbuf_len); ++ end_return = HOST_NEW; ++ while (rv == 0) { ++ cp = resultbuf; ++ ++ /* comments, trailing spaces and tabs should be deleted during ++ NIS map making, but we still should check for them - just in case */ ++ for (; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '#' || *cp == '\n') ++ goto next_iter; ++ ++ /* Find the end of the host name portion. */ ++ for (cp2 = cp; *cp2 && *cp2 != ' ' && *cp2 != '\t'; cp2++) ++ ; ++ ++ if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1) { ++ if (*cp != HASH_DELIM) ++ goto next_iter; ++ hashed_host = host_hash(host, cp, (u_int) (cp2 - cp)); ++ if (hashed_host == NULL) { ++ debug("Invalid hashed host line %d of NIS source", ++ linenum); ++ goto next_iter; ++ } ++ if (strncmp(hashed_host, cp, (u_int) (cp2 - cp)) != 0) ++ goto next_iter; ++ } ++ ++ /* Got a match. Skip host name. */ ++ cp = cp2; ++ ++ /* ++ * Extract the key from the line. This will skip any leading ++ * whitespace. Ignore badly formatted lines. ++ */ ++ if (!hostfile_read_key(&cp, &kbits, found)) ++ goto next_iter; ++ ++ if (numret != NULL) ++ *numret = linenum; ++ ++ if (key == NULL) { ++ /* we found a key of the requested type */ ++ if (found->type == keytype) { ++ end_return = HOST_FOUND; ++ goto fin; ++ } ++ goto next_iter; ++ } ++ ++ if (!hostfile_check_key(kbits, found, host, "NIS source", linenum)) ++ goto next_iter; ++ ++ /* Check if the current key is the same as the given key. */ ++ if (key_equal(key, found)) { ++ /* Ok, they match. */ ++ debug3("check_host_in_nis: match line %d", linenum); ++ end_return = HOST_OK; ++ goto fin; ++ } ++ /* ++ * They do not match. We will continue to go through the ++ * file; however, we note that we will not return that it is ++ * new. ++ */ ++ end_return = HOST_CHANGED; ++ ++next_iter: ++ lastkey = current; ++ rv = yp_next(domain, "ssh_hostkeys", current, current_len, ++ ¤t, ¤t_len, &resultbuf, &resultbuf_len); ++ free(lastkey); ++ ++ ++linenum; ++ } ++ ++fin: ++ free(resultbuf); ++ return (end_return); ++} ++ ++static int ++nis_check_host_by_key_or_type(void *result, void *mdata, va_list ap) ++{ ++ const char *host; ++ const Key *key; ++ Key *found; ++ int keytype; ++ ++ int rv, numret; ++ enum constants how; ++ ++ how = (enum constants)mdata; ++ switch (how) { ++ case CHECK_HOST: ++ host = va_arg(ap, const char *); ++ key = va_arg(ap, const Key *); ++ found = va_arg(ap, Key *); ++ break; ++ case LOOKUP_KEY_BY_TYPE: ++ host = va_arg(ap, const char *); ++ keytype = va_arg(ap, int); ++ found = va_arg(ap, Key *); ++ break; ++ default: ++ return NS_NOTFOUND; ++ } ++ ++ switch (how) { ++ case CHECK_HOST: ++ rv = check_host_in_nis_by_key_or_type(host, key, 0, found, &numret); ++ ++ debug3("nis_check_host_by_key_or_type: check_host result %d", rv); ++ if (result != NULL) ++ *((int *)result) = rv; ++ return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); ++ ++ case LOOKUP_KEY_BY_TYPE: ++ rv = (check_host_in_nis_by_key_or_type(host, NULL, keytype, found, ++ &numret) == HOST_FOUND); ++ ++ debug3("nis_check_host_by_key_or_type: lookup_key_by_type result %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); @@ -124,6 +304,7 @@ + + return (NS_NOTFOUND); +} ++#endif /* WITHOUT_NIS */ + +/* nsswitch interface functions implementation */ +HostStatus @@ -131,6 +312,9 @@ +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)CHECK_HOST }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)CHECK_HOST }, ++#endif /* WITHOUT_NIS */ + { NULL, NULL, NULL } + }; + @@ -155,6 +339,9 @@ +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, ++#endif /* WITHOUT_NIS */ + { NULL, NULL, NULL } + }; + ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-hostfile.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/patch-sshconnect.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/Makefile#6 (text+ko) ==== @@ -53,11 +53,17 @@ PORTABLE_SUFFIX= -portable USE_NSSWITCH= yes +# Uncomment the next line to omit the nsswitch NIS support (NIS source) +# WITHOUT_NIS= yes .if defined(USE_NSSWITCH) CFLAGS+= -DUSE_NSSWITCH .endif +.if defined(WITHOUT_NIS) +CFLAGS+= -DWITHOUT_NIS +.endif + USE_AUTOCONF_VER= 253 AUTOCONF_ARGS+= -o configure configure.ac ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/distinfo#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/batch.patch#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/gss-serv.c.patch#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-pam.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth-rh.rsa.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth1.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2-hostbased.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-auth2.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-clientloop.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-config.h.in#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-configure.ac#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-fake-rfc2553.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ ---- hostfile.c.orig Mon Mar 14 15:08:12 2005 -+++ hostfile.c Mon Jul 18 15:27:23 2005 -@@ -38,16 +38,172 @@ +--- /tmp2/usr/ports/security/openssh-portable/work/openssh-4.1p1/hostfile.c Mon Mar 14 15:08:12 2005 ++++ hostfile.c Tue Aug 9 13:13:17 2005 +@@ -38,16 +38,359 @@ #include "includes.h" RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $"); @@ -25,6 +25,11 @@ + +#if defined (HAVE_NSDISPATCH) && defined (USE_NSSWITCH) + ++#ifndef WITHOUT_NIS ++#include ++#include ++#endif /* WITHOUT_NIS */ ++ +#ifndef NSDB_SSH_HOSTKEYS +#define NSDB_SSH_HOSTKEYS "ssh_hostkeys" +#endif /* NSDB_SSH_HOSTKEYS */ @@ -46,8 +51,13 @@ + nsswitch_files_conf.system_hostfile2 = system_hostfile2; +} + ++static int hostfile_check_key(int, const Key *, const char *, const char *, int); +static HostStatus check_host_in_hostfile_by_key_or_type(const char *, + const char *, const Key *, int, Key *, int *); ++#ifndef WITHOUT_NIS ++static HostStatus check_host_in_nis_by_key_or_type(const char *, ++ const Key *, int, Key *, int *); ++#endif /* WITHOUT_NIS */ + +enum constants { + CHECK_HOST, @@ -56,10 +66,16 @@ + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, NS_SUCCESS }, ++#endif /* WITHOUT_NIS */ + { NULL, 0 } +}; + +static int files_check_host_by_key_or_type(void *, void *, va_list); ++#ifndef WITHOUT_NIS ++static int nis_check_host_by_key_or_type(void *, void *, va_list); ++#endif /* WITHOUT_NIS */ + +/* files backend implementation */ +static int @@ -101,10 +117,10 @@ + found, &numret); + } + -+ debug3("files_check_host_by_key_or_type: CHECK_HOST - %d", rv); ++ debug3("files_check_host_by_key_or_type: check_host result %d", rv); + if (result != NULL) + *((int *)result) = rv; -+ return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); ++ return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); + + case LOOKUP_KEY_BY_TYPE: + filename = nsswitch_files_conf.system_hostfile; @@ -116,7 +132,171 @@ + keytype, found, &numret) == HOST_FOUND); + } + -+ debug3("files_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); ++ debug3("files_check_host_by_key_or_type: lookup_key_by_type result %d", rv); ++ if (result != NULL) ++ *((int *)result) = rv; ++ return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); ++ } ++ ++ return (NS_NOTFOUND); ++} ++ ++#ifndef WITHOUT_NIS ++/* NIS backend implementation */ ++static HostStatus ++check_host_in_nis_by_key_or_type(const char *host, const Key *key, ++ int keytype, Key *found, int *numret) ++{ ++ u_int kbits; ++ int linenum; ++ char *cp, *cp2, *hashed_host; ++ HostStatus end_return; ++ ++ char *domain; ++ char *lastkey; ++ char *current; ++ int current_len; ++ ++ char *resultbuf; ++ int resultbuf_len; ++ int rv; ++ ++ ++ if (yp_get_default_domain(&domain) != 0) { ++ debug3("check_host_in_nis: can't get the NIS domain"); ++ return (HOST_NEW); ++ } ++ ++ current = NULL; ++ current_len = 0; ++ resultbuf = NULL; ++ resultbuf_len = 0; ++ linenum = 0; ++ ++ rv = yp_first(domain, "ssh_hostkeys", ¤t, ¤t_len, ++ &resultbuf, &resultbuf_len); ++ end_return = HOST_NEW; ++ while (rv == 0) { ++ cp = resultbuf; ++ ++ /* comments, trailing spaces and tabs should be deleted during ++ NIS map making, but we still should check for them - just in case */ ++ for (; *cp == ' ' || *cp == '\t'; cp++) ++ ; ++ if (!*cp || *cp == '#' || *cp == '\n') ++ goto next_iter; ++ ++ /* Find the end of the host name portion. */ ++ for (cp2 = cp; *cp2 && *cp2 != ' ' && *cp2 != '\t'; cp2++) ++ ; ++ ++ if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1) { ++ if (*cp != HASH_DELIM) ++ goto next_iter; ++ hashed_host = host_hash(host, cp, (u_int) (cp2 - cp)); ++ if (hashed_host == NULL) { ++ debug("Invalid hashed host line %d of NIS source", ++ linenum); ++ goto next_iter; ++ } ++ if (strncmp(hashed_host, cp, (u_int) (cp2 - cp)) != 0) ++ goto next_iter; ++ } ++ ++ /* Got a match. Skip host name. */ ++ cp = cp2; ++ ++ /* ++ * Extract the key from the line. This will skip any leading ++ * whitespace. Ignore badly formatted lines. ++ */ ++ if (!hostfile_read_key(&cp, &kbits, found)) ++ goto next_iter; ++ ++ if (numret != NULL) ++ *numret = linenum; ++ ++ if (key == NULL) { ++ /* we found a key of the requested type */ ++ if (found->type == keytype) { ++ end_return = HOST_FOUND; ++ goto fin; ++ } ++ goto next_iter; ++ } ++ ++ if (!hostfile_check_key(kbits, found, host, "NIS source", linenum)) ++ goto next_iter; ++ ++ /* Check if the current key is the same as the given key. */ ++ if (key_equal(key, found)) { ++ /* Ok, they match. */ ++ debug3("check_host_in_nis: match line %d", linenum); ++ end_return = HOST_OK; ++ goto fin; ++ } ++ /* ++ * They do not match. We will continue to go through the ++ * file; however, we note that we will not return that it is ++ * new. ++ */ ++ end_return = HOST_CHANGED; ++ ++next_iter: ++ lastkey = current; ++ rv = yp_next(domain, "ssh_hostkeys", current, current_len, ++ ¤t, ¤t_len, &resultbuf, &resultbuf_len); ++ free(lastkey); ++ ++ ++linenum; ++ } ++ ++fin: ++ free(resultbuf); ++ return (end_return); ++} ++ ++static int ++nis_check_host_by_key_or_type(void *result, void *mdata, va_list ap) ++{ ++ const char *host; ++ const Key *key; ++ Key *found; ++ int keytype; ++ ++ int rv, numret; ++ enum constants how; ++ ++ how = (enum constants)mdata; ++ switch (how) { ++ case CHECK_HOST: ++ host = va_arg(ap, const char *); ++ key = va_arg(ap, const Key *); ++ found = va_arg(ap, Key *); ++ break; ++ case LOOKUP_KEY_BY_TYPE: ++ host = va_arg(ap, const char *); ++ keytype = va_arg(ap, int); ++ found = va_arg(ap, Key *); ++ break; ++ default: ++ return NS_NOTFOUND; ++ } ++ ++ switch (how) { ++ case CHECK_HOST: ++ rv = check_host_in_nis_by_key_or_type(host, key, 0, found, &numret); ++ ++ debug3("nis_check_host_by_key_or_type: check_host result %d", rv); ++ if (result != NULL) ++ *((int *)result) = rv; ++ return ((rv != HOST_OK) ? NS_NOTFOUND : NS_SUCCESS); ++ ++ case LOOKUP_KEY_BY_TYPE: ++ rv = (check_host_in_nis_by_key_or_type(host, NULL, keytype, found, ++ &numret) == HOST_FOUND); ++ ++ debug3("nis_check_host_by_key_or_type: lookup_key_by_type result %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); @@ -124,6 +304,7 @@ + + return (NS_NOTFOUND); +} ++#endif /* WITHOUT_NIS */ + +/* nsswitch interface functions implementation */ +HostStatus @@ -131,6 +312,9 @@ +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)CHECK_HOST }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)CHECK_HOST }, ++#endif /* WITHOUT_NIS */ + { NULL, NULL, NULL } + }; + @@ -155,6 +339,9 @@ +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, ++#ifndef WITHOUT_NIS ++ { NSSRC_NIS, nis_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, ++#endif /* WITHOUT_NIS */ + { NULL, NULL, NULL } + }; + ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-hostfile.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-loginrec.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-regress-test-exec.sh#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-session.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshconnect.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshd_config#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/patch-sshpty.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/servconf.c.patch#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/files/sshd.sh#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-descr#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-message#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/port/pkg-plist#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/result_copy.sh#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/sshconnect.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Aug 9 10:34:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4107E16A421; Tue, 9 Aug 2005 10:34:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1737316A41F for ; Tue, 9 Aug 2005 10:34:55 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEC1543D49 for ; Tue, 9 Aug 2005 10:34:54 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79AYs57010131 for ; Tue, 9 Aug 2005 10:34:54 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79AYsWX010128 for perforce@freebsd.org; Tue, 9 Aug 2005 10:34:54 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 9 Aug 2005 10:34:54 GMT Message-Id: <200508091034.j79AYsWX010128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 81720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 10:34:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=81720 Change 81720 by soc-bushman@soc-bushman_stinger on 2005/08/09 10:34:21 port patch file added Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_hostkeys_test/patches/openssh-portable_port.patch#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 9 11:20:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0636416A421; Tue, 9 Aug 2005 11:20:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB3FE16A41F for ; Tue, 9 Aug 2005 11:20:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59B8E43D49 for ; Tue, 9 Aug 2005 11:20:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79BKruf011957 for ; Tue, 9 Aug 2005 11:20:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79BKodw011951 for perforce@freebsd.org; Tue, 9 Aug 2005 11:20:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Aug 2005 11:20:50 GMT Message-Id: <200508091120.j79BKodw011951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 11:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=81722 Change 81722 by rwatson@rwatson_peppercorn on 2005/08/09 11:20:02 Loop-back if_drv_flags + IFF_DRV_OACTIVE + IFF_DRV_RUNNING changes. Affected files ... .. //depot/projects/netsmp/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/awi/awi.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_ioctl.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_tx.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/my/if_my.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/owi/if_owi.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/patm/if_patm_tx.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/snc/dp83932.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/netsmp/src/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/netsmp/src/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/netsmp/src/sys/net/bridge.c#3 integrate .. //depot/projects/netsmp/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if.c#12 integrate .. //depot/projects/netsmp/src/sys/net/if.h#4 integrate .. //depot/projects/netsmp/src/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_atm.h#3 integrate .. //depot/projects/netsmp/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/netsmp/src/sys/net/if_ef.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/netsmp/src/sys/net/if_faith.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_gif.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_gre.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/netsmp/src/sys/net/if_loop.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_ppp.c#3 integrate .. //depot/projects/netsmp/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_tap.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_tun.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_var.h#11 integrate .. //depot/projects/netsmp/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/netsmp/src/sys/net/ppp_tty.c#3 integrate .. //depot/projects/netsmp/src/sys/net/route.c#2 integrate .. //depot/projects/netsmp/src/sys/net/rtsock.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_if.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/netsmp/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/netsmp/src/sys/pci/if_dc.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_de.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_pcn.c#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_rl.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_sf.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_sis.c#6 integrate .. //depot/projects/netsmp/src/sys/pci/if_sk.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_ste.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_ti.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_tl.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_vr.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_wb.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/if_xl.c#6 integrate Differences ... ==== //depot/projects/netsmp/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.127 2005/04/13 04:33:06 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.128 2005/08/09 10:19:41 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.16 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.17 2005/08/09 10:19:41 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/contrib/altq/altq/altq_cbq.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.2 2004/06/12 00:57:20 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.3 2005/08/09 10:19:41 rwatson Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* ==== //depot/projects/netsmp/src/sys/contrib/dev/oltr/if_oltr.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.37 2005/06/10 16:49:03 brooks Exp $ + * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.38 2005/08/09 10:19:41 rwatson Exp $ */ #include ==== //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.13 2005/06/10 16:49:03 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.14 2005/08/09 10:19:42 rwatson Exp $ */ /* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ /* ==== //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.20 2005/07/14 22:22:51 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.21 2005/08/09 10:19:42 rwatson Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ /* ==== //depot/projects/netsmp/src/sys/dev/an/if_an.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.69 2005/08/02 16:03:51 emax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.70 2005/08/09 10:19:42 rwatson Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. ==== //depot/projects/netsmp/src/sys/dev/ar/if_ar.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.71 2005/06/10 16:49:04 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.72 2005/08/09 10:19:42 rwatson Exp $"); /* * Programming assumptions and other issues. ==== //depot/projects/netsmp/src/sys/dev/arl/if_arl.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.10 2005/06/10 16:49:04 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/arl/if_arl.c,v 1.11 2005/08/09 10:19:42 rwatson Exp $"); #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.9 2005/07/22 16:50:16 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $"); /* * AMRR rate control. See: ==== //depot/projects/netsmp/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.9 2005/07/22 16:50:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.100 2005/08/08 18:46:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.101 2005/08/09 10:19:43 rwatson Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/netsmp/src/sys/dev/awi/awi.c#7 (text+ko) ==== @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); #endif #ifdef __FreeBSD__ -__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.40 2005/08/08 03:30:57 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.41 2005/08/09 10:19:43 rwatson Exp $"); #endif #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/dev/bfe/if_bfe.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.26 2005/08/03 00:18:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.27 2005/08/09 10:19:44 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.92 2005/08/03 00:18:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.93 2005/08/09 10:19:44 rwatson Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. ==== //depot/projects/netsmp/src/sys/dev/cm/if_cm_isa.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.6 2005/06/10 16:49:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.7 2005/08/09 10:19:44 rwatson Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. ==== //depot/projects/netsmp/src/sys/dev/cm/smc90cx6.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.15 2005/06/10 16:49:05 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.16 2005/08/09 10:19:44 rwatson Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. ==== //depot/projects/netsmp/src/sys/dev/cnw/if_cnw.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.19 2005/07/18 17:58:59 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.20 2005/08/09 10:19:44 rwatson Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/netsmp/src/sys/dev/cp/if_cp.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.24 2005/07/09 16:14:04 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.25 2005/08/09 10:19:44 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/cs/if_cs.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.41 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.42 2005/08/09 10:19:45 rwatson Exp $"); /* * ==== //depot/projects/netsmp/src/sys/dev/ctau/if_ct.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.25 2005/07/09 16:14:05 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.26 2005/08/09 10:19:45 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/cx/if_cx.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.45 2005/07/09 16:14:05 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.46 2005/08/09 10:19:45 rwatson Exp $"); #include ==== //depot/projects/netsmp/src/sys/dev/ed/if_ed.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.255 2005/08/03 00:18:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.256 2005/08/09 10:19:45 rwatson Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet ==== //depot/projects/netsmp/src/sys/dev/em/if_em.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.67 2005/08/03 00:18:29 rwatson Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.68 2005/08/09 10:19:46 rwatson Exp $*/ #include ==== //depot/projects/netsmp/src/sys/dev/en/if_en_pci.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.36 2005/06/10 16:49:07 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.37 2005/08/09 10:19:46 rwatson Exp $"); /* * i f _ e n _ p c i . c @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.36 2005/06/10 16:49:07 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/en/if_en_pci.c,v 1.37 2005/08/09 10:19:46 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/en/midway.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.65 2005/06/10 16:49:07 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.66 2005/08/09 10:19:46 rwatson Exp $"); /* * ==== //depot/projects/netsmp/src/sys/dev/ep/if_ep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.142 2005/07/31 03:33:22 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.143 2005/08/09 10:19:46 rwatson Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: ==== //depot/projects/netsmp/src/sys/dev/ex/if_ex.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.57 2005/08/03 00:18:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.58 2005/08/09 10:19:46 rwatson Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver ==== //depot/projects/netsmp/src/sys/dev/fatm/if_fatm.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.19 2005/07/01 10:45:02 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fatm/if_fatm.c,v 1.20 2005/08/09 10:19:47 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/fe/if_fe.c#5 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.92 2005/08/03 00:18:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fe/if_fe.c,v 1.93 2005/08/09 10:19:47 rwatson Exp $"); /* * ==== //depot/projects/netsmp/src/sys/dev/firewire/if_fwe.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.37 2005/06/10 16:49:08 brooks Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.38 2005/08/09 10:19:47 rwatson Exp $ */ #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/dev/firewire/if_fwip.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.7 2005/06/10 16:49:08 brooks Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.8 2005/08/09 10:19:47 rwatson Exp $ */ #include "opt_inet.h" ==== //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.243 2005/08/08 21:03:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.244 2005/08/09 10:19:47 rwatson Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver ==== //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.32 2005/08/03 00:18:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.33 2005/08/09 10:19:48 rwatson Exp $"); /* * Driver for Sun GEM ethernet controllers. ==== //depot/projects/netsmp/src/sys/dev/hatm/if_hatm.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.24 2005/07/01 10:45:02 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm.c,v 1.25 2005/08/09 10:19:48 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_intr.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.19 2005/07/15 18:17:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_intr.c,v 1.20 2005/08/09 10:19:48 rwatson Exp $"); /* * ForeHE driver. ==== //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_ioctl.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_ioctl.c,v 1.12 2005/07/01 10:45:02 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_ioctl.c,v 1.13 2005/08/09 10:19:48 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_rx.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_rx.c,v 1.9 2005/06/10 16:49:09 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_rx.c,v 1.10 2005/08/09 10:19:48 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/hatm/if_hatm_tx.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.13 2005/07/01 10:45:02 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hatm/if_hatm_tx.c,v 1.14 2005/08/09 10:19:48 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.38 2005/08/03 00:18:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.39 2005/08/09 10:19:48 rwatson Exp $"); /* * HME Ethernet module driver. ==== //depot/projects/netsmp/src/sys/dev/ie/if_ie.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.103 2005/08/03 00:18:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.104 2005/08/09 10:19:49 rwatson Exp $"); /* * Intel 82586 Ethernet chip ==== //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.100 2005/08/03 00:18:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.101 2005/08/09 10:19:49 rwatson Exp $"); #include "opt_bdg.h" ==== //depot/projects/netsmp/src/sys/dev/iicbus/if_ic.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.23 2005/06/26 18:11:09 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.24 2005/08/09 10:19:49 rwatson Exp $"); /* * I2C bus IP driver ==== //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.9 2005/08/08 03:30:57 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.10 2005/08/09 10:19:49 rwatson Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.9 2005/08/08 03:30:57 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.10 2005/08/09 10:19:49 rwatson Exp $"); /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver ==== //depot/projects/netsmp/src/sys/dev/iwi/if_iwi.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.9 2005/07/22 17:36:12 sam Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.10 2005/08/09 10:19:49 rwatson Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.9 2005/07/22 17:36:12 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.10 2005/08/09 10:19:49 rwatson Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver ==== //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.12 2005/08/03 00:18:31 rwatson Exp $*/ +/*$FreeBSD: src/sys/dev/ixgb/if_ixgb.c,v 1.13 2005/08/09 10:19:50 rwatson Exp $*/ #include ==== //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.40 2005/08/03 00:18:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.41 2005/08/09 10:19:50 rwatson Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public ==== //depot/projects/netsmp/src/sys/dev/lnc/if_lnc.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.112 2005/08/03 00:18:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.113 2005/08/09 10:19:50 rwatson Exp $"); /* #define DIAGNOSTIC ==== //depot/projects/netsmp/src/sys/dev/my/if_my.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.30 2005/08/03 00:18:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/my/if_my.c,v 1.31 2005/08/09 10:19:50 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/nge/if_nge.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.76 2005/08/03 00:18:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.77 2005/08/09 10:19:50 rwatson Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver ==== //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#6 (text+ko) ==== @@ -74,7 +74,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.9 2005/08/03 00:18:32 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.10 2005/08/09 10:19:51 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/owi/if_owi.c#6 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.11 2005/08/03 00:18:32 rwatson Exp $"; + "$FreeBSD: src/sys/dev/owi/if_owi.c,v 1.12 2005/08/09 10:19:51 rwatson Exp $"; #endif static void wi_intr(void *); ==== //depot/projects/netsmp/src/sys/dev/patm/if_patm.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm.c,v 1.8 2005/06/10 16:49:12 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm.c,v 1.9 2005/08/09 10:19:51 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/patm/if_patm_intr.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_intr.c,v 1.5 2005/06/10 16:49:13 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_intr.c,v 1.6 2005/08/09 10:19:51 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/patm/if_patm_ioctl.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_ioctl.c,v 1.9 2005/06/10 16:49:13 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_ioctl.c,v 1.10 2005/08/09 10:19:51 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/patm/if_patm_tx.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_tx.c,v 1.9 2005/07/01 10:45:02 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_tx.c,v 1.10 2005/08/09 10:19:51 rwatson Exp $"); #include "opt_inet.h" #include "opt_natm.h" ==== //depot/projects/netsmp/src/sys/dev/pdq/pdq_ifsubr.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.27 2005/08/03 00:18:32 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.28 2005/08/09 10:19:52 rwatson Exp $"); /* * DEC PDQ FDDI Controller; code for BSD derived operating systems ==== //depot/projects/netsmp/src/sys/dev/ppbus/if_plip.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.37 2005/06/10 16:49:13 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.38 2005/08/09 10:19:52 rwatson Exp $"); /* * Parallel port TCP/IP interfaces added. I looked at the driver from ==== //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/if_ral.c,v 1.11 2005/07/22 16:50:17 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ral/if_ral.c,v 1.12 2005/08/09 10:19:52 rwatson Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.11 2005/07/22 16:50:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.12 2005/08/09 10:19:52 rwatson Exp $"); /*- * Ralink Technology RT2500 chipset driver ==== //depot/projects/netsmp/src/sys/dev/ral/if_ral_pci.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.1 2005/04/18 18:47:36 damien Exp $ */ +/* $FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.2 2005/08/09 10:19:52 rwatson Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.1 2005/04/18 18:47:36 damien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral_pci.c,v 1.2 2005/08/09 10:19:52 rwatson Exp $"); /* * PCI front-end for the Ralink RT2500 driver. ==== //depot/projects/netsmp/src/sys/dev/ray/if_ray.c#5 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.80 2005/08/03 00:18:32 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ray/if_ray.c,v 1.81 2005/08/09 10:19:53 rwatson Exp $"); /* * Card configuration ==== //depot/projects/netsmp/src/sys/dev/ray/if_rayvar.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ray/if_rayvar.h,v 1.21 2005/06/10 16:49:14 brooks Exp $ + * $FreeBSD: src/sys/dev/ray/if_rayvar.h,v 1.22 2005/08/09 10:19:53 rwatson Exp $ * */ ==== //depot/projects/netsmp/src/sys/dev/re/if_re.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.48 2005/08/05 08:19:12 tobez Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.49 2005/08/09 10:19:53 rwatson Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver ==== //depot/projects/netsmp/src/sys/dev/sbni/if_sbni.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.20 2005/06/10 16:49:14 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.21 2005/08/09 10:19:53 rwatson Exp $"); /* * Device driver for Granch SBNI12 leased line adapters ==== //depot/projects/netsmp/src/sys/dev/sbsh/if_sbsh.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.13 2005/07/18 18:19:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.14 2005/08/09 10:19:53 rwatson Exp $"); #include #include ==== //depot/projects/netsmp/src/sys/dev/sn/if_sn.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.47 2005/08/03 00:18:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.48 2005/08/09 10:19:54 rwatson Exp $"); /* * This is a driver for SMC's 9000 series of Ethernet adapters. ==== //depot/projects/netsmp/src/sys/dev/snc/dp83932.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.20 2005/08/03 00:18:33 rwatson Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.21 2005/08/09 10:19:54 rwatson Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ ==== //depot/projects/netsmp/src/sys/dev/snc/if_snc_pccard.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.8 2005/06/12 16:21:44 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.9 2005/08/09 10:19:54 rwatson Exp $"); /* * National Semiconductor DP8393X SONIC Driver ==== //depot/projects/netsmp/src/sys/dev/sr/if_sr.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.69 2005/06/10 16:49:15 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sr/if_sr.c,v 1.70 2005/08/09 10:19:54 rwatson Exp $"); /* * Programming assumptions and other issues. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 9 11:24:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 092D916A421; Tue, 9 Aug 2005 11:24:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D83FC16A41F for ; Tue, 9 Aug 2005 11:24:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4B8443D49 for ; Tue, 9 Aug 2005 11:24:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79BOwDv012062 for ; Tue, 9 Aug 2005 11:24:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79BOwQ4012059 for perforce@freebsd.org; Tue, 9 Aug 2005 11:24:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Aug 2005 11:24:58 GMT Message-Id: <200508091124.j79BOwQ4012059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 11:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=81723 Change 81723 by rwatson@rwatson_peppercorn on 2005/08/09 11:24:43 Expand discussion of MAC Framework versioning. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#447 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#447 (text+ko) ==== @@ -96,10 +96,21 @@ #ifdef MAC -/* - * Declare that the kernel provides MAC support, version 1. This permits - * modules to refuse to be loaded if the necessary support isn't present, - * even if it's pre-boot. +/*- + * The TrustedBSD MAC Framework declares two version numbers in support of + * policy modules: + * + * - A linker version number, which declares the version of the MAC policy + * ABI. + * + * - A feature version number, relative to the linker version, which declares + * what if any optional features for the linker version are present. This + * supports the incremental addition of features in a FreeBSD RELENG + * branch. + * + * Modules will be unable to load if they do not match the current linker + * version due to ABI compatibility concerns. They may also test for support + * for specific API features that they depend on. */ MODULE_VERSION(kernel_mac_support, 3); From owner-p4-projects@FreeBSD.ORG Tue Aug 9 11:30:06 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EC7616A421; Tue, 9 Aug 2005 11:30:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CD3D16A41F for ; Tue, 9 Aug 2005 11:30:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ACC043D5A for ; Tue, 9 Aug 2005 11:30:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79BU5v7012352 for ; Tue, 9 Aug 2005 11:30:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79BU51t012349 for perforce@freebsd.org; Tue, 9 Aug 2005 11:30:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Aug 2005 11:30:05 GMT Message-Id: <200508091130.j79BU51t012349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 11:30:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=81724 Change 81724 by rwatson@rwatson_peppercorn on 2005/08/09 11:29:30 Un-staticize mac_version so modules can test it. Constify mac_version since it really shouldn't be changed at run- time. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#448 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#448 (text+ko) ==== @@ -120,7 +120,7 @@ /* * Export the MAC API version counter. */ -static int mac_version = __MAC_version; +const int mac_version = __MAC_version; SYSCTL_INT(_security_mac, OID_AUTO, version, CTLFLAG_RD, &mac_version, 0, "MAC version"); From owner-p4-projects@FreeBSD.ORG Tue Aug 9 16:14:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FFE916A421; Tue, 9 Aug 2005 16:14:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4692C16A41F for ; Tue, 9 Aug 2005 16:14:09 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C93FE43D48 for ; Tue, 9 Aug 2005 16:14:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j79GE8kM037435 for ; Tue, 9 Aug 2005 16:14:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j79GE8it037432 for perforce@freebsd.org; Tue, 9 Aug 2005 16:14:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Aug 2005 16:14:08 GMT Message-Id: <200508091614.j79GE8it037432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 16:14:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=81737 Change 81737 by rwatson@rwatson_peppercorn on 2005/08/09 16:13:47 Add helper function ip_findmoptions(), which accepts an inpcb, and attempts to atomically return either an existing set of IP multicast options for the PCB, or a newlly allocated set with default values. The inpcb is returned locked. This function may sleep. Call ip_moptions() to acquire a reference to a PCB's socket options, and perform the update of the options while holding the PCB lock. Release the lock before returning. Remove garbage collection of multicast options when values return to the default, as this complicates locking substantially. Most applications allocate a socket either to be multicast, or not, and don't tend to keep around sockets that have previously been used for multicast, then used for unicast. Affected files ... .. //depot/projects/netsmp/src/sys/netinet/ip_output.c#5 edit Differences ... ==== //depot/projects/netsmp/src/sys/netinet/ip_output.c#5 (text+ko) ==== @@ -99,6 +99,7 @@ static int ip_getmoptions(struct inpcb *, struct sockopt *); static int ip_pcbopts(struct inpcb *, int, struct mbuf *); static int ip_setmoptions(struct inpcb *, struct sockopt *); +static struct ip_moptions *ip_findmoptions(struct inpcb *inp); int ip_optcopy(struct ip *, struct ip *); @@ -1569,6 +1570,39 @@ } /* + * Given an inpcb, return its multicast options structure pointer. Accepts + * an unlocked inpcb pointer, but will return it locked. May sleep. + */ +static struct ip_moptions * +ip_findmoptions(struct inpcb *inp) +{ + struct ip_moptions *imo; + + INP_LOCK(inp); + if (inp->inp_moptions != NULL) + return (inp->inp_moptions); + + INP_UNLOCK(inp); + + imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS, M_WAITOK); + + imo->imo_multicast_ifp = NULL; + imo->imo_multicast_addr.s_addr = INADDR_ANY; + imo->imo_multicast_vif = -1; + imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL; + imo->imo_multicast_loop = IP_DEFAULT_MULTICAST_LOOP; + imo->imo_num_memberships = 0; + + INP_LOCK(inp); + if (inp->inp_moptions != NULL) { + free(imo, M_IPMOPTS); + return (inp->inp_moptions); + } + inp->inp_moptions = imo; + return (imo); +} + +/* * Set the IP multicast options in response to user setsockopt(). */ static int @@ -1585,26 +1619,6 @@ int ifindex; int s; - imo = inp->inp_moptions; - if (imo == NULL) { - /* - * No multicast option buffer attached to the pcb; - * allocate one and initialize to default values. - */ - imo = (struct ip_moptions*)malloc(sizeof(*imo), M_IPMOPTS, - M_WAITOK); - - if (imo == NULL) - return (ENOBUFS); - inp->inp_moptions = imo; - imo->imo_multicast_ifp = NULL; - imo->imo_multicast_addr.s_addr = INADDR_ANY; - imo->imo_multicast_vif = -1; - imo->imo_multicast_ttl = IP_DEFAULT_MULTICAST_TTL; - imo->imo_multicast_loop = IP_DEFAULT_MULTICAST_LOOP; - imo->imo_num_memberships = 0; - } - switch (sopt->sopt_name) { /* store an index number for the vif you wanna use in the send */ case IP_MULTICAST_VIF: @@ -1619,7 +1633,9 @@ error = EINVAL; break; } + imo = ip_findmoptions(inp); imo->imo_multicast_vif = i; + INP_UNLOCK(inp); break; case IP_MULTICAST_IF: @@ -1634,8 +1650,10 @@ * When no interface is selected, a default one is * chosen every time a multicast packet is sent. */ + imo = ip_findmoptions(inp); if (addr.s_addr == INADDR_ANY) { imo->imo_multicast_ifp = NULL; + INP_UNLOCK(inp); break; } /* @@ -1646,6 +1664,7 @@ s = splimp(); ifp = ip_multicast_if(&addr, &ifindex); if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) { + INP_UNLOCK(inp); splx(s); error = EADDRNOTAVAIL; break; @@ -1655,6 +1674,7 @@ imo->imo_multicast_addr = addr; else imo->imo_multicast_addr.s_addr = INADDR_ANY; + INP_UNLOCK(inp); splx(s); break; @@ -1670,7 +1690,9 @@ error = sooptcopyin(sopt, &ttl, 1, 1); if (error) break; + imo = ip_findmoptions(inp); imo->imo_multicast_ttl = ttl; + INP_UNLOCK(inp); } else { u_int ttl; error = sooptcopyin(sopt, &ttl, sizeof ttl, @@ -1679,8 +1701,11 @@ break; if (ttl > 255) error = EINVAL; - else + else { + imo = ip_findmoptions(inp); imo->imo_multicast_ttl = ttl; + INP_UNLOCK(inp); + } } break; @@ -1696,14 +1721,18 @@ error = sooptcopyin(sopt, &loop, 1, 1); if (error) break; + imo = ip_findmoptions(inp); imo->imo_multicast_loop = !!loop; + INP_UNLOCK(inp); } else { u_int loop; error = sooptcopyin(sopt, &loop, sizeof loop, sizeof loop); if (error) break; + imo = ip_findmoptions(inp); imo->imo_multicast_loop = !!loop; + INP_UNLOCK(inp); } break; @@ -1757,6 +1786,7 @@ * See if the membership already exists or if all the * membership slots are full. */ + imo = ip_findmoptions(inp); for (i = 0; i < imo->imo_num_memberships; ++i) { if (imo->imo_membership[i]->inm_ifp == ifp && imo->imo_membership[i]->inm_addr.s_addr @@ -1764,11 +1794,13 @@ break; } if (i < imo->imo_num_memberships) { + INP_UNLOCK(inp); error = EADDRINUSE; splx(s); break; } if (i == IP_MAX_MEMBERSHIPS) { + INP_UNLOCK(inp); error = ETOOMANYREFS; splx(s); break; @@ -1779,11 +1811,13 @@ */ if ((imo->imo_membership[i] = in_addmulti(&mreq.imr_multiaddr, ifp)) == NULL) { + INP_UNLOCK(inp); error = ENOBUFS; splx(s); break; } ++imo->imo_num_memberships; + INP_UNLOCK(inp); splx(s); break; @@ -1819,6 +1853,7 @@ /* * Find the membership in the membership array. */ + imo = ip_findmoptions(inp); for (i = 0; i < imo->imo_num_memberships; ++i) { if ((ifp == NULL || imo->imo_membership[i]->inm_ifp == ifp) && @@ -1827,6 +1862,7 @@ break; } if (i == imo->imo_num_memberships) { + INP_UNLOCK(inp); error = EADDRNOTAVAIL; splx(s); break; @@ -1842,6 +1878,7 @@ for (++i; i < imo->imo_num_memberships; ++i) imo->imo_membership[i-1] = imo->imo_membership[i]; --imo->imo_num_memberships; + INP_UNLOCK(inp); splx(s); break; @@ -1850,18 +1887,6 @@ break; } - /* - * If all options have default values, no need to keep the mbuf. - */ - if (imo->imo_multicast_ifp == NULL && - imo->imo_multicast_vif == -1 && - imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL && - imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP && - imo->imo_num_memberships == 0) { - free(inp->inp_moptions, M_IPMOPTS); - inp->inp_moptions = NULL; - } - return (error); } From owner-p4-projects@FreeBSD.ORG Wed Aug 10 02:28:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB58316A421; Wed, 10 Aug 2005 02:28:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90E7716A41F for ; Wed, 10 Aug 2005 02:28:49 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 604B543D72 for ; Wed, 10 Aug 2005 02:28:49 +0000 (GMT) (envelope-from soc-chenk@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7A2Sn5X088344 for ; Wed, 10 Aug 2005 02:28:49 GMT (envelope-from soc-chenk@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7A2SnS4088341 for perforce@freebsd.org; Wed, 10 Aug 2005 02:28:49 GMT (envelope-from soc-chenk@freebsd.org) Date: Wed, 10 Aug 2005 02:28:49 GMT Message-Id: <200508100228.j7A2SnS4088341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-chenk@freebsd.org using -f From: soc-chenk To: Perforce Change Reviews Cc: Subject: PERFORCE change 81755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 02:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=81755 Change 81755 by soc-chenk@soc-chenk_leavemealone on 2005/08/10 02:28:33 darcs changes --last=1 Wed Aug 10 04:25:16 CEST 2005 at node: creo.hu, nick: csaba * converted genopnames script from ruby to awk Submitted by: soc-chenk Affected files ... .. //depot/projects/soc2005/fuse4bsd/Makefile#3 edit .. //depot/projects/soc2005/fuse4bsd/tools/genopnames.awk#1 add .. //depot/projects/soc2005/fuse4bsd/tools/genopnames.rb#3 delete Differences ... ==== //depot/projects/soc2005/fuse4bsd/Makefile#3 (text+ko) ==== @@ -17,13 +17,13 @@ fusedummy.ko: fuse_opnames fuse_kernel.h -fuse_kernel.h: +fuse_kernel.h: fuse_kernel.h.orig cp fuse_kernel.h.orig fuse_kernel.h patch fuse_kernel.h < kernel-header.diff fuse_opnames: .if defined(FMASTER) - ruby tools/genopnames.rb fuse_kernel.h.orig > fuse_opnames.h + awk -f tools/genopnames.awk fuse_kernel.h.orig > fuse_opnames.h .endif From owner-p4-projects@FreeBSD.ORG Wed Aug 10 05:56:37 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACD2A16A89C; Wed, 10 Aug 2005 05:55:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B03A16A8EC for ; Wed, 10 Aug 2005 05:55:01 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5F72441C8 for ; Wed, 10 Aug 2005 05:51:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7A5pteL002779 for ; Wed, 10 Aug 2005 05:51:55 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7A5ptB4002776 for perforce@freebsd.org; Wed, 10 Aug 2005 05:51:55 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 10 Aug 2005 05:51:55 GMT Message-Id: <200508100551.j7A5ptB4002776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 81761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 05:56:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=81761 Change 81761 by soc-andrew@soc-andrew_serv on 2005/08/10 05:51:38 Integrate from current Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#5 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.334 2005/08/03 09:27:26 phk Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.335 2005/08/08 20:10:05 cperciva Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -112,6 +112,7 @@ pmccontrol \ pmcstat \ ${_pnpinfo} \ + portsnap \ powerd \ ppp \ ${_pppctl} \ From owner-p4-projects@FreeBSD.ORG Wed Aug 10 12:17:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AAF116A421; Wed, 10 Aug 2005 12:17:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4FCE16A41F for ; Wed, 10 Aug 2005 12:17:20 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7C2743D75 for ; Wed, 10 Aug 2005 12:17:18 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7ACHI00023866 for ; Wed, 10 Aug 2005 12:17:18 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7ACHI5E023863 for perforce@freebsd.org; Wed, 10 Aug 2005 12:17:18 GMT (envelope-from soc-saturnero@freebsd.org) Date: Wed, 10 Aug 2005 12:17:18 GMT Message-Id: <200508101217.j7ACHI5E023863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 12:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=81775 Change 81775 by soc-saturnero@soc-saturnero_sberta on 2005/08/10 12:17:09 Install packages only if selected arch is equal to $(uname -m) Affected files ... .. //depot/projects/soc2005/freesbie/ToDo#7 edit .. //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#2 edit Differences ... ==== //depot/projects/soc2005/freesbie/ToDo#7 (text+ko) ==== @@ -14,7 +14,7 @@ List of files to be created: / - configure # Dialog-based configuration toolkit, creates config.sh + configure # Dialog-based configuration toolkit, creates conf/freesbie.conf Makefile # Launches scripts, according to the selected target #Configuration file used in the build phase ==== //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#2 (text+ko) ==== @@ -12,9 +12,24 @@ exit 1 fi +PKGFILE=${PKGFILE:-${LOCALDIR}/conf/packages}; + +if [ ! -f ${PKGFILE} ]; then + return +fi + +if [ "${ARCH}" != "$(uname -m)" ]; then + echo "----------------------------------------------------------" + echo "You can install packages only if your machine architecture" + echo "is the same of the target architecture." + echo "----------------------------------------------------------" + echo "Skipping package installation." + sleep 5 + return +fi + WORKDIR=$(mktemp -d -t freesbie) CHROOTWD=$(TMPDIR=${BASEDIR}/tmp mktemp -d -t freesbie) -PKGFILE=${PKGFILE:-${LOCALDIR}/conf/packages}; find_origins() { cd ${WORKDIR} @@ -127,13 +142,11 @@ trap "purge_wd && exit 1" INT -if [ -f ${PKGFILE} ]; then - echo "Installing packages listed in ${PKGFILE}" - find_origins - find_deps - create_packages - delete_old_packages - install_packages -fi +echo "Installing packages listed in ${PKGFILE}" +find_origins +find_deps +create_packages +delete_old_packages +install_packages purge_wd From owner-p4-projects@FreeBSD.ORG Wed Aug 10 13:00:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14FA616A42F; Wed, 10 Aug 2005 13:00:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AC1616A421 for ; Wed, 10 Aug 2005 13:00:13 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30BC743D49 for ; Wed, 10 Aug 2005 13:00:13 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AD0DBd032498 for ; Wed, 10 Aug 2005 13:00:13 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AD0CEU032495 for perforce@freebsd.org; Wed, 10 Aug 2005 13:00:12 GMT (envelope-from soc-saturnero@freebsd.org) Date: Wed, 10 Aug 2005 13:00:12 GMT Message-Id: <200508101300.j7AD0CEU032495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 13:00:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=81781 Change 81781 by soc-saturnero@soc-saturnero_sberta on 2005/08/10 13:00:00 Adding extra target, for plugins management Affected files ... .. //depot/projects/soc2005/freesbie/Makefile#10 edit .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#9 edit .. //depot/projects/soc2005/freesbie/scripts/extra.sh#1 add Differences ... ==== //depot/projects/soc2005/freesbie/Makefile#10 (text+ko) ==== @@ -56,8 +56,15 @@ @sh ./scripts/launch.sh pkginstall .tmp_pkginstall @mv .tmp_pkginstall .done_pkginstall +extra: .done_extra +.done_extra: .done_installworld + @-rm -f .tmp_extra + @touch .tmp_extra + @sh ./scripts/launch.sh extra .tmp_extra + @mv .tmp_extra .done_extra + clonefs: .done_clonefs -.done_clonefs: .done_installkernel .done_pkginstall +.done_clonefs: .done_installkernel .done_pkginstall .done_extra @-rm -f .tmp_clonefs @touch .tmp_clonefs @sh ./scripts/launch.sh clonefs .tmp_clonefs ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#9 (text+ko) ==== @@ -67,6 +67,10 @@ # #PKGFILE=/my/own/pkg_info_output.txt +# Set EXTRA variable to the additional plugins you want to run in your +# system +# +#EXTRA=customroot cardselect # Knobs From owner-p4-projects@FreeBSD.ORG Wed Aug 10 14:18:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15FAF16A421; Wed, 10 Aug 2005 14:18:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2EA216A41F for ; Wed, 10 Aug 2005 14:18:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86B1F43D48 for ; Wed, 10 Aug 2005 14:18:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AEInwf035893 for ; Wed, 10 Aug 2005 14:18:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AEIncN035890 for perforce@freebsd.org; Wed, 10 Aug 2005 14:18:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 10 Aug 2005 14:18:49 GMT Message-Id: <200508101418.j7AEIncN035890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 81785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 14:18:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=81785 Change 81785 by rwatson@rwatson_peppercorn on 2005/08/10 14:18:09 Minor white space/style tweaks Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#9 (text+ko) ==== @@ -289,16 +289,15 @@ typedef struct au_evclass_map au_evclass_map_t; #if !defined(_KERNEL) && !defined(KERNEL) - -int audit (const void *, int); -int auditon (int, void *, int); -int auditctl (const char *); -int getauid (au_id_t *); -int setauid (const au_id_t *); -int getaudit (struct auditinfo *); -int setaudit (const struct auditinfo *); -int getaudit_addr (struct auditinfo_addr *, int); -int setaudit_addr (const struct auditinfo_addr *, int); +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Wed Aug 10 15:30:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78CB016A422; Wed, 10 Aug 2005 15:30:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F6A216A41F for ; Wed, 10 Aug 2005 15:30:17 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01EBB43D48 for ; Wed, 10 Aug 2005 15:30:16 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AFUG1Z039069 for ; Wed, 10 Aug 2005 15:30:16 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AFUGte039063 for perforce@freebsd.org; Wed, 10 Aug 2005 15:30:16 GMT (envelope-from soc-cjones@freebsd.org) Date: Wed, 10 Aug 2005 15:30:16 GMT Message-Id: <200508101530.j7AFUGte039063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 15:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=81788 Change 81788 by soc-cjones@soc-cjones_ishtar on 2005/08/10 15:29:33 Make gv_rm_sd visible for use in moving sds. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#3 edit .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rm.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#3 (text+ko) ==== @@ -56,6 +56,7 @@ /* geom_vinum_rm.c */ void gv_remove(struct g_geom *, struct gctl_req *); +int gv_rm_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, int flags); /* geom_vinum_state.c */ int gv_sdstatemap(struct gv_plex *); ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rm.c#2 (text+ko) ==== @@ -44,8 +44,8 @@ struct gv_drive *, int); static int gv_rm_plex(struct gv_softc *, struct gctl_req *, struct gv_plex *, int); -static int gv_rm_sd(struct gv_softc *, struct gctl_req *, struct gv_sd *, - int); +/* static int gv_rm_sd(struct gv_softc *, struct gctl_req *, struct gv_sd *, + int); */ static int gv_rm_vol(struct gv_softc *, struct gctl_req *, struct gv_volume *, int); @@ -241,7 +241,7 @@ } /* Remove a subdisk. */ -static int +/* static */ int gv_rm_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, int flags) { struct gv_drive *d; From owner-p4-projects@FreeBSD.ORG Wed Aug 10 18:45:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE23816A421; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA2FE16A41F for ; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B69343D45 for ; Wed, 10 Aug 2005 18:45:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AIjHBY054437 for ; Wed, 10 Aug 2005 18:45:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AIjFj3054424 for perforce@freebsd.org; Wed, 10 Aug 2005 18:45:15 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Aug 2005 18:45:15 GMT Message-Id: <200508101845.j7AIjFj3054424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 18:45:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=81798 Change 81798 by sam@sam_ebb on 2005/08/10 18:44:24 IFC @ 81797 Affected files ... .. //depot/projects/wifi/MAINTAINERS#8 integrate .. //depot/projects/wifi/etc/Makefile#8 integrate .. //depot/projects/wifi/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/wifi/etc/portsnap.conf#1 branch .. //depot/projects/wifi/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/wifi/lib/libarchive/configure.ac.in#6 integrate .. //depot/projects/wifi/lib/libdevstat/devstat.3#4 integrate .. //depot/projects/wifi/lib/libedit/chared.c#3 integrate .. //depot/projects/wifi/lib/libedit/chared.h#3 integrate .. //depot/projects/wifi/lib/libedit/common.c#3 integrate .. //depot/projects/wifi/lib/libedit/editline.3#4 integrate .. //depot/projects/wifi/lib/libedit/emacs.c#3 integrate .. //depot/projects/wifi/lib/libedit/key.c#3 integrate .. //depot/projects/wifi/lib/libedit/sys.h#3 integrate .. //depot/projects/wifi/lib/libedit/term.c#3 integrate .. //depot/projects/wifi/lib/libedit/vi.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#6 integrate .. //depot/projects/wifi/share/man/man4/nge.4#5 integrate .. //depot/projects/wifi/share/man/man4/nve.4#5 integrate .. //depot/projects/wifi/share/man/man4/pcvt.4#4 integrate .. //depot/projects/wifi/share/man/man5/Makefile#5 integrate .. //depot/projects/wifi/share/man/man5/portsnap.conf.5#1 branch .. //depot/projects/wifi/share/man/man9/bios.9#3 integrate .. //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/wifi/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#5 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#7 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/wifi/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#15 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#15 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#100 integrate .. //depot/projects/wifi/sys/dev/awi/awi.c#12 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/wifi/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/wifi/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/wifi/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#13 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/en/midway.c#4 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/wifi/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/wifi/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_ioctl.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_rx.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_tx.c#5 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme.c#8 integrate .. //depot/projects/wifi/sys/dev/ie/if_ie.c#4 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.h#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/wifi/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/wifi/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/wifi/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc.c#4 integrate .. //depot/projects/wifi/sys/dev/my/if_my.c#5 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/wifi/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi.c#5 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_ioctl.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_tx.c#4 integrate .. //depot/projects/wifi/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/wifi/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#9 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#7 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#8 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/wifi/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/wifi/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/wifi/sys/dev/snc/dp83932.c#6 integrate .. //depot/projects/wifi/sys/dev/snc/if_snc_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/wifi/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/wifi/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/wifi/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/wifi/sys/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/wifi/sys/dev/vx/if_vx.c#6 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/wifi/sys/dev/xe/if_xe_pccard.c#6 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/wifi/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_poll.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#12 integrate .. //depot/projects/wifi/sys/kern/tty_pty.c#7 integrate .. //depot/projects/wifi/sys/kern/tty_tty.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/wifi/sys/libkern/strcasecmp.c#2 integrate .. //depot/projects/wifi/sys/modules/twa/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/twe/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#13 integrate .. //depot/projects/wifi/sys/net/bridge.c#8 integrate .. //depot/projects/wifi/sys/net/bridgestp.c#3 integrate .. //depot/projects/wifi/sys/net/if.c#18 integrate .. //depot/projects/wifi/sys/net/if.h#6 integrate .. //depot/projects/wifi/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/wifi/sys/net/if_atm.h#4 integrate .. //depot/projects/wifi/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#5 integrate .. //depot/projects/wifi/sys/net/if_ef.c#4 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/wifi/sys/net/if_faith.c#5 integrate .. //depot/projects/wifi/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/wifi/sys/net/if_fwsubr.c#6 integrate .. //depot/projects/wifi/sys/net/if_gif.c#5 integrate .. //depot/projects/wifi/sys/net/if_gre.c#5 integrate .. //depot/projects/wifi/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/wifi/sys/net/if_loop.c#5 integrate .. //depot/projects/wifi/sys/net/if_ppp.c#5 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/wifi/sys/net/if_tap.c#10 integrate .. //depot/projects/wifi/sys/net/if_tun.c#8 integrate .. //depot/projects/wifi/sys/net/if_var.h#16 integrate .. //depot/projects/wifi/sys/net/if_vlan.c#7 integrate .. //depot/projects/wifi/sys/net/ppp_tty.c#6 integrate .. //depot/projects/wifi/sys/net/route.c#4 integrate .. //depot/projects/wifi/sys/net/rtsock.c#8 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#28 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#62 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#47 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#63 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#33 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#55 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#22 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#35 integrate .. //depot/projects/wifi/sys/netatm/atm_if.c#4 integrate .. //depot/projects/wifi/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#4 integrate .. //depot/projects/wifi/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop.c#3 integrate .. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/wifi/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/wifi/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/wifi/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/wifi/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_sppp.c#5 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#8 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#5 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#9 integrate .. //depot/projects/wifi/sys/netinet/pim_var.h#3 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#5 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/wifi/sys/netinet6/pim6_var.h#3 integrate .. //depot/projects/wifi/sys/netnatm/natm.c#5 integrate .. //depot/projects/wifi/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#8 integrate .. //depot/projects/wifi/sys/pci/if_de.c#8 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#8 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#7 integrate .. //depot/projects/wifi/sys/pci/if_sf.c#8 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#8 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#15 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#6 integrate .. //depot/projects/wifi/sys/pci/if_ti.c#10 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#6 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#7 integrate .. //depot/projects/wifi/sys/pci/if_wb.c#6 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#10 integrate .. //depot/projects/wifi/sys/sys/conf.h#11 integrate .. //depot/projects/wifi/sys/sys/interrupt.h#3 integrate .. //depot/projects/wifi/sys/sys/proc.h#17 integrate .. //depot/projects/wifi/sys/sys/protosw.h#3 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#12 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#19 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/collect_all_make_options.sh#1 branch .. //depot/projects/wifi/tools/tools/build_option_survey/mkhtml.sh#2 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/no_list#2 delete .. //depot/projects/wifi/tools/tools/build_option_survey/option_survey.sh#2 integrate .. //depot/projects/wifi/tools/tools/build_option_survey/reduce.sh#1 branch .. //depot/projects/wifi/usr.sbin/Makefile#15 integrate .. //depot/projects/wifi/usr.sbin/config/config.8#4 integrate .. //depot/projects/wifi/usr.sbin/config/main.c#6 integrate .. //depot/projects/wifi/usr.sbin/portsnap/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/Makefile.inc#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/make_index/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/make_index/make_index.c#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/phttpget.c#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/portsnap.8#1 branch .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/portsnap.sh#1 branch .. //depot/projects/wifi/usr.sbin/rtadvd/rtadvd.conf.5#3 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.123 2005/08/06 06:46:29 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.124 2005/08/08 20:10:04 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. +portsnap cperciva Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/wifi/etc/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.345 2005/07/22 10:35:35 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.346 2005/08/08 20:10:05 cperciva Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - pf.conf pf.os phones profile protocols \ + portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ ==== //depot/projects/wifi/etc/mtree/BSD.var.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.71 2004/10/15 08:57:24 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.72 2005/08/08 20:10:05 cperciva Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -34,6 +34,8 @@ .. ports .. + portsnap + .. .. empty mode=0555 flags=schg .. ==== //depot/projects/wifi/games/fortune/datfiles/fortunes#14 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.179 2005/06/10 08:58:44 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.182 2005/08/10 17:18:06 schweikh Exp $ % ======================================================================= @@ -17432,7 +17432,7 @@ % Everlasting peace will come to the world when the last man has slain the last but one. - -- Adolph Hitler + -- Adolf Hitler % Every absurdity has a champion who will defend it. % @@ -25066,7 +25066,7 @@ it is plausible or not. The victor will not be asked afterwards whether he told the truth or not. When starting and waging war it is not right that matters, but victory. - -- Adolph Hitler + -- Adolf Hitler % I shot an arrow in to the air, and it stuck. -- graffito in Los Angeles @@ -44336,7 +44336,7 @@ Success is something I will dress for when I get there, and not until. % Success is the sole earthly judge of right and wrong. - -- Adolph Hitler, "Mein Kampf" + -- Adolf Hitler, "Mein Kampf" % Succumb to natural tendencies. Be hateful and boring. % @@ -49970,7 +49970,7 @@ % The very first essential for success is a perpetually constant and regular employment of violence. - -- Adolph Hitler, "Mein Kampf" + -- Adolf Hitler, "Mein Kampf" % The very ink with which all history is written is merely fluid prejudice. @@ -55975,7 +55975,7 @@ -- Jack Kerouac % What luck for the rulers that men do not think. - -- Adolph Hitler + -- Adolf Hitler % What makes the Universe so hard to comprehend is that there's nothing to compare it with. ==== //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.30 2005/02/03 22:48:29 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.32 2005/08/10 17:18:07 schweikh Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 ==== //depot/projects/wifi/lib/libarchive/archive_platform.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.16 2005/06/04 22:30:36 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.17 2005/08/10 15:01:03 kientzle Exp $ */ /* @@ -49,6 +49,7 @@ #define HAVE_ACL_SET_FD 1 #define HAVE_ACL_SET_FD_NP 1 #define HAVE_ACL_SET_FILE 1 +#define HAVE_ACL_USER 1 #endif #define HAVE_BZLIB_H 1 #define HAVE_CHFLAGS 1 @@ -122,11 +123,11 @@ #endif /* - * If this platform has , acl_create(), acl_init(), and - * acl_set_file(), we assume it has the rest of the POSIX.1e draft - * functions used in archive_read_extract.c. + * If this platform has , acl_create(), acl_init(), + * acl_set_file(), and ACL_USER, we assume it has the rest of the + * POSIX.1e draft functions used in archive_read_extract.c. */ -#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE +#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE && HAVE_ACL_USER #define HAVE_POSIX_ACL 1 #endif ==== //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#3 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.8 2005/06/01 15:52:39 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.9 2005/08/10 15:02:53 kientzle Exp $"); #include +#include #include #include "archive.h" @@ -65,8 +66,10 @@ if (bytes_to_write > MAX_WRITE) bytes_to_write = MAX_WRITE; bytes_written = write(fd, buff, bytes_to_write); - if (bytes_written < 0) + if (bytes_written < 0) { + archive_set_error(a, errno, "Write error"); return (-1); + } output_offset += bytes_written; total_written += bytes_written; size -= bytes_written; ==== //depot/projects/wifi/lib/libarchive/configure.ac.in#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.6 2005/06/04 22:30:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/configure.ac.in,v 1.7 2005/08/10 15:01:03 kientzle Exp $ #Process this file with autoconf to produce a configure script. AC_INIT(libarchive, @VERSION@, kientzle@freebsd.org) @@ -77,6 +77,14 @@ AC_CHECK_FUNCS([lchflags lchmod lchown lutimes memmove]) AC_CHECK_FUNCS([memset mkdir mkfifo strchr strdup strerror strrchr]) +# MacOS has an acl.h that isn't POSIX. It can be detected by +# checking for ACL_USER +AC_CHECK_DECL([ACL_USER], + [AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])], + [], + [#include ]) + + # Additional requirements AC_SYS_LARGEFILE AC_SUBST(ARCHIVE_API_VERSION,[1]) ==== //depot/projects/wifi/lib/libdevstat/devstat.3#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.27 2005/07/17 13:33:04 charnier Exp $ +.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.28 2005/08/10 00:51:36 ken Exp $ .\" .Dd March 18, 2003 .Dt DEVSTAT 3 @@ -442,10 +442,7 @@ .Pp The .Fn devstat_compute_statistics -function -is an updated version of -.Fn compute_stats -that provides more complete statistics calculation. +function provides complete statistics calculation. There are four arguments for which values .Em must be supplied: ==== //depot/projects/wifi/lib/libedit/chared.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: chared.c,v 1.24 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: chared.c,v 1.25 2005/08/08 01:41:30 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.9 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/chared.c,v 1.10 2005/08/09 13:31:59 stefanf Exp $"); /* * chared.c: Character editor utilities @@ -522,6 +522,8 @@ el->el_state.argument = 1; el->el_state.lastcmd = ED_UNASSIGNED; + el->el_history.eventno = 0; + if (mclear) ch__clearmacro(el); } ==== //depot/projects/wifi/lib/libedit/chared.h#3 (text+ko) ==== @@ -30,8 +30,8 @@ * SUCH DAMAGE. * * @(#)chared.h 8.1 (Berkeley) 6/4/93 - * $NetBSD: chared.h,v 1.15 2005/08/01 23:00:15 christos Exp $ - * $FreeBSD: src/lib/libedit/chared.h,v 1.7 2005/08/07 20:51:52 stefanf Exp $ + * $NetBSD: chared.h,v 1.16 2005/08/08 14:05:37 christos Exp $ + * $FreeBSD: src/lib/libedit/chared.h,v 1.8 2005/08/09 13:37:59 stefanf Exp $ */ /* ==== //depot/projects/wifi/lib/libedit/common.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: common.c,v 1.17 2005/08/01 23:00:15 christos Exp $ + * $NetBSD: common.c,v 1.18 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/common.c,v 1.11 2005/08/09 13:37:59 stefanf Exp $"); /* * common.c: Common Editor functions ==== //depot/projects/wifi/lib/libedit/editline.3#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libedit/editline.3,v 1.24 2005/08/07 20:51:52 stefanf Exp $ +.\" $FreeBSD: src/lib/libedit/editline.3,v 1.25 2005/08/09 13:35:48 stefanf Exp $ .\" .Dd July 14, 2005 .Os @@ -648,7 +648,7 @@ .Pp The .Fn history -function returns 0 if the operation +function returns \*[Gt]= 0 if the operation .Fa op succeeds. Otherwise, \-1 is returned and ==== //depot/projects/wifi/lib/libedit/emacs.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: emacs.c,v 1.19 2004/10/28 21:14:52 dsl Exp $ + * $NetBSD: emacs.c,v 1.20 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.9 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/emacs.c,v 1.10 2005/08/09 13:37:59 stefanf Exp $"); /* * emacs.c: Emacs functions ==== //depot/projects/wifi/lib/libedit/key.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: key.c,v 1.16 2005/07/06 21:13:02 christos Exp $ + * $NetBSD: key.c,v 1.17 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.10 2005/08/07 20:51:52 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/key.c,v 1.11 2005/08/09 13:37:59 stefanf Exp $"); /* * key.c: This module contains the procedures for maintaining ==== //depot/projects/wifi/lib/libedit/sys.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)sys.h 8.1 (Berkeley) 6/4/93 * $NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $ - * $FreeBSD: src/lib/libedit/sys.h,v 1.5 2005/08/07 20:51:52 stefanf Exp $ + * $FreeBSD: src/lib/libedit/sys.h,v 1.6 2005/08/10 13:41:31 stefanf Exp $ */ /* @@ -40,6 +40,8 @@ #ifndef _h_sys #define _h_sys +#include + #ifndef public # define public /* Externally visible functions/variables */ #endif @@ -53,8 +55,6 @@ /* When we want to hide everything */ #endif -#include - #ifndef _PTR_T # define _PTR_T typedef void *ptr_t; ==== //depot/projects/wifi/lib/libedit/term.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: term.c,v 1.40 2004/05/22 23:21:28 christos Exp $ + * $NetBSD: term.c,v 1.41 2005/08/08 14:05:37 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.18 2005/08/08 07:08:35 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.19 2005/08/09 13:37:59 stefanf Exp $"); /* * term.c: Editor/termcap-curses interface ==== //depot/projects/wifi/lib/libedit/vi.c#3 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $NetBSD: vi.c,v 1.21 2005/04/25 01:06:03 matt Exp $ + * $NetBSD: vi.c,v 1.24 2005/08/10 12:46:24 christos Exp $ */ #if !defined(lint) && !defined(SCCSID) static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint && not SCCSID */ #include -__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.11 2005/08/08 07:08:35 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libedit/vi.c,v 1.13 2005/08/10 13:38:01 stefanf Exp $"); /* * vi.c: Vi mode commands. @@ -66,8 +66,10 @@ el->el_line.lastchar - el->el_line.buffer); el->el_chared.c_vcmd.action = NOP; el->el_chared.c_vcmd.pos = 0; - el->el_line.lastchar = el->el_line.buffer; - el->el_line.cursor = el->el_line.buffer; + if (!(c & YANK)) { + el->el_line.lastchar = el->el_line.buffer; + el->el_line.cursor = el->el_line.buffer; + } if (c & INSERT) el->el_map.current = el->el_map.key; @@ -84,7 +86,6 @@ private el_action_t cv_paste(EditLine *el, int c) { - char *ptr; c_kill_t *k = &el->el_chared.c_kill; int len = k->last - k->buf; @@ -98,12 +99,12 @@ if (!c && el->el_line.cursor < el->el_line.lastchar) el->el_line.cursor++; - ptr = el->el_line.cursor; c_insert(el, len); if (el->el_line.cursor + len > el->el_line.lastchar) return (CC_ERROR); - (void) memcpy(ptr, k->buf, len +0u); + (void) memcpy(el->el_line.cursor, k->buf, len +0u); + return (CC_REFRESH); } ==== //depot/projects/wifi/lib/libmemstat/libmemstat.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.8 2005/08/06 13:54:03 rwatson Exp $ +.\" $FreeBSD: src/lib/libmemstat/libmemstat.3,v 1.9 2005/08/09 22:19:30 rwatson Exp $ .\" .Dd June 27, 2005 .Os @@ -375,7 +375,7 @@ .Fn memstat_strerror . Possible error values are: .Pp -.Bl -tag -width "MEMSTAT_ERROR_TOOMANYCPUS" -compact -offset wee +.Bl -tag -width "MEMSTAT_ERROR_KVM_SHORTREAD" -compact -offset wee .It Dv MEMSTAT_ERROR_UNDEFINED Undefined error. Occurs if .Fn memstat_mtl_geterror @@ -407,6 +407,24 @@ .Nm is unable to interpret statistics data returned by the data source, even though there does not appear to be a version problem. +.It Dv MEMSTAT_ERROR_KVM +Returned if +.Nm +experiences an error while using +.Xr kvm 3 +interfaces to query statistics data. +Use +.Xr kvm_geterr 3 +to retrieve the error. +.It Dv MEMSTAT_ERROR_KVM_NOSYMBOL +Returned if +.Nm +is unable to read a required symbol from the kernel being operated on. +.It Dv MEMSTAT_ERROR_KVM_SHORTREAD +Returned if +.Nm +attempts to read data from a live memory image or kernel core dump and +insufficient data is returned. .El .Pp Finally, functions returning data from a @@ -453,7 +471,7 @@ .Sh BUGS There are memory allocators in the kernel, such as the VM page allocator and sf_buf allocator, which are not currently supported by -.Nm. +.Nm .Pp Once a memory type is present on a memory type list, it will not be removed even if the kernel no longer presents information on the type via its ==== //depot/projects/wifi/share/man/man4/nge.4#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/nge.4,v 1.17 2005/07/21 05:02:38 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/nge.4,v 1.18 2005/08/09 13:25:34 brueffer Exp $ .\" .Dd July 16, 2005 .Dt NGE 4 @@ -164,23 +164,23 @@ .Pp .Bl -bullet -compact .It -SMC EZ Card 1000 (SMC9462TX) +Addtron AEG320T .It -D-Link DGE-500T +Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI) .It Asante FriendlyNet GigaNIX 1000TA and 1000TPC .It -Addtron AEG320T +D-Link DGE-500T .It LinkSys EG1032 (32-bit PCI) and EG1064 (64-bit PCI) .It -Surecom Technology EP-320G-TX +Netgear GA621 .It Netgear GA622T .It -Netgear GA621 +SMC EZ Card 1000 (SMC9462TX) .It -Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI) +Surecom Technology EP-320G-TX .It Trendware TEG-PCITX (32-bit PCI) and TEG-PCITX2 (64-bit PCI) .El ==== //depot/projects/wifi/share/man/man4/nve.4#5 (text+ko) ==== @@ -24,9 +24,9 @@ .\" .\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $ .\" -.\" $FreeBSD: src/share/man/man4/nve.4,v 1.4 2005/07/21 05:02:38 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/nve.4,v 1.5 2005/08/09 13:32:45 brueffer Exp $ .\" -.Dd July 16, 2005 +.Dd August 9, 2005 .Dt NVE 4 .Os .Sh NAME @@ -97,6 +97,10 @@ nForce .It nForce2 +.It +nForce3 +.It +nForce4 .El .Sh DIAGNOSTICS .Bl -diag ==== //depot/projects/wifi/share/man/man4/pcvt.4#4 (text+ko) ==== @@ -32,7 +32,7 @@ .\" .\" Last Edit-Date: [Sun Mar 26 14:39:08 2000] .\" -.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.45 2005/02/13 23:45:49 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pcvt.4,v 1.46 2005/08/09 14:11:57 murray Exp $ .\" .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93 .\" by Joerg Wunsch @@ -142,11 +142,11 @@ operating system. It has been designed to be highly configurable in order to satisfy everyone's needs. -The preferred way for those configurations is to +The preferred configuration method is to provide appropriate -.Em options -lines within the config file, possibly overriding the built-in default -values. +.Em option +lines within the kernel configuration file, +possibly overriding the built-in defaults. .Pp The following list gives a short overview of the available configuration options. @@ -154,13 +154,9 @@ .Pa i386/isa/pcvt/pcvt_conf.h in the kernel source tree for detailed documentation. .Pp -Note: the following conventions apply to all the Boolean options. -If an option is given with no value, a value of 1 -(activated) -is substituted. -If an option value is given as 0, this options is -deactivated. -Any other value is substituted by 1, too. +Note: The following conventions apply to all Boolean options. +If an option value is given as 0, the option is deactivated. +With any other value, or no value, the option is activated. If an option is omitted, a built-in default is assumed. .Bl -tag -width indent @@ -648,7 +644,7 @@ .Pp Depending on the configuration of a .Nm -driver, their might be a simple screen saver available. +driver, there might be a simple screen saver available. It is controlled by the command .Pp @@ -658,7 +654,7 @@ .El .Pp taking a pointer to an integer as argument. -Despite of its command name, +Despite its command name, this is available on .Em any kind of adaptor if configured in by the ==== //depot/projects/wifi/share/man/man5/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/man/man5/Makefile,v 1.59 2005/08/06 06:57:25 phk Exp $ +# $FreeBSD: src/share/man/man5/Makefile,v 1.60 2005/08/08 20:10:05 cperciva Exp $ #MISSING: dump.5 plot.5 MAN= acct.5 \ @@ -40,6 +40,7 @@ nsswitch.conf.5 \ passwd.5 \ pbm.5 \ + portsnap.conf.5 \ periodic.conf.5 \ phones.5 \ procfs.5 \ ==== //depot/projects/wifi/share/man/man9/bios.9#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man9/bios.9,v 1.14 2005/07/21 09:48:36 phk Exp $ +.\" $FreeBSD: src/share/man/man9/bios.9,v 1.15 2005/08/09 13:55:21 murray Exp $ .\" .\" Copyright (c) 1997 Michael Smith .\" All rights reserved. @@ -127,7 +127,7 @@ Returns the effective physical address which corresponds to the kernel virtual address .Fa addr . -.It Fn BIOS_VADDRTOPADDR +.It Fn BIOS_PADDRTOVADDR Returns the kernel virtual address which corresponds to the effective physical address .Fa addr . ==== //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/bus_alloc_resource.9,v 1.21 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/bus_alloc_resource.9,v 1.22 2005/08/09 11:55:18 brian Exp $ .\" .Dd May 18, 2000 .Dt BUS_ALLOC_RESOURCE 9 @@ -159,7 +159,7 @@ .Va irqid should be saved in the softc of the device after these calls. .Bd -literal - struct resource *portres, irqres; + struct resource *portres, *irqres; int portid, irqid; portid = 0; ==== //depot/projects/wifi/share/man/man9/device_add_child.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.19 2004/07/03 18:29:23 ru Exp $ +.\" $FreeBSD: src/share/man/man9/device_add_child.9,v 1.21 2005/08/09 11:14:21 brian Exp $ .\" .Dd May 13, 2004 .Dt DEVICE_ADD_CHILD 9 @@ -67,8 +67,8 @@ as PCI) to allow each driver to check each device instance for a match. For busses which rely on supplied probe hints where only one -driver can have a change of probing the device, the driver name should -specified as the device name. +driver can have a chance of probing the device, the driver name should +be specified as the device name. .Pp Normally unit numbers will be chosen automatically by the system and a unit number of @@ -96,8 +96,10 @@ .Pp When adding a device in the context of .Xr DEVICE_IDENTIFY 9 -routine, some care must be taken to ensure that the device has not -already been added to the tree. +routine, the +.Xr device_find_children 9 +routine should be used to ensure that the device has not already been +added to the tree. Because the device name and .Vt devclass_t are associated at probe time (not child addition time), previous @@ -109,7 +111,9 @@ .Sh RETURN VALUES The new device if successful, NULL otherwise. .Sh SEE ALSO +.Xr DEVICE_IDENTIFY 9 .Xr device 9 +.Xr device_find_children 9 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 10 22:46:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC8E916A422; Wed, 10 Aug 2005 22:46:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A65CC16A421 for ; Wed, 10 Aug 2005 22:46:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 117B643DE2 for ; Wed, 10 Aug 2005 22:38:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AMc1bp070598 for ; Wed, 10 Aug 2005 22:38:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AMc1rt070595 for perforce@freebsd.org; Wed, 10 Aug 2005 22:38:01 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Aug 2005 22:38:01 GMT Message-Id: <200508102238.j7AMc1rt070595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 22:46:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=81809 Change 81809 by sam@sam_ebb on 2005/08/10 22:37:39 Bandaid deadlock: on tx timeout we're in the callout callback when we clock the state machine, but this results in a call to callout_drain which blocks because the callout is active. Workaround for now is to use callout_stop which won't block but this potentially leaves us open to a race. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#36 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#36 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.22 2005/07/22 21:11:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.23 2005/08/10 16:22:29 sam Exp $"); /* * IEEE 802.11 protocol support. @@ -949,7 +949,7 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_STATE, "%s: %s -> %s\n", __func__, ieee80211_state_name[ostate], ieee80211_state_name[nstate]); ic->ic_state = nstate; /* state transition */ - callout_drain(&ic->ic_mgtsend); + callout_stop(&ic->ic_mgtsend); /* XXX callout_drain */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(ic); /* background scan */ ni = ic->ic_bss; /* NB: no reference held */ From owner-p4-projects@FreeBSD.ORG Wed Aug 10 22:47:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3136016A42B; Wed, 10 Aug 2005 22:46:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0104816A444 for ; Wed, 10 Aug 2005 22:46:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FAE44402B for ; Wed, 10 Aug 2005 22:41:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AMf6Wd070760 for ; Wed, 10 Aug 2005 22:41:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7AMf56l070757 for perforce@freebsd.org; Wed, 10 Aug 2005 22:41:05 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Aug 2005 22:41:05 GMT Message-Id: <200508102241.j7AMf56l070757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 22:47:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=81810 Change 81810 by sam@sam_ebb on 2005/08/10 22:40:35 o clear m_nextpkt in ath_tx_start to be safe o add comments about how frags are handled Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#101 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#101 (text+ko) ==== @@ -1595,6 +1595,18 @@ } nextfrag: + /* + * Pass the frame to the h/w for transmission. + * Fragmented frames have each frag chained together + * with m_nextpkt. We know there are sufficient ath_buf's + * to send all the frags because of work done by + * ath_txfrag_setup. We leave m_nextpkt set while + * calling ath_tx_start so it can use it to extend the + * the tx duration to cover the subsequent frag and + * so it can reclaim all the mbufs in case of an error; + * ath_tx_start clears m_nextpkt once it commits to + * handing the frame to the hardware. + */ next = m->m_nextpkt; if (ath_tx_start(sc, ni, bf, m)) { bad: @@ -3598,6 +3610,10 @@ return 0; /* NB: lowest rate */ } +/* + * Reclaim mbuf resources. For fragmented frames we + * need to claim each frag chained with m_nextpkt. + */ static void ath_freetx(struct mbuf *m) { @@ -3990,6 +4006,13 @@ } else ctsrate = 0; + /* + * At this point we are committed to sending the frame + * and we don't need to look at m_nextpkt; clear it in + * case this frame is part of frag chain. + */ + m0->m_nextpkt = NULL; + if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, sc->sc_hwmap[txrate].ieeerate, -1); From owner-p4-projects@FreeBSD.ORG Wed Aug 10 23:19:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 125FD16A421; Wed, 10 Aug 2005 23:19:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAB4216A41F for ; Wed, 10 Aug 2005 23:19:53 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 922E943D46 for ; Wed, 10 Aug 2005 23:19:53 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7ANJrd1071994 for ; Wed, 10 Aug 2005 23:19:53 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7ANJrKr071991 for perforce@freebsd.org; Wed, 10 Aug 2005 23:19:53 GMT (envelope-from soc-tyler@freebsd.org) Date: Wed, 10 Aug 2005 23:19:53 GMT Message-Id: <200508102319.j7ANJrKr071991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 23:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=81811 Change 81811 by soc-tyler@soc-tyler_launchd on 2005/08/10 23:19:32 minor fix, still stuck on this painful bug where a kevent() call is timing out in main() :'( Affected files ... .. //depot/projects/soc2005/launchd/Makefile#12 edit Differences ... ==== //depot/projects/soc2005/launchd/Makefile#12 (text+ko) ==== @@ -4,7 +4,7 @@ PROG= launchd SRCS= launchd.c liblaunch.c init.c #launchdebugd.c launchproxy.c -MAN= launchd.conf.5 init.8 launchd.8 launchd_debugd.8 \ +MAN= init.8 launchd.8 launchd_debugd.8 \ launchproxy.8 service.8 BINMODE=500 From owner-p4-projects@FreeBSD.ORG Thu Aug 11 07:37:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4B2C16A421; Thu, 11 Aug 2005 07:37:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83B3016A41F for ; Thu, 11 Aug 2005 07:37:03 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FC4A43D45 for ; Thu, 11 Aug 2005 07:37:03 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7B7b3T1025497 for ; Thu, 11 Aug 2005 07:37:03 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7B7b2pE025494 for perforce@freebsd.org; Thu, 11 Aug 2005 07:37:02 GMT (envelope-from jmallett@freebsd.org) Date: Thu, 11 Aug 2005 07:37:02 GMT Message-Id: <200508110737.j7B7b2pE025494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Cc: Subject: PERFORCE change 81824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Aug 2005 07:37:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=81824 Change 81824 by jmallett@jmallett_beach on 2005/08/11 07:36:01 Random thought, keep k0 and k1 from being trashed by exception nonserialization, but I can't remember if that can actually happen. Affected files ... .. //depot/projects/mips/sys/mips/mips/exception.S#31 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/exception.S#31 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2004 Juli Mallett + * Copyright (c) 2003-2005 Juli Mallett * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips/sys/mips/mips/exception.S#30 $ + * $P4: //depot/projects/mips/sys/mips/mips/exception.S#31 $ */ #include "opt_ddb.h" @@ -92,6 +92,13 @@ */ LEAF(ExceptionVector) .set noat + /* + * Save k0 and k1. + */ + dsubu sp, sp, 16 + sd k0, 0(sp) + sd k1, 8(sp) + mfc0 k0, MIPS_COP_0_CAUSE and k0, MIPS_CR_EXC_CODE dsrl k0, MIPS_CR_EXC_CODE_SHIFT @@ -168,6 +175,14 @@ jal exception_restore_registers nop daddu sp, sp, TF_SIZE + + /* + * Also need to restore k0 and k1. + */ + ld k0, 0(sp) + ld k1, 8(sp) + daddu sp, sp, 16 + eret .set at END(GenericException) @@ -236,9 +251,23 @@ bltz k0, 1f nop + /* + * Also need to restore k0 and k1. + */ + ld k0, 0(sp) + ld k1, 8(sp) + daddu sp, sp, 16 + tlbwi eret 1: + /* + * Also need to restore k0 and k1. + */ + ld k0, 0(sp) + ld k1, 8(sp) + daddu sp, sp, 16 + tlbwr eret .set at @@ -254,6 +283,14 @@ dsll k0, 4 cache (CACHE_R4K_SD | CACHEOP_R4K_HIT_WB_INV), 0(k0) cache (CACHE_R4K_D | CACHEOP_R4K_HIT_INV), 0(k0) + + /* + * Also need to restore k0 and k1. + */ + ld k0, 0(sp) + ld k1, 8(sp) + daddu sp, sp, 16 + eret .set at END(VCED) From owner-p4-projects@FreeBSD.ORG Thu Aug 11 15:35:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D91C816A424; Thu, 11 Aug 2005 15:35:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FE1816A41F; Thu, 11 Aug 2005 15:35:56 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from mv.twc.weather.com (mv.twc.weather.com [65.212.71.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1149E43D45; Thu, 11 Aug 2005 15:35:55 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from [10.50.40.201] (Not Verified[65.202.103.25]) by mv.twc.weather.com with NetIQ MailMarshal (v6, 0, 3, 8) id ; Thu, 11 Aug 2005 11:50:46 -0400 From: John Baldwin To: Sam Leffler Date: Thu, 11 Aug 2005 10:59:24 -0400 User-Agent: KMail/1.8 References: <200508102238.j7AMc1rt070595@repoman.freebsd.org> In-Reply-To: <200508102238.j7AMc1rt070595@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200508111059.25135.jhb@FreeBSD.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 81809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Aug 2005 15:35:57 -0000 On Wednesday 10 August 2005 06:38 pm, Sam Leffler wrote: > http://perforce.freebsd.org/chv.cgi?CH=81809 > > Change 81809 by sam@sam_ebb on 2005/08/10 22:37:39 > > Bandaid deadlock: on tx timeout we're in the callout callback > when we clock the state machine, but this results in a call > to callout_drain which blocks because the callout is active. > Workaround for now is to use callout_stop which won't block > but this potentially leaves us open to a race. If you use callout_init_mtx() instead then I think it closes the race for you as softclock will block on your mutex before trying to run the callout and it will not run it if you cancel the callout before you drop your lock. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Aug 12 19:41:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1076C16A421; Fri, 12 Aug 2005 19:41:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEA1216A41F for ; Fri, 12 Aug 2005 19:41:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF37E43D46 for ; Fri, 12 Aug 2005 19:41:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7CJfICL071435 for ; Fri, 12 Aug 2005 19:41:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7CJfI6U071432 for perforce@freebsd.org; Fri, 12 Aug 2005 19:41:18 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Aug 2005 19:41:18 GMT Message-Id: <200508121941.j7CJfI6U071432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Aug 2005 19:41:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=81909 Change 81909 by jhb@jhb_slimer on 2005/08/12 19:40:48 Hmm, maybe I killed them by accident or maybe they weren't there to begin with, but add in aliases for operations on 64-bit integers to the amd64 atomic.h. Affected files ... .. //depot/projects/smpng/sys/amd64/include/atomic.h#24 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/atomic.h#24 (text+ko) ==== @@ -371,6 +371,26 @@ #define atomic_cmpset_rel_32 atomic_cmpset_rel_int #define atomic_readandclear_32 atomic_readandclear_int +/* Operations on 64-bit quad words. */ +#define atomic_set_64 atomic_set_long +#define atomic_set_acq_64 atomic_set_acq_long +#define atomic_set_rel_64 atomic_set_rel_long +#define atomic_clear_64 atomic_clear_long +#define atomic_clear_acq_64 atomic_clear_acq_long +#define atomic_clear_rel_64 atomic_clear_rel_long +#define atomic_add_64 atomic_add_long +#define atomic_add_acq_64 atomic_add_acq_long +#define atomic_add_rel_64 atomic_add_rel_long +#define atomic_subtract_64 atomic_subtract_long +#define atomic_subtract_acq_64 atomic_subtract_acq_long +#define atomic_subtract_rel_64 atomic_subtract_rel_long +#define atomic_load_acq_64 atomic_load_acq_long +#define atomic_store_rel_64 atomic_store_rel_long +#define atomic_cmpset_64 atomic_cmpset_long +#define atomic_cmpset_acq_64 atomic_cmpset_acq_long +#define atomic_cmpset_rel_64 atomic_cmpset_rel_long +#define atomic_readandclear_64 atomic_readandclear_long + /* Operations on pointers. */ #define atomic_set_ptr atomic_set_long #define atomic_set_acq_ptr atomic_set_acq_long From owner-p4-projects@FreeBSD.ORG Fri Aug 12 21:55:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8422616A422; Fri, 12 Aug 2005 21:55:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5238B16A421 for ; Fri, 12 Aug 2005 21:55:15 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8962643D49 for ; Fri, 12 Aug 2005 21:55:02 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7CLt2MX084238 for ; Fri, 12 Aug 2005 21:55:02 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7CLt20w084235 for perforce@freebsd.org; Fri, 12 Aug 2005 21:55:02 GMT (envelope-from soc-victor@freebsd.org) Date: Fri, 12 Aug 2005 21:55:02 GMT Message-Id: <200508122155.j7CLt20w084235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 81915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Aug 2005 21:55:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=81915 Change 81915 by soc-victor@soc-victor_82.76.158.176 on 2005/08/12 21:54:35 Added the first version of the SNMP instrumentation for the hrNetworkTable. Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#18 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#6 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 add .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#16 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#20 edit Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -34,6 +34,9 @@ #include "mibII_oid.h" #include +/*just a prototype below*/ +u_int +mib2_getIfIndex(const char* dev_name); /*****************************/ @@ -1564,3 +1567,19 @@ ifp->xnotify_data = NULL; ifp->xnotify_mod = NULL; } + + +/* + * Get the MIB II ifIndex for the device with + * the name passed as argument (ie "rl0") + */ +u_int +mib2_getIfIndex(const char* dev_name){ + struct mibindexmap *map; + + STAILQ_FOREACH(map, &mibindexmap_list, link) + if (strcmp(map->name, dev_name) == 0) { + return map->ifindex; + } + return 0; +} ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#18 (text+ko) ==== @@ -35,7 +35,8 @@ hostres_device_tbl.c \ hostres_processor_tbl.c \ hostres_diskstorage_tbl.c \ - hostres_partition_tbl.c + hostres_partition_tbl.c \ + hostres_network_tbl.c WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#6 (text+ko) ==== @@ -68,6 +68,9 @@ void handleDiskStorage(int32_t ds_index, const char* disk_dev_name); +struct hrDeviceTblEntry* +hrDeviceTblEntry_find_by_name(const char *dev_name); + static struct hrDiskStorageTblEntry* hrDiskStorageEntry_create( const struct hrDeviceTblEntry* devEntry) { @@ -195,7 +198,7 @@ } -static + struct hrDeviceTblEntry* hrDeviceTblEntry_find_by_name(const char *dev_name) { struct deviceNameMapEntry *map; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#16 (text+ko) ==== @@ -199,6 +199,10 @@ STAILQ_INIT(&hrState_g.partition_name_map); TAILQ_INIT(&hrState_g.hr_partition_tbl); + + /*data structures initialization for hrNetworkTable*/ + TAILQ_INIT(&hrState_g.hr_network_tbl); + hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; @@ -207,6 +211,7 @@ hrState_g.hr_processor_tick = 0; hrState_g.hr_disk_storage_tick = 0; hrState_g.hr_partition_tick = 0; + hrState_g.hr_network_tick = 0; hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; @@ -214,6 +219,7 @@ hrState_g.hrDevice_tbl_age = 0; hrState_g.hrDiskStorage_age = 0; hrState_g.hrPartition_tbl_age = 0; + hrState_g.hrNetwork_tbl_age = 0; init_hrStorage_tbl_v(); init_hrFS_tbl_v(); @@ -224,6 +230,7 @@ init_hrDiskStorage_tbl_v(); init_hrPartition_tbl_v(); + init_hrNetwork_tbl_v(); if ((hrState_g.devd_sock = create_devd_socket()) < 0) { HR_DPRINTF((stderr, "Failed to create the socket to devd pipe.\n")); @@ -243,6 +250,8 @@ static int hostres_fini(void) { + /* here I free the resources used by this module*/ + if (hrState_g.cpus_load_timer != NULL) { timer_stop(hrState_g.cpus_load_timer); hrState_g.cpus_load_timer = NULL; @@ -257,7 +266,7 @@ close(hrState_g.devd_sock); } - /* here I free the resources used by this module*/ + if( hrState_g.utmp_fp != (FILE*)NULL ) { if( fclose(hrState_g.utmp_fp) != 0 ) { syslog(LOG_ERR, "fclose failed: %m "); @@ -291,6 +300,7 @@ fini_DiskStorage_tbl_v(); fini_hrDevice_tbl_v(); fini_hrPartition_tbl_v(); + fini_hrNetwork_tbl_v(); hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; @@ -299,6 +309,7 @@ hrState_g.hr_processor_tick = 0; hrState_g.hr_disk_storage_tick = 0; hrState_g.hr_partition_tick = 0; + hrState_g.hr_network_tick = 0; hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; @@ -306,7 +317,8 @@ hrState_g.hrDevice_tbl_age = 0; hrState_g.hrDiskStorage_age = 0; hrState_g.hrPartition_tbl_age = 0; - + hrState_g.hrNetwork_tbl_age = 0; + hrState_g.dev_root = NULL; hrState_g.hrSWOSIndex = 0; @@ -454,16 +466,6 @@ -int op_hrNetworkTable(struct snmp_context *ctx __unused, - struct snmp_value *value __unused, - u_int sub __unused, - u_int iidx __unused, - enum snmp_op curr_op __unused) -{ - return (SNMP_ERR_NOSUCHNAME); -} - - int op_hrPrinterTable(struct snmp_context *ctx __unused, struct snmp_value *value __unused, u_int sub __unused, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#20 (text+ko) ==== @@ -303,6 +303,17 @@ }; +struct hrNetworkTblEntry { + int32_t index; + int32_t ifIndex; + TAILQ_ENTRY(hrNetworkTblEntry) link; +#define HR_NETWORK_FOUND 0x001 + uint32_t flags; + +}; +TAILQ_HEAD(network_tbl, hrNetworkTblEntry); + + /* * This structure is used to hold a SNMP table entry * for HOST-RESOURCES-MIB's hrDeviceTable @@ -454,7 +465,17 @@ partition_tbl hr_partition_tbl; /*the head of the list with hrPatitionTable's entries */ uint32_t next_hrPartition_index; /*next int available for indexing the hrPartitionTable*/ time_t hrPartition_tbl_age; - uint64_t hr_partition_tick; /*last (agent) tick when hrDeviceTable was updated */ + uint64_t hr_partition_tick; /*last (agent) tick when hrDeviceTable was updated */ + + /* + * next items are used for hrNetworksTable + */ + + struct + network_tbl hr_network_tbl; /*the head of the list with hrNetworkTable's entries */ + time_t hrNetwork_tbl_age; + uint64_t hr_network_tick; /*last (agent) tick when hrDeviceTable was updated */ + }; @@ -664,5 +685,21 @@ */ void fini_hrPartition_tbl_v(void); + +/* + * Init the things for hrNetworkTable + */ +void init_hrNetwork_tbl_v(void); + +/* + * Finalization routine for hrNetworkTable + * It destroys the lists and frees any allocated heap memory + */ +void fini_hrNetwork_tbl_v(void); + +#define HR_NETWORK_TBL_REFRESH 7 + +void refresh_Network_tbl_v(void); + #endif /*__HOSTRES_SNMP_H_INCLUDED__ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 13 02:14:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 044F716A421; Sat, 13 Aug 2005 02:14:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B8BB16A41F for ; Sat, 13 Aug 2005 02:14:16 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 424E443D49 for ; Sat, 13 Aug 2005 02:14:16 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7D2EGVn001918 for ; Sat, 13 Aug 2005 02:14:16 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7D2EGNM001915 for perforce@freebsd.org; Sat, 13 Aug 2005 02:14:16 GMT (envelope-from soc-cjones@freebsd.org) Date: Sat, 13 Aug 2005 02:14:16 GMT Message-Id: <200508130214.j7D2EGNM001915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 02:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=81921 Change 81921 by soc-cjones@soc-cjones_ishtar on 2005/08/13 02:13:42 Add debugging calls for object creation, to try to figure out what's breaking the saves. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ struct g_geom *gp; struct gv_softc *sc; int error; - + g_topology_assert(); KASSERT(cp != NULL, ("gv_orphan: null cp")); @@ -156,7 +156,6 @@ gp = LIST_FIRST(&mp->geom); sc = gp->softc; } - /* We need a temporary consumer to read the config from. */ cp = g_new_consumer(gp); @@ -274,6 +273,8 @@ g_topology_assert(); + printf("gv_create: started\n"); + sc = gp->softc; /* Find out how many of each object have been passed in. */ @@ -282,6 +283,8 @@ subdisks = gctl_get_paraml(req, "subdisks", sizeof(*subdisks)); drives = gctl_get_paraml(req, "drives", sizeof(*drives)); + printf("gv_create: %d volumes, %d plexes, %d subdisks, %d drives\n", *volumes, *plexes, *subdisks, *volumes); + /* First, handle drive definitions ... */ for (i = 0; i < *drives; i++) { snprintf(buf, sizeof(buf), "drive%d", i); @@ -383,9 +386,13 @@ s = g_malloc(sizeof(*s), M_WAITOK | M_ZERO); bcopy(s2, s, sizeof(*s)); + printf("gv_create: at bcopy subdisk '%s', size %d\n", s->name, (int) s->size); + /* Find the drive where this subdisk should be put on. */ d = gv_find_drive(sc, s->drive); + printf("gv_create: after gv_find_drive subdisk '%s', size %ld, drive '%s' avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail); + /* drive not found - XXX */ if (d == NULL) { printf("FOO: drive '%s' not found\n", s->drive); @@ -396,6 +403,8 @@ /* Find the plex where this subdisk belongs to. */ p = gv_find_plex(sc, s->plex); + printf("gv_create: after gv_find_plex subdisk '%s', size %ld, drive '%s' avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail); + /* plex not found - XXX */ if (p == NULL) { printf("FOO: plex '%s' not found\n", s->plex); @@ -414,6 +423,8 @@ continue; } + printf("gv_create: after gv_sd_to_drive subdisk '%s', size %ld, drive '%s', avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail); + /* * Then, we give the subdisk to the plex; we check if the * given values are correct and maybe adjust them. @@ -425,12 +436,16 @@ } s->flags |= GV_SD_NEWBORN; + printf("gv_create: after gv_sd_to_plex subdisk '%s', size %lld, drive '%s', avail %lld\n", s->name, (long long) s->size, d->name, (long long) d->avail); + s->vinumconf = sc; LIST_INSERT_HEAD(&sc->subdisks, s, sd); } - LIST_FOREACH(s, &sc->subdisks, sd) + LIST_FOREACH(s, &sc->subdisks, sd) { gv_update_sd_state(s); + printf("gv_create: LIST_FOREACH subdisk '%s', size %ld, drive '%s', avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail); + } LIST_FOREACH(p, &sc->plexes, plex) gv_update_plex_config(p); LIST_FOREACH(v, &sc->volumes, volume) @@ -442,6 +457,7 @@ * geom. */ LIST_FOREACH(d, &sc->drives, drive) { + printf("LIST_FOREACH: drive '%s'\n", d->name); if (d->geom == NULL) { /* * XXX if the provider disapears before we get a chance @@ -455,7 +471,9 @@ continue; } cp = g_new_consumer(gp); + printf("gv_create: calling g_attach\n"); g_attach(cp, pp); + printf("gv_create: calling gv_save_config\n"); gv_save_config(cp, d, sc); g_detach(cp); g_destroy_consumer(cp); From owner-p4-projects@FreeBSD.ORG Sat Aug 13 07:55:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE21016A421; Sat, 13 Aug 2005 07:55:10 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88C2416A41F for ; Sat, 13 Aug 2005 07:55:10 +0000 (GMT) (envelope-from samy@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C66743D46 for ; Sat, 13 Aug 2005 07:55:10 +0000 (GMT) (envelope-from samy@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7D7t9gU021023 for ; Sat, 13 Aug 2005 07:55:09 GMT (envelope-from samy@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7D7t9bB021020 for perforce@freebsd.org; Sat, 13 Aug 2005 07:55:09 GMT (envelope-from samy@FreeBSD.org) Date: Sat, 13 Aug 2005 07:55:09 GMT Message-Id: <200508130755.j7D7t9bB021020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to samy@FreeBSD.org using -f From: Samy Al Bahra To: Perforce Change Reviews Cc: Subject: PERFORCE change 81927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 07:55:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=81927 Change 81927 by samy@mini on 2005/08/13 07:54:27 Allow policies to define a prerequisite for the MAC version. Systems with a MAC version lower than defined by the policy will fail to load the policy. The MAC_DEPEND_VERSION macro should be changed so we don't require it after MAC_POLICY_SET. Policies that don't use MAC_POLICY_SET will load on any system as usual (thus, not breaking API). rwatson would want cleanly generated code, that's what we'll do until I convince him to go another way. Approved by: rwatson Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#449 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#237 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#449 (text+ko) ==== @@ -392,6 +392,14 @@ error = EBUSY; break; } + if (mac_version < mpc->mpc_depend_version) { + printf("mac_policy_modevent: %s policy requires " + "MAC version %d\n", mpc->mpc_name, + mpc->mpc_depend_version); + error = ENOTSUP; + break; + } + error = mac_policy_register(mpc); break; case MOD_UNLOAD: ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#237 (text+ko) ==== @@ -600,6 +600,7 @@ int mpc_loadtime_flags; /* flags */ int *mpc_field_off; /* security field */ int mpc_runtime_flags; /* flags */ + int mpc_depend_version; /* required MAC */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ }; @@ -611,6 +612,10 @@ /* Flags for the mpc_runtime_flags field. */ #define MPC_RUNTIME_FLAG_REGISTERED 0x00000001 +/* This must be defined after MAC_POLICY_SET. */ +#define MAC_DEPEND_VERSION(mpname, version) \ + mpname##_mac_policy_conf.mpc_depend_version = version; + #define MAC_POLICY_SET(mpops, mpname, mpfullname, mpflags, privdata_wanted) \ static struct mac_policy_conf mpname##_mac_policy_conf = { \ #mpname, \ @@ -619,6 +624,7 @@ mpflags, \ privdata_wanted, \ 0, \ + 0, \ }; \ static moduledata_t mpname##_mod = { \ #mpname, \ From owner-p4-projects@FreeBSD.ORG Sat Aug 13 08:42:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66E9916A421; Sat, 13 Aug 2005 08:42:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22E5D16A41F for ; Sat, 13 Aug 2005 08:42:33 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC6D743D45 for ; Sat, 13 Aug 2005 08:42:32 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7D8gWdd023410 for ; Sat, 13 Aug 2005 08:42:32 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7D8gWXD023404 for perforce@freebsd.org; Sat, 13 Aug 2005 08:42:32 GMT (envelope-from soc-cjones@freebsd.org) Date: Sat, 13 Aug 2005 08:42:32 GMT Message-Id: <200508130842.j7D8gWXD023404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 08:42:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=81928 Change 81928 by soc-cjones@soc-cjones_ishtar on 2005/08/13 08:41:36 Add debugging. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_subr.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_subr.c#2 (text+ko) ==== @@ -431,6 +431,8 @@ g_topology_assert(); + printf("gv_sd_to_drive: begins, sd '%s' size %lld drive '%s' avail %lld\n", s->name, (long long) s->size, d->name, (long long) d->avail); + fl2 = NULL; KASSERT(sc != NULL, ("gv_sd_to_drive: NULL softc")); @@ -440,10 +442,14 @@ KASSERT(errlen >= ERRBUFSIZ, ("gv_sd_to_drive: short errlen (%d)", errlen)); + printf("gv_sd_to_drive: checking drive_sc\n"); + /* Check if this subdisk was already given to this drive. */ if (s->drive_sc == d) return (0); + printf("gv_sd_to_drive: passed drive_sc check\n"); + /* Preliminary checks. */ if (s->size > d->avail || d->freelist_entries == 0) { snprintf(errstr, errlen, "not enough space on '%s' for '%s'", @@ -451,16 +457,26 @@ return (-1); } + printf("gv_sd_to_drive: passed available size and freelist checks\n"); + /* No size given, autosize it. */ if (s->size == -1) { + printf("gv_sd_to_drive: autosizing "); /* Find the largest available slot. */ LIST_FOREACH(fl, &d->freelist, freelist) { + printf(". "); if (fl->size >= s->size) { s->size = fl->size; s->drive_offset = fl->offset; fl2 = fl; + printf("done\n"); + } else { + printf("failed\n"); } + printf("gv_sd_to_drive: autosizing sd '%s' (size: %lld, drive_offset: %lld)\n", s->name, (long long) s->size, (long long) s->drive_offset); } + + printf("gv_sd_to_drive: finished LIST_FOREACH(fl) for '%s' size %lld, drive '%s' avail %lld, largest free slot size %lld\n", s->name, (long long) s->size, d->name, (long long) d->avail, (long long) fl->size); /* No good slot found? */ if (s->size == -1) { @@ -484,6 +500,7 @@ fl2 = fl; break; } + printf("gv_sd_to_drive: fit sd '%s' (size: %lld, drive_offset: %lld)\n", s->name, (long long) s->size, (long long) s->drive_offset); } /* Couldn't find a good free slot. */ @@ -541,7 +558,7 @@ /* This is the free slot that we have found before. */ if (fl == fl2) { - + /* * The subdisk starts at the beginning of the free * slot. @@ -571,6 +588,7 @@ * the free slot, so we need to split it. */ if (s->drive_offset + s->size != tmp) { + fl2 = g_malloc(sizeof(*fl2), M_WAITOK | M_ZERO); fl2->offset = s->drive_offset + s->size; @@ -603,12 +621,16 @@ } } + printf("gv_sd_to_drive: before committing sd '%s' size %lld, drive '%s' avail %lld\n", s->name, (long long) s->size, d->name, (long long) d->avail); + d->sdcount++; d->avail -= s->size; /* Link back from the subdisk to this drive. */ s->drive_sc = d; + printf("gv_sd_to_drive: after committing sd '%s' size %lld, drive '%s' avail %lld\n", s->name, (long long) s->size, d->name, (long long) d->avail); + return (0); } From owner-p4-projects@FreeBSD.ORG Sat Aug 13 11:34:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0761C16A421; Sat, 13 Aug 2005 11:34:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBE8516A41F for ; Sat, 13 Aug 2005 11:34:03 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A1AA43D46 for ; Sat, 13 Aug 2005 11:34:03 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7DBY3Q2036944 for ; Sat, 13 Aug 2005 11:34:03 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7DBY3XK036941 for perforce@freebsd.org; Sat, 13 Aug 2005 11:34:03 GMT (envelope-from soc-victor@freebsd.org) Date: Sat, 13 Aug 2005 11:34:03 GMT Message-Id: <200508131134.j7DBY3XK036941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 81934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 11:34:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=81934 Change 81934 by soc-victor@soc-victor_82.76.158.176 on 2005/08/13 11:33:32 Various minor fixes and a small optimization for hrNetworkTable. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#8 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#7 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#4 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#17 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#21 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#8 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#6 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#8 (text+ko) ==== @@ -329,7 +329,7 @@ hrDevice_OS_get_devices_v(); /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_device_tbl); while (entry != NULL) { @@ -434,7 +434,7 @@ /* * This is the implementation for a generated (by a SNMP tool) * function prototype, see hostres_tree.h - * It hanldes the SNMP operations for hrDeviceTable + * It handles the SNMP operations for hrDeviceTable */ int op_hrDeviceTable(struct snmp_context *ctx __unused, struct snmp_value *value, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#7 (text+ko) ==== @@ -741,7 +741,7 @@ hrDiskStorage_OS_get_disks_v(); /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_disk_storage_tbl); while (entry != NULL) { @@ -767,6 +767,11 @@ } +/* + * This is the implementation for a generated (by our SNMP "compiler" tool) + * function prototype, see hostres_tree.h + * It handles the SNMP operations for hrDiskStorageTable + */ int op_hrDiskStorageTable(struct snmp_context *ctx __unused, struct snmp_value *value, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#4 (text+ko) ==== @@ -181,7 +181,7 @@ struct hrFSTblEntry *entry = NULL, *entry_tmp = NULL; /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_fs_tbl); while (entry != NULL) { @@ -381,6 +381,14 @@ return; } + +/* + * This is the implementation for a generated (by our SNMP "compiler" tool) + * function prototype, see hostres_tree.h + * It handles the SNMP operations for hrFSTable + */ + + int op_hrFSTable(struct snmp_context *ctx __unused, struct snmp_value *value , u_int sub , ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 (text+ko) ==== @@ -242,10 +242,9 @@ static void hrNetwork_get_OS_entries(void){ - +/*maximum number of interfaces we can get*/ +#define INTERFACE_MAX 64 -#define INTERFACE_MAX 64 - int s = -1; struct ifconf ifc; struct ifreq * ifptr; @@ -261,17 +260,19 @@ memset(&ifrv[0], 0, ifc.ifc_len); - s = socket(AF_INET, SOCK_DGRAM, 0); + if (hrState_g.ifnet_sock <= 0 ) { + hrState_g.ifnet_sock = socket(AF_INET, SOCK_DGRAM, 0); + } - if (s < 0) { + if (hrState_g.ifnet_sock < 0) { syslog(LOG_ERR,"socket(AF_INET, SOCK_DGRAM, 0) failed: %m"); return; } - if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) { + if (ioctl(hrState_g.ifnet_sock, SIOCGIFCONF, (char *) &ifc) < 0) { syslog(LOG_ERR,"failed to SIOCGIFCONF: %m"); - close(s); + close(hrState_g.ifnet_sock); return; } @@ -279,10 +280,7 @@ for (ifptr = ifrv; (char *)ifptr < (char *)ifrv + ifc.ifc_len; - ifptr = (struct ifreq *)((char *)&(ifptr->ifr_addr) + ifptr->ifr_addr.sa_len)){ - - - + ifptr = (struct ifreq *)((char *)&(ifptr->ifr_addr) + ifptr->ifr_addr.sa_len)) { if (ifptr->ifr_name == NULL || ifptr->ifr_name[0] == 0) { continue; @@ -293,11 +291,6 @@ continue; } - HR_DPRINTF((stderr, - "----- hrNetworkTable: got device %s \n", - ifptr->ifr_name )); - - /* Eliminate network devices that don't make sense */ if (strncmp(ifptr->ifr_name, "lo", 2) == 0) { continue; @@ -311,7 +304,11 @@ if (strncmp(ifptr->ifr_name, "tun", 3) == 0 || strncmp(ifptr->ifr_name, "ppp", 3) == 0) { continue; } + + HR_DPRINTF((stderr, "----- hrNetworkTable: got device %s \n", + ifptr->ifr_name )); + dev_entry = hrDeviceTblEntry_find_by_name(ifptr->ifr_name); if (dev_entry == NULL) { @@ -350,8 +347,7 @@ } /*end for*/ hrState_g.hr_network_tick = this_tick; hrState_g.hrNetwork_tbl_age = time(NULL); - - + } /* @@ -398,7 +394,7 @@ hrNetwork_get_OS_entries(); /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_network_tbl); while (entry != NULL) { @@ -422,6 +418,11 @@ } +/* + * This is the implementation for a generated (by our SNMP tool) + * function prototype, see hostres_tree.h + * It handles the SNMP operations for hrNetworkTable + */ int op_hrNetworkTable(struct snmp_context *ctx __unused, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#3 (text+ko) ==== @@ -261,7 +261,7 @@ struct hrPartitionTblEntry *entry = NULL, *entry_tmp = NULL; /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_partition_tbl); while (entry != NULL) { @@ -292,6 +292,12 @@ } +/* + * This is the implementation for a generated (by our SNMP tool) + * function prototype, see hostres_tree.h + * It handles the SNMP operations for hrPartitionTable + */ + int op_hrPartitionTable(struct snmp_context *ctx __unused, struct snmp_value *value, u_int sub, u_int iidx __unused, enum snmp_op op) { ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#17 (text+ko) ==== @@ -159,6 +159,10 @@ syslog(LOG_ERR, "open %s failed: %m", mddev); } + if ((hrState_g.ifnet_sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + syslog(LOG_ERR,"socket(AF_INET, SOCK_DGRAM, 0) failed: %m"); + } + hrState_g.dev_root = NULL; hrState_g.hrSWOSIndex = 0; @@ -266,6 +270,9 @@ close(hrState_g.devd_sock); } + if (hrState_g.ifnet_sock > 0) { + close(hrState_g.ifnet_sock); + } if( hrState_g.utmp_fp != (FILE*)NULL ) { if( fclose(hrState_g.utmp_fp) != 0 ) { ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#21 (text+ko) ==== @@ -303,6 +303,11 @@ }; +/* + * This structure is used to hold a SNMP table entry + * for HOST-RESOURCES-MIB's hrNetworkTable + */ + struct hrNetworkTblEntry { int32_t index; int32_t ifIndex; @@ -470,7 +475,7 @@ /* * next items are used for hrNetworksTable */ - + int ifnet_sock; /*socket used to extract the interface list from the O/S*/ struct network_tbl hr_network_tbl; /*the head of the list with hrNetworkTable's entries */ time_t hrNetwork_tbl_age; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#8 (text+ko) ==== @@ -483,7 +483,7 @@ hrStorage_OS_get_fs_v(); /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_storage_tbl); while (entry != NULL) { @@ -500,6 +500,13 @@ HR_DPRINTF((stderr, "%s: refresh DONE\n ",__func__)); } + +/* + * This is the implementation for a generated (by our SNMP tool) + * function prototype, see hostres_tree.h + * It handles the SNMP operations for hrStorageTable + */ + int op_hrStorageTable(struct snmp_context *ctx __unused, struct snmp_value *value, u_int sub, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#6 (text+ko) ==== @@ -321,7 +321,7 @@ hrSWRun_OS_get_procs_v(); hrSWRun_OS_get_kinfo_v(); /* - * Purge items items that disappeared + * Purge items that disappeared */ entry = TAILQ_FIRST(&hrState_g.hr_swrun_tbl); while (entry != NULL) { From owner-p4-projects@FreeBSD.ORG Sat Aug 13 22:45:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF86416A421; Sat, 13 Aug 2005 22:45:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 510F316A41F for ; Sat, 13 Aug 2005 22:45:00 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDB4E43D49 for ; Sat, 13 Aug 2005 22:44:59 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7DMix5O083128 for ; Sat, 13 Aug 2005 22:44:59 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7DMixP8083125 for perforce@freebsd.org; Sat, 13 Aug 2005 22:44:59 GMT (envelope-from soc-victor@freebsd.org) Date: Sat, 13 Aug 2005 22:44:59 GMT Message-Id: <200508132244.j7DMixP8083125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 81959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2005 22:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=81959 Change 81959 by soc-victor@soc-victor_82.76.158.176 on 2005/08/13 22:44:57 The very first SNMP instrumentation for hrSWInstalledTable: for now only O/S is instrumented, need to analyze the installed packages. Also fixed a few things in other places. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#19 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#9 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#18 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#22 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 add Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#19 (text+ko) ==== @@ -36,7 +36,8 @@ hostres_processor_tbl.c \ hostres_diskstorage_tbl.c \ hostres_partition_tbl.c \ - hostres_network_tbl.c + hostres_network_tbl.c \ + hostres_swinstalled_tbl.c WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ strncpy(entry->mountPoint, name, sizeof(entry->mountPoint)-1); STAILQ_FOREACH(map, &hrState_g.fs_name_map, link) - if (strcmp(map->a_name, entry->mountPoint) == 0) { + if (strncmp(map->a_name, entry->mountPoint, sizeof(map->a_name) - 1) == 0) { entry->index = map->hrIndex; map->entry_p = entry; break; @@ -120,7 +120,7 @@ struct hrFSTblEntry *entry = NULL; TAILQ_FOREACH(entry, &hrState_g.hr_fs_tbl, link) - if (strncmp(entry->mountPoint, name, 255) == 0) + if (strncmp(entry->mountPoint, name, sizeof(entry->mountPoint) - 1) == 0) return (entry); return (NULL); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#3 (text+ko) ==== @@ -273,6 +273,7 @@ if (ioctl(hrState_g.ifnet_sock, SIOCGIFCONF, (char *) &ifc) < 0) { syslog(LOG_ERR,"failed to SIOCGIFCONF: %m"); close(hrState_g.ifnet_sock); + hrState_g.ifnet_sock = -1; return; } @@ -374,7 +375,7 @@ } -void refresh_Network_tbl_v(void) { +void refresh_hrNetwork_tbl_v(void) { struct hrNetworkTblEntry *entry = NULL, *entry_tmp = NULL; if ( this_tick <= hrState_g.hr_network_tick) { @@ -436,7 +437,7 @@ if ( (time(NULL) - hrState_g.hrNetwork_tbl_age) > HR_NETWORK_TBL_REFRESH ) { HR_DPRINTF((stderr, "%s: need refresh\n ",__func__)); - refresh_Network_tbl_v(); + refresh_hrNetwork_tbl_v(); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#9 (text+ko) ==== @@ -82,7 +82,7 @@ * Get kernel boot path. For FreeBSD it seems that no arguments are present. * Returns NULL if an error occured. The returned data is a pointer to a global strorage */ -static + u_char* OS_getSystemInitialLoadParameters(void); /* ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#18 (text+ko) ==== @@ -207,7 +207,14 @@ /*data structures initialization for hrNetworkTable*/ TAILQ_INIT(&hrState_g.hr_network_tbl); - + /*data structures initialization for hrSWInstalledTable*/ + hrState_g.next_hrSWInstalled_index = 1; + STAILQ_INIT(&hrState_g.sw_installed_name_map); + TAILQ_INIT(&hrState_g.hr_sw_installed_tbl); + hrState_g.hr_sw_installed_tick = 0; + hrState_g.hr_sw_installed_change_tick = 0; + hrState_g.hrSWInstalled_tbl_age = 0; + hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; hrState_g.hr_swrun_tick = 0; @@ -236,6 +243,8 @@ init_hrPartition_tbl_v(); init_hrNetwork_tbl_v(); + init_hrSWInstalled_tbl_v(); + if ((hrState_g.devd_sock = create_devd_socket()) < 0) { HR_DPRINTF((stderr, "Failed to create the socket to devd pipe.\n")); } @@ -308,6 +317,7 @@ fini_hrDevice_tbl_v(); fini_hrPartition_tbl_v(); fini_hrNetwork_tbl_v(); + fini_hrSWInstalled_tbl_v(); hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; @@ -334,6 +344,11 @@ hrState_g.fscale = 0; hrState_g.ccpu = 0; + hrState_g.hr_sw_installed_tick = 0; + hrState_g.hr_sw_installed_change_tick = 0; + hrState_g.hrSWInstalled_tbl_age = 0; + + if (hrState_g.ata_fd > 0) { if (close(hrState_g.ata_fd) < 0) { syslog(LOG_ERR,"close (/dev/ata) failed: %m"); @@ -495,14 +510,6 @@ } -int op_hrSWInstalledTable(struct snmp_context *ctx __unused, - struct snmp_value *value __unused, - u_int sub __unused, - u_int iidx __unused, - enum snmp_op curr_op __unused) -{ - return (SNMP_ERR_NOSUCHNAME); -} ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#22 (text+ko) ==== @@ -118,7 +118,7 @@ */ struct hrFSTblEntry { int32_t index; - u_char mountPoint[128+11]; + u_char mountPoint[128+1]; u_char remoteMountPoint[128+1]; struct asn_oid type; int32_t access; /* enum hrFSAccess, see above */ @@ -142,7 +142,7 @@ */ struct FSNameMapEntry { int32_t hrIndex; /*used for hrFSTblEntry::index*/ - u_char a_name[128]; /*map key*/ + u_char a_name[128+1]; /*map key*/ /* * next may be NULL if the respective hrFSTblEntry @@ -366,6 +366,48 @@ STAILQ_HEAD(device_map_list, deviceNameMapEntry); +enum SWInstalledType { + SWI_UNKNOWN = 1, + SWI_OPERATING_SYSTEM = 2, + SWI_DEVICE_DRIVER = 3, + SWI_APPLICATION = 4 +}; + + +/* + * This structure is used to hold a SNMP table entry + * for HOST-RESOURCES-MIB's hrSWInstalledTable + */ +struct hrSWInstalledTblEntry { + int32_t index; + u_char name[64+1]; + struct asn_oid id; + int32_t type; /* one item from enum SWInstalledType, see above */ + u_char date[11]; +#define HR_SWINSTALLED_FOUND 0x001 + /*next items are not from the SNMP mib table, only to be used internally*/ + uint32_t flags; + TAILQ_ENTRY(hrSWInstalledTblEntry) link; +}; + +TAILQ_HEAD(sw_installed_tbl, hrSWInstalledTblEntry); + + +struct SWInstalledNameMapEntry { + int32_t hrIndex; /*used for hrSWInstalledTblEntry::index*/ + u_char name[64+1]; /*map key*/ + + /* + * next may be NULL if the respective hrSWInstalledTblEntry + * is (temporally) gone + */ + struct + hrSWInstalledTblEntry *entry_p; + STAILQ_ENTRY(SWInstalledNameMapEntry) link; +}; + +STAILQ_HEAD(sw_installed_map_list, SWInstalledNameMapEntry); + struct hostres_state { FILE *utmp_fp; /*file pointer to keep an open instance of utmp*/ kvm_t *kd; /*kernel descriptor*/ @@ -414,7 +456,7 @@ time_t hrSWRun_tbl_age; uint64_t hr_swrun_tick; /*last (agent) tick when hrSWRunTable and hrSWRunPerTable were updated */ - int32_t hrSWOSIndex; /* the value of the MIB objecy with the same name*/ + int32_t hrSWOSIndex; /* the value of the MIB object with the same name*/ /* * next items are used for hrDeviceTable @@ -480,8 +522,20 @@ network_tbl hr_network_tbl; /*the head of the list with hrNetworkTable's entries */ time_t hrNetwork_tbl_age; uint64_t hr_network_tick; /*last (agent) tick when hrDeviceTable was updated */ + + /* + * next items are used for hrSWInstalledTable + */ + struct + sw_installed_map_list sw_installed_name_map; /*for consistent table indexing*/ + struct + sw_installed_tbl hr_sw_installed_tbl; /*the head of the list with hrSWInstalledTable's entries */ + uint32_t next_hrSWInstalled_index; /*next int available for indexing the hrSWInstalledTable*/ + uint64_t hr_sw_installed_tick; /*last (agent) tick when hrSWInstalledTable was fully updated */ + uint64_t hr_sw_installed_change_tick; /*last (agent) tick when hrDeviceTable was last changed */ + time_t hrSWInstalled_tbl_age; }; @@ -704,7 +758,16 @@ #define HR_NETWORK_TBL_REFRESH 7 -void refresh_Network_tbl_v(void); +void refresh_hrNetwork_tbl_v(void); + + +void init_hrSWInstalled_tbl_v(void); + +void fini_hrSWInstalled_tbl_v(void); + +#define HR_SWINSTALLED_TBL_REFRESH 120 + +void refresh_hrSWInstalled_tbl_v(void); #endif /*__HOSTRES_SNMP_H_INCLUDED__ */