From owner-p4-projects@FreeBSD.ORG Sun Aug 14 00:30: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 CEB2316A421; Sun, 14 Aug 2005 00: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 A524616A420 for ; Sun, 14 Aug 2005 00:30:06 +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 55EA343D46 for ; Sun, 14 Aug 2005 00:30:06 +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 j7E0U6bq086645 for ; Sun, 14 Aug 2005 00:30:06 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7E0U6ns086642 for perforce@freebsd.org; Sun, 14 Aug 2005 00:30:06 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 14 Aug 2005 00:30:06 GMT Message-Id: <200508140030.j7E0U6ns086642@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 81960 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, 14 Aug 2005 00:30:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=81960 Change 81960 by soc-cjones@soc-cjones_ishtar on 2005/08/14 00:29:16 Meh. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_share.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_share.c#2 (text+ko) ==== @@ -573,10 +573,12 @@ s->drive_offset = -1; errors = 0; for (j = 1; j < max; j++) { + /* printf("gv_new_sd: token = '%s'\n", token[j]); */ if (!strcmp(token[j], "name")) { j++; if (j >= max) { errors++; + /* printf("breaking on name '%s'\n", token[j]); */ break; } strncpy(s->name, token[j], GV_MAXSDNAME); @@ -584,6 +586,7 @@ j++; if (j >= max) { errors++; + /* printf("breaking on drive '%s'\n", token[j]); */ break; } strncpy(s->drive, token[j], GV_MAXDRIVENAME); @@ -591,6 +594,7 @@ j++; if (j >= max) { errors++; + /* printf("breaking on plex '%s'\n", token[j]); */ break; } strncpy(s->plex, token[j], GV_MAXPLEXNAME); @@ -598,6 +602,7 @@ j++; if (j >= max) { errors++; + /* printf("breaking on state '%s'\n", token[j]); */ break; } s->state = gv_sdstatei(token[j]); @@ -606,6 +611,7 @@ j++; if (j >= max) { errors++; + /* printf("breakign on length '%s'\n", token[j]); */ break; } s->size = gv_sizespec(token[j]); @@ -615,33 +621,42 @@ j++; if (j >= max) { errors++; + /* printf("breaking on driveoffset '%s'\n", token[j]); */ break; } s->drive_offset = gv_sizespec(token[j]); if (s->drive_offset != 0 && s->drive_offset < GV_DATA_START) { errors++; + /* printf("breaking on invalid drive offset\n"); */ break; } } else if (!strcmp(token[j], "plexoffset")) { j++; if (j >= max) { errors++; + /* printf("breaking on plexoffset '%s'\n", token[j]); */ break; } s->plex_offset = gv_sizespec(token[j]); if (s->plex_offset < 0) { errors++; + /* printf("breaking on invalid plexoffset\n"); */ break; } } else { errors++; + /* printf("breaking on invalid token '%s'\n", token[j]); */ break; } } - if (strlen(s->drive) == 0) + if (strlen(s->drive) == 0) { errors++; + /* printf("dying on NULL drive\n"); + printf("fixing to refer to alpha\n"); + snprintf(s->drive, GV_MAXDRIVENAME, "alpha"); */ + } if (errors) { g_free(s); From owner-p4-projects@FreeBSD.ORG Sun Aug 14 07:24:38 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 A351316A421; Sun, 14 Aug 2005 07:24:37 +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 4E37A16A420 for ; Sun, 14 Aug 2005 07:24:37 +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 098E543D49 for ; Sun, 14 Aug 2005 07:24:37 +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 j7E7Oass017870 for ; Sun, 14 Aug 2005 07:24:36 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7E7OaAZ017867 for perforce@freebsd.org; Sun, 14 Aug 2005 07:24:36 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 14 Aug 2005 07:24:36 GMT Message-Id: <200508140724.j7E7OaAZ017867@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 81969 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, 14 Aug 2005 07:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=81969 Change 81969 by soc-cjones@soc-cjones_ishtar on 2005/08/14 07:24:05 Use tab instead of spaces for gv_rm_sd. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#4 (text+ko) ==== @@ -56,7 +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); +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 *); From owner-p4-projects@FreeBSD.ORG Sun Aug 14 07:29: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 BAB0E16A421; Sun, 14 Aug 2005 07:29:46 +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 7BFDD16A41F for ; Sun, 14 Aug 2005 07:29:46 +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 4BCFB43D45 for ; Sun, 14 Aug 2005 07:29:46 +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 j7E7TjBc018215 for ; Sun, 14 Aug 2005 07:29:46 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7E7Tjsd018212 for perforce@freebsd.org; Sun, 14 Aug 2005 07:29:45 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 14 Aug 2005 07:29:45 GMT Message-Id: <200508140729.j7E7Tjsd018212@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 81970 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, 14 Aug 2005 07:29:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=81970 Change 81970 by soc-cjones@soc-cjones_ishtar on 2005/08/14 07:29:38 Fix case where sd isn't part of a plex, and things die on gv_sd_to_plex. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_plex.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_plex.c#2 (text+ko) ==== @@ -734,6 +734,8 @@ * configuration, we don't check the given value (should we?). * XXX: shouldn't be done here */ + if (!p) /* SD isn't part of a plex; we'll die if we don't exit now. */ + return (NULL); gv_sd_to_plex(p, s, 0); /* Now check if there's already a geom for this plex. */ From owner-p4-projects@FreeBSD.ORG Sun Aug 14 08:30:26 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 84A2616A421; Sun, 14 Aug 2005 08:30:25 +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 53EE716A41F for ; Sun, 14 Aug 2005 08:30:25 +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 0D40F43D46 for ; Sun, 14 Aug 2005 08:30:25 +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 j7E8UOVP021052 for ; Sun, 14 Aug 2005 08:30:24 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7E8UOsB021049 for perforce@freebsd.org; Sun, 14 Aug 2005 08:30:24 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 14 Aug 2005 08:30:24 GMT Message-Id: <200508140830.j7E8UOsB021049@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 81971 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, 14 Aug 2005 08:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=81971 Change 81971 by soc-cjones@soc-cjones_ishtar on 2005/08/14 08:29:48 Get rid of that alpha thing. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_share.c#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_share.c#3 (text+ko) ==== @@ -653,9 +653,6 @@ if (strlen(s->drive) == 0) { errors++; - /* printf("dying on NULL drive\n"); - printf("fixing to refer to alpha\n"); - snprintf(s->drive, GV_MAXDRIVENAME, "alpha"); */ } if (errors) { From owner-p4-projects@FreeBSD.ORG Sun Aug 14 17:31: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 1ABFE16A421; Sun, 14 Aug 2005 17:31: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 AFD3A16A41F for ; Sun, 14 Aug 2005 17:31: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 497F243D46 for ; Sun, 14 Aug 2005 17:31: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 j7EHVTnu066554 for ; Sun, 14 Aug 2005 17:31: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 j7EHVSlf066551 for perforce@freebsd.org; Sun, 14 Aug 2005 17:31:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Aug 2005 17:31:28 GMT Message-Id: <200508141731.j7EHVSlf066551@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 81982 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, 14 Aug 2005 17:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=81982 Change 81982 by rwatson@rwatson_peppercorn on 2005/08/14 17:30:58 Integrate netsmp branch; various changes including: - g_label_ext2fs, g_label_reiserfs - if_dc, if_hme, if_my, if_sf, if_sk locking and other cleanups - if_drv_flags/if_flags descriptions, loopback, etc. - arp/routing race fixes - netnatm fixes to if_atm - nswbuf fix Affected files ... .. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/netsmp/src/sys/conf/files#6 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/netsmp/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/awi/awi.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/my/if_my.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/netsmp/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/netsmp/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/projects/netsmp/src/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/netsmp/src/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/netsmp/src/sys/modules/geom/geom_label/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/twa/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/twe/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/net/if.h#5 integrate .. //depot/projects/netsmp/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/netsmp/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/netsmp/src/sys/net/if_pppvar.h#2 integrate .. //depot/projects/netsmp/src/sys/net/ppp_tty.c#4 integrate .. //depot/projects/netsmp/src/sys/net/route.c#3 integrate .. //depot/projects/netsmp/src/sys/net/rtsock.c#5 integrate .. //depot/projects/netsmp/src/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/if_atm.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/pim_var.h#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_dc.c#6 integrate .. //depot/projects/netsmp/src/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_de.c#8 integrate .. //depot/projects/netsmp/src/sys/pci/if_sf.c#6 integrate .. //depot/projects/netsmp/src/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/if_sk.c#6 integrate .. //depot/projects/netsmp/src/sys/sys/ata.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/buf.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/proc.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/protosw.h#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pager.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.517 2005/08/07 22:00:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.520 2005/08/11 23:38:01 alc Exp $"); /* * Manages physical address maps. @@ -104,7 +104,6 @@ */ #include "opt_msgbuf.h" -#include "opt_kstack_pages.h" #include #include @@ -207,8 +206,8 @@ static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); -static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, - vm_offset_t va, pd_entry_t ptepde); +static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, + vm_offset_t va); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags); @@ -1420,11 +1419,10 @@ } -static int -pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va, pd_entry_t ptepde) +static void +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { pv_entry_t pv; - int rtval; PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -1439,20 +1437,13 @@ break; } } - - rtval = 0; - if (pv) { - rtval = pmap_unuse_pt(pmap, va, ptepde); - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; - if (TAILQ_FIRST(&m->md.pv_list) == NULL) - vm_page_flag_clear(m, PG_WRITEABLE); - - TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); - free_pv_entry(pv); - } - - return rtval; + KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count--; + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + free_pv_entry(pv); } /* @@ -1510,10 +1501,9 @@ } if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); - return pmap_remove_entry(pmap, m, va, ptepde); - } else { - return pmap_unuse_pt(pmap, va, ptepde); + pmap_remove_entry(pmap, m, va); } + return (pmap_unuse_pt(pmap, va, ptepde)); } /* @@ -1930,9 +1920,9 @@ pmap->pm_stats.wired_count--; if (origpte & PG_MANAGED) { om = PHYS_TO_VM_PAGE(opa); - err = pmap_remove_entry(pmap, om, va, ptepde); - } else - err = pmap_unuse_pt(pmap, va, ptepde); + pmap_remove_entry(pmap, om, va); + } + err = pmap_unuse_pt(pmap, va, ptepde); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); } else @@ -2566,12 +2556,6 @@ */ if (!pmap_track_modified(pv->pv_va)) continue; -#if defined(PMAP_DIAGNOSTIC) - if (!pv->pv_pmap) { - printf("Null pmap (tb) at va: 0x%lx\n", pv->pv_va); - continue; - } -#endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); rv = (*pte & PG_M) != 0; @@ -2633,13 +2617,6 @@ continue; } -#if defined(PMAP_DIAGNOSTIC) - if (!pv->pv_pmap) { - printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va); - continue; - } -#endif - PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); retry: ==== //depot/projects/netsmp/src/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1040 2005/08/08 18:31:13 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1041 2005/08/12 00:27:44 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1060,8 +1060,10 @@ geom/geom_vfs.c standard geom/geom_vol_ffs.c optional geom_vol geom/label/g_label.c optional geom_label +geom/label/g_label_ext2fs.c optional geom_label geom/label/g_label_iso9660.c optional geom_label geom/label/g_label_msdosfs.c optional geom_label +geom/label/g_label_reiserfs.c optional geom_label geom/label/g_label_ufs.c optional geom_label geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror ==== //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.14 2005/08/09 10:19:42 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.15 2005/08/09 11:59:02 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -271,10 +271,17 @@ case SIOCAIFADDR: case SIOCSIFDSTADDR: case SIOCSIFFLAGS: +#ifdef __FreeBSD__ if (ifp->if_flags & IFF_UP) ifp->if_drv_flags |= IFF_DRV_RUNNING; else ifp->if_drv_flags &= ~IFF_DRV_RUNNING; +#else + if (ifp->if_flags & IFF_UP) + ifp->if_flags |= IFF_RUNNING; + else + ifp->if_flags &= ~IFF_RUNNING; +#endif break; default: return (EINVAL); ==== //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.21 2005/08/09 10:19:42 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.22 2005/08/09 11:59:02 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ /* @@ -989,10 +989,17 @@ case SIOCAIFADDR: case SIOCSIFDSTADDR: case SIOCSIFFLAGS: +#ifdef __FreeBSD__ if (ifp->if_flags & IFF_UP) ifp->if_drv_flags |= IFF_DRV_RUNNING; else ifp->if_drv_flags &= ~IFF_DRV_RUNNING; +#else + if (ifp->if_flags & IFF_UP) + ifp->if_flags |= IFF_RUNNING; + else + ifp->if_flags &= ~IFF_RUNNING; +#endif break; case SIOCSIFMTU: if (ifr->ifr_mtu < PFSYNC_MINMTU) ==== //depot/projects/netsmp/src/sys/ddb/db_command.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.60 2005/07/02 23:52:37 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_command.c,v 1.61 2005/08/10 07:08:14 obrien Exp $"); #include #include @@ -73,8 +73,60 @@ static db_cmdfcn_t db_stack_trace; static db_cmdfcn_t db_watchdog; -/* XXX this is actually forward-static. */ -extern struct command db_show_cmds[]; +/* + * 'show' commands + */ + +static struct command db_show_all_cmds[] = { + { "procs", db_ps, 0, 0 }, + { (char *)0 } +}; + +static struct command db_show_cmds[] = { + { "all", 0, 0, db_show_all_cmds }, + { "registers", db_show_regs, 0, 0 }, + { "breaks", db_listbreak_cmd, 0, 0 }, + { "threads", db_show_threads, 0, 0 }, + { (char *)0, } +}; + +static struct command db_command_table[] = { + { "print", db_print_cmd, 0, 0 }, + { "p", db_print_cmd, 0, 0 }, + { "examine", db_examine_cmd, CS_SET_DOT, 0 }, + { "x", db_examine_cmd, CS_SET_DOT, 0 }, + { "search", db_search_cmd, CS_OWN|CS_SET_DOT, 0 }, + { "set", db_set_cmd, CS_OWN, 0 }, + { "write", db_write_cmd, CS_MORE|CS_SET_DOT, 0 }, + { "w", db_write_cmd, CS_MORE|CS_SET_DOT, 0 }, + { "delete", db_delete_cmd, 0, 0 }, + { "d", db_delete_cmd, 0, 0 }, + { "break", db_breakpoint_cmd, 0, 0 }, + { "dwatch", db_deletewatch_cmd, 0, 0 }, + { "watch", db_watchpoint_cmd, CS_MORE,0 }, + { "dhwatch", db_deletehwatch_cmd, 0, 0 }, + { "hwatch", db_hwatchpoint_cmd, 0, 0 }, + { "step", db_single_step_cmd, 0, 0 }, + { "s", db_single_step_cmd, 0, 0 }, + { "continue", db_continue_cmd, 0, 0 }, + { "c", db_continue_cmd, 0, 0 }, + { "until", db_trace_until_call_cmd,0, 0 }, + { "next", db_trace_until_matching_cmd,0, 0 }, + { "match", db_trace_until_matching_cmd,0, 0 }, + { "trace", db_stack_trace, CS_OWN, 0 }, + { "where", db_stack_trace, CS_OWN, 0 }, + { "call", db_fncall, CS_OWN, 0 }, + { "show", 0, 0, db_show_cmds }, + { "ps", db_ps, 0, 0 }, + { "gdb", db_gdb, 0, 0 }, + { "reset", db_reset, 0, 0 }, + { "kill", db_kill, CS_OWN, 0 }, + { "watchdog", db_watchdog, 0, 0 }, + { "thread", db_set_thread, CS_OWN, 0 }, + { (char *)0, } +}; + +static struct command *db_last_command = 0; /* * if 'ed' style: 'dot' is set at start of last item printed, @@ -372,61 +424,6 @@ } /* - * 'show' commands - */ - -static struct command db_show_all_cmds[] = { - { "procs", db_ps, 0, 0 }, - { (char *)0 } -}; - -static struct command db_show_cmds[] = { - { "all", 0, 0, db_show_all_cmds }, - { "registers", db_show_regs, 0, 0 }, - { "breaks", db_listbreak_cmd, 0, 0 }, - { "threads", db_show_threads, 0, 0 }, - { (char *)0, } -}; - -static struct command db_command_table[] = { - { "print", db_print_cmd, 0, 0 }, - { "p", db_print_cmd, 0, 0 }, - { "examine", db_examine_cmd, CS_SET_DOT, 0 }, - { "x", db_examine_cmd, CS_SET_DOT, 0 }, - { "search", db_search_cmd, CS_OWN|CS_SET_DOT, 0 }, - { "set", db_set_cmd, CS_OWN, 0 }, - { "write", db_write_cmd, CS_MORE|CS_SET_DOT, 0 }, - { "w", db_write_cmd, CS_MORE|CS_SET_DOT, 0 }, - { "delete", db_delete_cmd, 0, 0 }, - { "d", db_delete_cmd, 0, 0 }, - { "break", db_breakpoint_cmd, 0, 0 }, - { "dwatch", db_deletewatch_cmd, 0, 0 }, - { "watch", db_watchpoint_cmd, CS_MORE,0 }, - { "dhwatch", db_deletehwatch_cmd, 0, 0 }, - { "hwatch", db_hwatchpoint_cmd, 0, 0 }, - { "step", db_single_step_cmd, 0, 0 }, - { "s", db_single_step_cmd, 0, 0 }, - { "continue", db_continue_cmd, 0, 0 }, - { "c", db_continue_cmd, 0, 0 }, - { "until", db_trace_until_call_cmd,0, 0 }, - { "next", db_trace_until_matching_cmd,0, 0 }, - { "match", db_trace_until_matching_cmd,0, 0 }, - { "trace", db_stack_trace, CS_OWN, 0 }, - { "where", db_stack_trace, CS_OWN, 0 }, - { "call", db_fncall, CS_OWN, 0 }, - { "show", 0, 0, db_show_cmds }, - { "ps", db_ps, 0, 0 }, - { "gdb", db_gdb, 0, 0 }, - { "reset", db_reset, 0, 0 }, - { "kill", db_kill, CS_OWN, 0 }, - { "watchdog", db_watchdog, 0, 0 }, - { "thread", db_set_thread, CS_OWN, 0 }, - { (char *)0, } -}; - -static struct command *db_last_command = 0; - -/* * At least one non-optional command must be implemented using * DB_COMMAND() so that db_cmd_set gets created. Here is one. */ ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.17 2005/08/05 17:00:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.18 2005/08/11 17:12:57 njl Exp $"); #include "opt_acpi.h" #include @@ -227,9 +227,8 @@ 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; + if (bi[i].cap != -1) + total_cap += bi[i].cap; } /* ==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.252 2005/05/17 12:31:54 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.253 2005/08/12 16:54:11 sos Exp $"); #include "opt_ata.h" #include @@ -769,6 +769,7 @@ case ATA_UDMA5: return "UDMA100"; case ATA_UDMA6: return "UDMA133"; case ATA_SA150: return "SATA150"; + case ATA_SA300: return "SATA300"; default: if (mode & ATA_DMA_MASK) return "BIOSDMA"; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.127 2005/08/05 13:14:00 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.128 2005/08/12 16:54:11 sos Exp $"); #include "opt_ata.h" #include @@ -208,6 +208,7 @@ static void ata_sata_setmode(device_t dev, int mode) { + struct ata_pci_controller *ctlr = device_get_softc(GRANDPARENT(dev)); struct ata_device *atadev = device_get_softc(dev); /* @@ -220,7 +221,7 @@ atadev->param.satacapabilities != 0xffff) { if (!ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_SETXFER, 0, ata_limit_mode(dev, mode, ATA_UDMA6))) - atadev->mode = ATA_SA150; + atadev->mode = ctlr->chip->max_dma; } else { mode = ata_limit_mode(dev, mode, ATA_UDMA5); @@ -2233,6 +2234,8 @@ { ATA_PDC20622, 0, PRMIO, PRSX4X, ATA_SA150, "Promise PDC20622" }, { ATA_PDC40518, 0, PRMIO, PRSATA2, ATA_SA150, "Promise PDC40518" }, { ATA_PDC40519, 0, PRMIO, PRSATA2, ATA_SA150, "Promise PDC40519" }, + { ATA_PDC40718, 0, PRMIO, PRSATA2, ATA_SA300, "Promise PDC40718" }, + { ATA_PDC40719, 0, PRMIO, PRSATA2, ATA_SA300, "Promise PDC40719" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; uintptr_t devid = 0; ==== //depot/projects/netsmp/src/sys/dev/ata/ata-pci.h#3 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-pci.h,v 1.50 2005/08/05 13:14:00 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.51 2005/08/12 16:54:11 sos Exp $ */ /* structure holding chipset config info */ @@ -203,6 +203,8 @@ #define ATA_PDC20580 0x3570105a #define ATA_PDC40518 0x3d18105a #define ATA_PDC40519 0x3519105a +#define ATA_PDC40718 0x3d17105a +#define ATA_PDC40719 0x3515105a #define ATA_PDC20617 0x6617105a #define ATA_PDC20618 0x6626105a #define ATA_PDC20619 0x6629105a ==== //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.101 2005/08/09 10:19:43 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.103 2005/08/12 23:11:44 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -844,7 +844,6 @@ struct ath_softc *sc = (struct ath_softc *) arg; struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; - struct ieee80211_node *ni; struct ath_hal *ah = sc->sc_ah; HAL_STATUS status; @@ -865,8 +864,8 @@ * be followed by initialization of the appropriate bits * and then setup of the interrupt mask. */ - sc->sc_curchan.channel = ic->ic_ibss_chan->ic_freq; - sc->sc_curchan.channelFlags = ath_chan2flags(ic, ic->ic_ibss_chan); + sc->sc_curchan.channel = ic->ic_curchan->ic_freq; + sc->sc_curchan.channelFlags = ath_chan2flags(ic, ic->ic_curchan); if (!ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); @@ -918,9 +917,7 @@ * to kick the 802.11 state machine as it's likely to * immediately call back to us to send mgmt frames. */ - ni = ic->ic_bss; - ni->ni_chan = ic->ic_ibss_chan; - ath_chan_change(sc, ni->ni_chan); + ath_chan_change(sc, ic->ic_curchan); if (ic->ic_opmode != IEEE80211_M_MONITOR) { if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); @@ -1022,7 +1019,7 @@ * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ - c = ic->ic_ibss_chan; + c = ic->ic_curchan; sc->sc_curchan.channel = c->ic_freq; sc->sc_curchan.channelFlags = ath_chan2flags(ic, c); @@ -3428,14 +3425,14 @@ ctsduration += ath_hal_computetxtime(ah, rt, pktlen, rix, AH_TRUE); if ((flags & HAL_TXDESC_NOACK) == 0) /* SIFS + ACK */ - ctsduration += rt->info[cix].spAckDuration; + ctsduration += rt->info[rix].spAckDuration; } else { if (flags & HAL_TXDESC_RTSENA) /* SIFS + CTS */ ctsduration += rt->info[cix].lpAckDuration; ctsduration += ath_hal_computetxtime(ah, rt, pktlen, rix, AH_FALSE); if ((flags & HAL_TXDESC_NOACK) == 0) /* SIFS + ACK */ - ctsduration += rt->info[cix].lpAckDuration; + ctsduration += rt->info[rix].lpAckDuration; } /* * Must disable multi-rate retry when using RTS/CTS. @@ -4114,7 +4111,7 @@ goto done; } ni = ic->ic_bss; - error = ath_chan_set(sc, ni->ni_chan); + error = ath_chan_set(sc, ic->ic_curchan); if (error != 0) goto bad; rfilt = ath_calcrxfilter(sc, nstate); @@ -4153,7 +4150,7 @@ , ni->ni_intval , ether_sprintf(ni->ni_bssid) , ni->ni_capinfo - , ieee80211_chan2ieee(ic, ni->ni_chan)); + , ieee80211_chan2ieee(ic, ic->ic_curchan)); switch (ic->ic_opmode) { case IEEE80211_M_HOSTAP: ==== //depot/projects/netsmp/src/sys/dev/awi/awi.c#8 (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.41 2005/08/09 10:19:43 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.42 2005/08/13 00:30:26 sam Exp $"); #endif #include "opt_inet.h" @@ -691,6 +691,7 @@ } else { /* XXX check sc->sc_cur_chan */ ni->ni_chan = &ic->ic_channels[sc->sc_cur_chan]; + ic->ic_curchan = ni->ni_chan; ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); } return 0; @@ -1973,19 +1974,19 @@ if (sc->sc_mib_phy.IEEE_PHY_Type == AWI_PHY_TYPE_FH) { awi_write_1(sc, AWI_CA_SCAN_SET, IEEE80211_FH_CHANSET( - ieee80211_chan2ieee(ic, ni->ni_chan))); + ieee80211_chan2ieee(ic, ic->ic_curchan))); awi_write_1(sc, AWI_CA_SCAN_PATTERN, IEEE80211_FH_CHANPAT( - ieee80211_chan2ieee(ic, ni->ni_chan))); + ieee80211_chan2ieee(ic, ic->ic_curchan))); awi_write_1(sc, AWI_CA_SCAN_IDX, 1); } else { awi_write_1(sc, AWI_CA_SCAN_SET, - ieee80211_chan2ieee(ic, ni->ni_chan)); + ieee80211_chan2ieee(ic, ic->ic_curchan)); awi_write_1(sc, AWI_CA_SCAN_PATTERN, 0); awi_write_1(sc, AWI_CA_SCAN_IDX, 0); } awi_write_1(sc, AWI_CA_SCAN_SUSP, 0); - sc->sc_cur_chan = ieee80211_chan2ieee(ic, ni->ni_chan); + sc->sc_cur_chan = ieee80211_chan2ieee(ic, ic->ic_curchan); if ((error = awi_cmd(sc, AWI_CMD_SCAN, AWI_NOWAIT)) != 0) break; ==== //depot/projects/netsmp/src/sys/dev/ciss/ciss.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/ciss/ciss.c,v 1.64 2005/05/29 04:42:19 nyan Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.65 2005/08/09 20:53:51 ps Exp $ */ /* @@ -597,12 +597,6 @@ sc->ciss_cfg->signature[2], sc->ciss_cfg->signature[3]); return(ENXIO); } - if ((sc->ciss_cfg->valence < CISS_MIN_VALENCE) || - (sc->ciss_cfg->valence > CISS_MAX_VALENCE)) { - ciss_printf(sc, "adapter interface specification (%d) unsupported\n", - sc->ciss_cfg->valence); - return(ENXIO); - } /* * Put the board into simple mode, and tell it we're using the low ==== //depot/projects/netsmp/src/sys/dev/ciss/cissreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.15 2005/04/19 06:11:16 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/cissreg.h,v 1.16 2005/08/09 20:53:51 ps Exp $ */ /* @@ -396,8 +396,6 @@ { char signature[4]; /* "CISS" */ u_int32_t valence; -#define CISS_MIN_VALENCE 1 /* only value currently supported */ -#define CISS_MAX_VALENCE 1 u_int32_t supported_methods; #define CISS_TRANSPORT_METHOD_READY (1<<0) #define CISS_TRANSPORT_METHOD_SIMPLE (1<<1) ==== //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.39 2005/08/09 10:19:48 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.40 2005/08/10 20:12:25 jhb Exp $"); /* * HME Ethernet module driver. @@ -112,7 +112,6 @@ static int hme_mac_bitflip(struct hme_softc *, u_int32_t, u_int32_t, u_int32_t, u_int32_t); static void hme_mifinit(struct hme_softc *); -static void hme_reset(struct hme_softc *); static void hme_setladrf(struct hme_softc *, int); static int hme_mediachange(struct ifnet *); @@ -206,6 +205,8 @@ hme_stop(sc); HME_UNLOCK(sc); + callout_init_mtx(&sc->sc_tick_ch, &sc->sc_lock, 0); + /* * Allocate DMA capable memory * Buffer descriptors must be aligned on a 2048 byte boundary; @@ -224,7 +225,7 @@ error = bus_dma_tag_create(sc->sc_pdmatag, 2048, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, BUS_SPACE_MAXSIZE_32BIT, BUS_DMA_ALLOCNOW, busdma_lock_mutex, - &Giant, &sc->sc_cdmatag); + &sc->sc_lock, &sc->sc_cdmatag); if (error) goto fail_ptag; @@ -301,9 +302,7 @@ ifp->if_snd.ifq_drv_maxlen = HME_NTXQ; IFQ_SET_READY(&ifp->if_snd); - HME_LOCK(sc); hme_mifinit(sc); - HME_UNLOCK(sc); if ((error = mii_phy_probe(sc->sc_dev, &sc->sc_miibus, hme_mediachange, hme_mediastatus)) != 0) { @@ -347,8 +346,6 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM; ifp->if_hwassist |= sc->sc_csum_features; ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM; - - callout_init(&sc->sc_tick_ch, CALLOUT_MPSAFE); return (0); fail_txdesc: @@ -447,34 +444,21 @@ hme_tick(void *arg) { struct hme_softc *sc = arg; - int s; - s = splnet(); + HME_LOCK_ASSERT(sc, MA_OWNED); mii_tick(sc->sc_mii); - splx(s); callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc); } static void -hme_reset(struct hme_softc *sc) -{ - int s; - - HME_LOCK(sc); - s = splnet(); - hme_init_locked(sc); - splx(s); - HME_UNLOCK(sc); -} - -static void hme_stop(struct hme_softc *sc) { u_int32_t v; int n; callout_stop(&sc->sc_tick_ch); + sc->sc_ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); /* Reset transmitter and receiver */ HME_SEB_WRITE_4(sc, HME_SEBI_RESET, HME_SEB_RESET_ETX | @@ -872,9 +856,7 @@ /* Set the current media. */ /* - * HME_UNLOCK(sc); * mii_mediachg(sc->sc_mii); - * HME_LOCK(sc); */ /* Start the one second timer. */ @@ -1372,9 +1354,9 @@ #endif device_printf(sc->sc_dev, "device timeout\n"); ++ifp->if_oerrors; + + hme_init_locked(sc); HME_UNLOCK(sc); - - hme_reset(sc); } /* @@ -1385,8 +1367,6 @@ { u_int32_t v; - HME_LOCK_ASSERT(sc, MA_OWNED); - /* Configure the MIF in frame mode */ v = HME_MIF_READ_4(sc, HME_MIFI_CFG); v &= ~HME_MIF_CFG_BBMODE; @@ -1403,7 +1383,6 @@ int n; u_int32_t v; - HME_LOCK(sc); /* Select the desired PHY in the MIF configuration register */ v = HME_MIF_READ_4(sc, HME_MIFI_CFG); /* Clear PHY select bit */ @@ -1425,13 +1404,11 @@ DELAY(1); v = HME_MIF_READ_4(sc, HME_MIFI_FO); if (v & HME_MIF_FO_TALSB) { - HME_UNLOCK(sc); return (v & HME_MIF_FO_DATA); } } device_printf(sc->sc_dev, "mii_read timeout\n"); - HME_UNLOCK(sc); return (0); } @@ -1442,7 +1419,6 @@ int n; u_int32_t v; - HME_LOCK(sc); /* Select the desired PHY in the MIF configuration register */ v = HME_MIF_READ_4(sc, HME_MIFI_CFG); /* Clear PHY select bit */ @@ -1464,14 +1440,11 @@ for (n = 0; n < 100; n++) { DELAY(1); v = HME_MIF_READ_4(sc, HME_MIFI_FO); - if (v & HME_MIF_FO_TALSB) { - HME_UNLOCK(sc); + if (v & HME_MIF_FO_TALSB) return (1); - } } device_printf(sc->sc_dev, "mii_write timeout\n"); - HME_UNLOCK(sc); return (0); } @@ -1483,7 +1456,6 @@ int phy; u_int32_t v; - HME_LOCK(sc); instance = IFM_INST(sc->sc_mii->mii_media.ifm_cur->ifm_media); phy = sc->sc_phys[instance]; #ifdef HMEDEBUG @@ -1500,28 +1472,27 @@ /* Set the MAC Full Duplex bit appropriately */ v = HME_MAC_READ_4(sc, HME_MACI_TXCFG); - if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, HME_MAC_TXCFG_ENABLE, 0)) { - HME_UNLOCK(sc); + if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, HME_MAC_TXCFG_ENABLE, 0)) return; - } if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_FDX) != 0) v |= HME_MAC_TXCFG_FULLDPLX; else v &= ~HME_MAC_TXCFG_FULLDPLX; HME_MAC_WRITE_4(sc, HME_MACI_TXCFG, v); - if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, 0, HME_MAC_TXCFG_ENABLE)) { - HME_UNLOCK(sc); + if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, 0, HME_MAC_TXCFG_ENABLE)) return; - } - HME_UNLOCK(sc); } static int hme_mediachange(struct ifnet *ifp) { struct hme_softc *sc = ifp->if_softc; + int error; - return (mii_mediachg(sc->sc_mii)); + HME_LOCK(sc); + error = mii_mediachg(sc->sc_mii); + HME_UNLOCK(sc); + return (error); } static void @@ -1535,9 +1506,7 @@ return; } - HME_UNLOCK(sc); mii_pollstat(sc->sc_mii); - HME_LOCK(sc); ifmr->ifm_active = sc->sc_mii->mii_media_active; ifmr->ifm_status = sc->sc_mii->mii_media_status; HME_UNLOCK(sc); @@ -1551,13 +1520,11 @@ { struct hme_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; - int s, error = 0; - - HME_LOCK(sc); - s = splnet(); + int error = 0; switch (cmd) { case SIOCSIFFLAGS: + HME_LOCK(sc); if ((ifp->if_flags & IFF_UP) == 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { /* @@ -1565,7 +1532,6 @@ * stop it. */ hme_stop(sc); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } else if ((ifp->if_flags & IFF_UP) != 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { /* @@ -1589,35 +1555,34 @@ #ifdef HMEDEBUG sc->sc_debug = (ifp->if_flags & IFF_DEBUG) != 0 ? 1 : 0; #endif + HME_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 14 17:39: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 A8CDB16A421; Sun, 14 Aug 2005 17:39: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 8487616A41F for ; Sun, 14 Aug 2005 17:39:40 +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 33B8143D45 for ; Sun, 14 Aug 2005 17:39:40 +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 j7EHdecT067726 for ; Sun, 14 Aug 2005 17:39:40 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 j7EHddw0067717 for perforce@freebsd.org; Sun, 14 Aug 2005 17:39:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 14 Aug 2005 17:39:39 GMT Message-Id: <200508141739.j7EHddw0067717@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 81984 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, 14 Aug 2005 17:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=81984 Change 81984 by rwatson@rwatson_peppercorn on 2005/08/14 17:38:46 Remove most spl's in rtsock.c. One of two left in to indicate possible bugs: one is left over from 4.x, and has to do with initialization order for raw-derived sockets, and one has to do with missing locking relating to dumping route data with sysctl. Affected files ... .. //depot/projects/netsmp/src/sys/net/rtsock.c#6 edit Differences ... ==== //depot/projects/netsmp/src/sys/net/rtsock.c#6 (text+ko) ==== @@ -140,11 +140,8 @@ static int rts_abort(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_abort(so); - splx(s); - return error; + + return (raw_usrreqs.pru_abort(so)); } /* pru_accept is EOPNOTSUPP */ @@ -203,21 +200,15 @@ static int rts_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_bind(so, nam, td); /* xxx just EINVAL */ - splx(s); - return error; + + return (raw_usrreqs.pru_bind(so, nam, td)); /* xxx just EINVAL */ } static int rts_connect(struct socket *so, struct sockaddr *nam, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_connect(so, nam, td); /* XXX just EINVAL */ - splx(s); - return error; + + return (raw_usrreqs.pru_connect(so, nam, td)); /* XXX just EINVAL */ } /* pru_connect2 is EOPNOTSUPP */ @@ -254,11 +245,8 @@ static int rts_disconnect(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_disconnect(so); - splx(s); - return error; + + return (raw_usrreqs.pru_disconnect(so)); } /* pru_listen is EOPNOTSUPP */ @@ -266,11 +254,8 @@ static int rts_peeraddr(struct socket *so, struct sockaddr **nam) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_peeraddr(so, nam); - splx(s); - return error; + + return (raw_usrreqs.pru_peeraddr(so, nam)); } /* pru_rcvd is EOPNOTSUPP */ @@ -280,11 +265,8 @@ rts_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_send(so, flags, m, nam, control, td); - splx(s); - return error; + + return (raw_usrreqs.pru_send(so, flags, m, nam, control, td)); } /* pru_sense is null */ @@ -292,21 +274,15 @@ static int rts_shutdown(struct socket *so) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_shutdown(so); - splx(s); - return error; + + return (raw_usrreqs.pru_shutdown(so)); } static int rts_sockaddr(struct socket *so, struct sockaddr **nam) { - int s, error; - s = splnet(); - error = raw_usrreqs.pru_sockaddr(so, nam); - splx(s); - return error; + + return (raw_usrreqs.pru_sockaddr(so, nam)); } static struct pr_usrreqs route_usrreqs = { From owner-p4-projects@FreeBSD.ORG Sun Aug 14 18:29: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 E37C516A421; Sun, 14 Aug 2005 18:29:42 +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 B9D4016A41F for ; Sun, 14 Aug 2005 18:29:42 +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 617D343D49 for ; Sun, 14 Aug 2005 18:29:42 +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 j7EITgYt073124 for ; Sun, 14 Aug 2005 18:29:42 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7EITf9T073121 for perforce@freebsd.org; Sun, 14 Aug 2005 18:29:41 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 14 Aug 2005 18:29:41 GMT Message-Id: <200508141829.j7EITf9T073121@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 81988 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, 14 Aug 2005 18:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=81988 Change 81988 by soc-victor@soc-victor_82.76.158.176 on 2005/08/14 18:28:58 Finished the SNMP instrumentation for hrSWInstalledTable. Also implemented the two scalars associated with this table: hrSWInstalledLastChange and hrSWInstalledLastUpdateTime. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#20 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#10 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#19 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#23 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#20 (text+ko) ==== ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#10 (text+ko) ==== @@ -603,3 +603,66 @@ } + +int op_hrSWInstalled(struct snmp_context *ctx __unused, + struct snmp_value *value __unused, + u_int sub, + u_int iidx __unused, + enum snmp_op curr_op ) +{ + /*only SNMP GET is possible*/ + switch (curr_op) { + case SNMP_OP_GET: + break; + case SNMP_OP_SET: + return (SNMP_ERR_NOT_WRITEABLE); + case SNMP_OP_ROLLBACK: + case SNMP_OP_COMMIT: + case SNMP_OP_GETNEXT: + default: { + assert(0); + return (SNMP_ERR_GENERR); + } + } + + switch (value->var.subs[sub - 1]) { + case LEAF_hrSWInstalledLastChange:{ + + if (hrState_g.hr_sw_installed_change_tick <= start_tick) { + value->v.uint32 = 0; + } else { + uint64_t lastChange = + hrState_g.hr_sw_installed_change_tick - start_tick; + + value->v.uint32 = ( lastChange > (uint64_t)UINT_MAX ? + UINT_MAX : + lastChange ); /*may overflow the SNMP type*/ + + } + + return (SNMP_ERR_NOERROR); + } + case LEAF_hrSWInstalledLastUpdateTime: { + if (hrState_g.hr_sw_installed_full_upd_tick <= start_tick) { + value->v.uint32 = 0; + } else { + uint64_t lastUpd = + hrState_g.hr_sw_installed_full_upd_tick - start_tick; + + value->v.uint32 = ( lastUpd > (uint64_t)UINT_MAX ? + UINT_MAX : + lastUpd ); /*may overflow the SNMP type*/ + + } + + return (SNMP_ERR_NOERROR); + } + default: + assert(0); + return (SNMP_ERR_NOSUCHNAME); + + }/*end switch*/ + +} + + ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#19 (text+ko) ==== @@ -214,6 +214,8 @@ hrState_g.hr_sw_installed_tick = 0; hrState_g.hr_sw_installed_change_tick = 0; hrState_g.hrSWInstalled_tbl_age = 0; + hrState_g.os_pkg_last_change = 0; + hrState_g.hr_sw_installed_full_upd_tick = 0; hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; @@ -347,7 +349,7 @@ hrState_g.hr_sw_installed_tick = 0; hrState_g.hr_sw_installed_change_tick = 0; hrState_g.hrSWInstalled_tbl_age = 0; - + hrState_g.os_pkg_last_change = 0; if (hrState_g.ata_fd > 0) { if (close(hrState_g.ata_fd) < 0) { @@ -365,6 +367,10 @@ if( host_registration_id > 0){ or_unregister(host_registration_id); } + + /*paranoia*/ + memset(&hrState_g, 0, sizeof(hrState_g)); + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); return (0); } @@ -500,14 +506,6 @@ -int op_hrSWInstalled(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#23 (text+ko) ==== @@ -385,6 +385,7 @@ int32_t type; /* one item from enum SWInstalledType, see above */ u_char date[11]; #define HR_SWINSTALLED_FOUND 0x001 +#define HR_SWINSTALLED_IMMUTABLE 0x002 /*next items are not from the SNMP mib table, only to be used internally*/ uint32_t flags; TAILQ_ENTRY(hrSWInstalledTblEntry) link; @@ -532,10 +533,12 @@ 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_tick; /*last (agent) tick when hrSWInstalledTable was updated */ uint64_t hr_sw_installed_change_tick; /*last (agent) tick when hrDeviceTable was last changed */ + uint64_t hr_sw_installed_full_upd_tick; /*last (agent) tick when hrDeviceTable was fully updated */ time_t hrSWInstalled_tbl_age; + time_t os_pkg_last_change; }; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 (text+ko) ==== @@ -41,6 +41,8 @@ #include #include #include +#include +#include extern u_char* OS_getSystemInitialLoadParameters(void); @@ -158,6 +160,9 @@ } +/* + * Get the *running* O/S identification + */ static void hrSWInstalled_get_OS_ident(void) { struct utsname os_id; @@ -169,8 +174,9 @@ if (uname(&os_id) != 0) { return; } - snprintf(os_string, sizeof(os_string) - 1, "%s %s %s", - os_id.sysname, os_id.release, os_id.version); + + snprintf(os_string, sizeof(os_string) - 1, "%s: %s", + os_id.sysname, os_id.version); entry = hrSWInstalledTblEntry_find_by_name(os_string); if (entry == NULL) { @@ -181,7 +187,7 @@ memset(&sb, 0, sizeof(sb)); - entry->flags |= HR_SWINSTALLED_FOUND; + entry->flags |= (HR_SWINSTALLED_FOUND | HR_SWINSTALLED_IMMUTABLE); entry->id = oid_zeroDotZero; entry->type= SWI_OPERATING_SYSTEM; memset(&entry->date[0], 0, sizeof(entry->date)); @@ -216,7 +222,151 @@ } } +static +void hrSWInstalled_get_packages(void) { +/* Where we put logging information by default, else ${PKG_DBDIR} if set */ +#define DEF_LOG_DIR "/var/db/pkg" +/* just in case we change the environment variable name */ +#define PKG_DBDIR "PKG_DBDIR" +/* macro to get name of directory where we put logging information */ +#define LOG_DIR (getenv(PKG_DBDIR) ? getenv(PKG_DBDIR) : DEF_LOG_DIR) +#define CONTENTS_FNAME "+CONTENTS" + char pkg_dir[PATH_MAX]; /*1024, for sure it's too much for this situation*/ + struct stat sb; + DIR *p_dir = NULL; + struct dirent dir_entry; + struct dirent *result = NULL; + int return_code = -1; + struct hrSWInstalledTblEntry *entry = NULL; + + memset(&pkg_dir[0], 0, sizeof(pkg_dir)); + memset(&sb, 0, sizeof(sb)); + + snprintf(pkg_dir, sizeof(pkg_dir) - 1, "%s", LOG_DIR); + if (stat(pkg_dir, &sb) != 0) { + syslog(LOG_ERR, "hrSWInstalledTable: stat(\"%s\") failed: %m ", pkg_dir); + return; + } + if (!S_ISDIR(sb.st_mode)) { + syslog(LOG_ERR, "hrSWInstalledTable: \"%s\" is not a directory! ", pkg_dir); + return; + } + if (sb.st_ctime <= hrState_g.os_pkg_last_change) { + HR_DPRINTF((stderr, "%s: no need to rescan installed packages, directory time-stamp unmodified \n ", + __func__)); + TAILQ_FOREACH(entry, &hrState_g.hr_sw_installed_tbl, link) + entry->flags |= HR_SWINSTALLED_FOUND; + return; + } + + + + p_dir = opendir(pkg_dir); + if (p_dir == NULL) { + syslog(LOG_ERR, "hrSWInstalledTable: opendir(\"%s\") failed: %m ", pkg_dir); + return; + } + + for (return_code = readdir_r(p_dir, &dir_entry, &result); + result != NULL && return_code == 0; + return_code = readdir_r(p_dir, &dir_entry, &result) ) { + + struct tm k_ts; + char pkg_file[PATH_MAX] = ""; + + + + HR_DPRINTF((stderr,">>pkg file: %s\n", dir_entry.d_name)); + if (strncmp(dir_entry.d_name, ".", 1) == 0 || + strncmp(dir_entry.d_name, "..", 2) == 0 || + strncmp(dir_entry.d_name,"pkgdb.db", 8) == 0 ) { + continue; + } + + + + snprintf(pkg_file, sizeof(pkg_file) - 1, "%s/%s/%s", + pkg_dir, + dir_entry.d_name, + CONTENTS_FNAME); + + + if (stat(pkg_file, &sb) != 0 ) { + continue; + } + if (!S_ISREG(sb.st_mode)) { + syslog(LOG_ERR, "hrSWInstalledTable: \"%s\" not a regular file, pkg. skipped ", pkg_file); + continue; + } + + entry = hrSWInstalledTblEntry_find_by_name(dir_entry.d_name); + if (entry == NULL) { + + if ((entry = hrSWInstalledTblEntry_create(dir_entry.d_name)) == NULL) { + goto PKG_LOOP_END; + } + + /*new entry, update the timestamp*/ + hrState_g.hr_sw_installed_change_tick = get_ticks(); + } + + memset(&sb, 0, sizeof(sb)); + memset(&pkg_file[0], 0, sizeof(pkg_file)); + + + entry->flags |= HR_SWINSTALLED_FOUND; + entry->id = oid_zeroDotZero; + entry->type= SWI_APPLICATION; + memset(&entry->date[0], 0, sizeof(entry->date)); + + snprintf(pkg_file, sizeof(pkg_file) - 1, "%s/%s", pkg_dir, dir_entry.d_name); + + + if(stat(pkg_file, &sb) == 0) { + if(localtime_r(&sb.st_ctime, &k_ts) != NULL) { + entry->date[0] = (u_char)((k_ts.tm_year + 1900) >> 8); + entry->date[1] = (u_char)(k_ts.tm_year + 1900); + entry->date[2] = k_ts.tm_mon + 1; + entry->date[3] = k_ts.tm_mday; + entry->date[4] = k_ts.tm_hour; + entry->date[5] = k_ts.tm_min; + entry->date[6] = k_ts.tm_sec; + entry->date[7] = 0; /*deci-seconds */ + + if (k_ts.tm_gmtoff < 0){ + entry->date[8] = '-'; + }else{ + entry->date[8] = '+'; + } + entry->date[9] = (u_char)(abs(k_ts.tm_gmtoff) / 3600); + entry->date[10] = (u_char)((abs(k_ts.tm_gmtoff) - entry->date[9] * 3600) / 60); + + } + } + + + + + + }/*end for*/ + + if (return_code != 0) { + syslog(LOG_ERR, "hrSWInstalledTable: readdir_r(\"%s\") failed: %m ", pkg_dir); + } else { + /*save the timestamp of directory + to avoid any further scanning*/ + hrState_g.os_pkg_last_change = sb.st_ctime; + } + +PKG_LOOP_END: + if ( p_dir != NULL ) { + closedir(p_dir); + } + + +} + void init_hrSWInstalled_tbl_v(void) { hrSWInstalled_get_OS_ident(); refresh_hrSWInstalled_tbl_v(); @@ -228,7 +378,7 @@ void refresh_hrSWInstalled_tbl_v(void) { struct hrSWInstalledTblEntry *entry = NULL, *entry_tmp; - if ( this_tick <= hrState_g.hr_fs_tick) { + if ( this_tick <= hrState_g.hr_sw_installed_tick) { HR_DPRINTF((stderr, "%s: no refresh needed\n ",__func__)); return; } @@ -239,13 +389,17 @@ entry->flags &= ~HR_SWINSTALLED_FOUND; - /*------------------------------------*/ + hrSWInstalled_get_packages(); entry = TAILQ_FIRST(&hrState_g.hr_sw_installed_tbl); while (entry != NULL) { entry_tmp = TAILQ_NEXT(entry, link); - if (!(entry->flags & HR_SWINSTALLED_FOUND)) + if (!(entry->flags & HR_SWINSTALLED_FOUND) && !(entry->flags & HR_SWINSTALLED_IMMUTABLE) ) { hrSWInstalledTblEntry_delete_v(entry); + /*entry deleted, update the timestamp*/ + hrState_g.hr_sw_installed_change_tick = get_ticks(); + + } entry = entry_tmp; } @@ -253,6 +407,7 @@ hrState_g.hrSWInstalled_tbl_age = time(NULL); + hrState_g.hr_sw_installed_full_upd_tick = get_ticks(); HR_DPRINTF((stderr, "%s: refresh DONE\n ",__func__)); @@ -267,7 +422,11 @@ { struct hrSWInstalledTblEntry *entry = NULL; int ret = SNMP_ERR_NOERROR; - + + if ( (time(NULL) - hrState_g.hrSWInstalled_tbl_age) > HR_SWINSTALLED_TBL_REFRESH ) { + HR_DPRINTF((stderr, "%s: need refresh\n ", __func__)); + refresh_hrSWInstalled_tbl_v(); + } switch (curr_op) { From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:18: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 2551716A421; Mon, 15 Aug 2005 01:18: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 C85B416A420 for ; Mon, 15 Aug 2005 01:18:08 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5C3243D69 for ; Mon, 15 Aug 2005 01:17:57 +0000 (GMT) (envelope-from murray@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 j7F1Hvmi003826 for ; Mon, 15 Aug 2005 01:17:57 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1Huw3003823 for perforce@freebsd.org; Mon, 15 Aug 2005 01:17:56 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:17:56 GMT Message-Id: <200508150117.j7F1Huw3003823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 81996 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, 15 Aug 2005 01:18:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=81996 Change 81996 by murray@murray_doc on 2005/08/15 01:16:57 Create new branch for DocBook slides / OpenOffice output work. Affected files ... .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/docbook_slides/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/docbook_slides/share/examples/add-manref.sh#1 branch .. //depot/projects/docbook_slides/share/examples/check-manref.sh#1 branch .. //depot/projects/docbook_slides/share/examples/vim/accents-sgml.vim#1 branch .. //depot/projects/docbook_slides/share/examples/vim/accents2sgml.pl#1 branch .. //depot/projects/docbook_slides/share/examples/vim/edit-sgml.vim#1 branch .. //depot/projects/docbook_slides/share/examples/vim/gvimrc-sample#1 branch .. //depot/projects/docbook_slides/share/examples/vim/sgml2accents.pl#1 branch .. //depot/projects/docbook_slides/share/images/articles/checkpoint/networks.pic#1 branch .. //depot/projects/docbook_slides/share/images/articles/console-server/tk0231-9-1.png#1 branch .. //depot/projects/docbook_slides/share/images/articles/releng/branches-head.pic#1 branch .. //depot/projects/docbook_slides/share/images/articles/releng/branches-releng3.pic#1 branch .. //depot/projects/docbook_slides/share/images/articles/releng/branches-releng4.pic#1 branch .. //depot/projects/docbook_slides/share/images/articles/releng/branches-releng5.pic#1 branch .. //depot/projects/docbook_slides/share/images/articles/vinum/ad0b4aft.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vinum/ad2b4aft.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vinum/arch.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vm-design/fig1.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vm-design/fig2.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vm-design/fig3.eps#1 branch .. //depot/projects/docbook_slides/share/images/articles/vm-design/fig4.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-01.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-02.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-03.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-04.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-05.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/corp-net-guide/08-06.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/design-44bsd/fig1.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/design-44bsd/fig2.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/branches.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/branches.sla#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/freebsd-code-model.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/hats-overview.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/maintenance.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/orghierarchy.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/orghierarchy.sla#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/orghierarchy2.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/portsstatus.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-add-committer.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-add-cvsup.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-commit.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-contrib.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-elections.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-pr.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-releng.png#1 branch .. //depot/projects/docbook_slides/share/images/books/dev-model/proc-rm-committer.png#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/layers.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/sain.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/sainfill.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/sainlsb.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/sainmsb.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/sainserv.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/serv.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/serv2.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/developers-handbook/sockets/slayers.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/advanced-networking/static-routes.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/geom/striping.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/adduser1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/adduser2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/adduser3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/boot-mgr.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/console-saver1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/console-saver2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/console-saver3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/console-saver4.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/desktop.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-auto.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-ed1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-ed2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-fs.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-root1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-root2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/disklabel-root3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/dist-set.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/dist-set2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/docmenu1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/ed0-conf.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/ed0-conf2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/edit-inetd-conf.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/fdisk-drive1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/fdisk-drive2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/fdisk-edit1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/fdisk-edit2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/ftp-anon1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/ftp-anon2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/hdwrconf.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/keymap.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/main-doc.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/main-keymap.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/main-options.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/main-std.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/main1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mainexit.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/media.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse4.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse5.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mouse6.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/mta-main.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/net-config-menu1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/net-config-menu2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/nfs-server-edit.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/ntp-config.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/options.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/pkg-cat.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/pkg-confirm.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/pkg-install.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/pkg-sel.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/probstart.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/routed.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/security.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/sysinstall-exit.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/timezone1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/timezone2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/timezone3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/userconfig.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/userconfig2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/install/xf86setup.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/mutt1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/mutt2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/mutt3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/pine1.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/pine2.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/pine3.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/pine4.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/mail/pine5.scr#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/security/ipsec-crypt-pkt.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/security/ipsec-encap-pkt.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/security/ipsec-network.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/security/ipsec-out-pkt.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-concat.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-raid10-vol.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-raid5-org.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-simple-vol.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-striped-vol.pic#1 branch .. //depot/projects/docbook_slides/share/images/books/handbook/vinum/vinum-striped.pic#1 branch .. //depot/projects/docbook_slides/share/images/callouts/1.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/10.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/11.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/12.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/13.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/14.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/15.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/2.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/3.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/4.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/5.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/6.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/7.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/8.png#1 branch .. //depot/projects/docbook_slides/share/images/callouts/9.png#1 branch .. //depot/projects/docbook_slides/share/images/flyer/beastie.eps#1 branch .. //depot/projects/docbook_slides/share/misc/docbook.css#1 branch .. //depot/projects/docbook_slides/share/misc/epsgeom#1 branch .. //depot/projects/docbook_slides/share/misc/indexreport.pl#1 branch .. //depot/projects/docbook_slides/share/mk/doc.common.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.docbook.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.html.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.images.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.install.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.project.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.slides.mk#1 branch .. //depot/projects/docbook_slides/share/mk/doc.subdir.mk#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/README#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ache.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/adamw.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/addkey.sh#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ahze.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ale.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/alex.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/anders.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/andreas.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/anholt.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/arun.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/arved.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/asami.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/avatar.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/barner.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ben.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/benno.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/billf.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/blackend.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bland.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bmah.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bms.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/brd.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/brian.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/brooks.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/brueffer.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bruno.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bsd.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/bz.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ceri.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/cjc.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/cjh.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/clement.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/clive.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/clsung.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/core-secretary.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/cshumway.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/daichi.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/damien.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/danfe.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dannyboy.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/das.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dcs.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dd.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/delphij.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/demon.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/den.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/des.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dfr.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dhartmei.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dinoex.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dougb.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/dwmalone.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/emax.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/erwin.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/fanf.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/fjoe.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/flz.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/foxfair.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/garga.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ghelmer.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/gioria.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/glebius.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/glewis.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/gnn.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/gordon.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/green.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/grehan.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/gshapiro.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/gsutter.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/guido.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/harti.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/hmp.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/hq.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/hrs.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ijliao.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/imp.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jcamou.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jdp.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jedgar.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jesper.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jhay.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jhb.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jim.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jkh.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jkim.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jkois.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jkoshy.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jmb.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jmg.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/joe.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/joerg.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jon.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/josef.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/jylefort.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ken.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/kensmith.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/keramida.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/keyring.pl#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/knu.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/krion.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/kris.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/kuriyama.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/kwm.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/lawrance.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/le.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/leeym.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/lesi.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/lioux.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/lofi.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/lth.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/luoqi.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/maho.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/marcel.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/marck.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/marcus.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/markp.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/marks.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/markus.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mat.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/matusita.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/max.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/maxim.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mbr.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/metal.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mheinen.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mi.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mich.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mikeh.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mlaier.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mp.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mtm.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/murray.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/mux.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nate.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nectar.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/netchild.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/niels.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nik.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/niklas.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nork.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/novel.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nsouch.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/nyan.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/obraun.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/obrien.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/patrick.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/paul.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/pav.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/peadar.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/perky.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/petef.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/peter.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/phantom.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/philip.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/phk.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/pirzyk.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/pjd.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/rees.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/remko.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/rich.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/rik.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/roam.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/roberto.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/rodrigc.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ru.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/rushani.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/sam.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/sanpei.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/schweikh.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/scop.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/scottl.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/seanc.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/security-officer.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/sergei.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/sheldonh.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/simon.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/sobomax.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ssouhlal.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/stefanf.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/stephane.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/thierry.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/thomas.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/thompsa.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/tmm.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/tobez.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/trevor.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/trhodes.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ue.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ume.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/ups.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/vanilla.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/viny.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/vkashyap.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/vs.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/vsevolod.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/wes.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/wilko.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/will.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/wollman.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/wosch.key#1 branch .. //depot/projects/docbook_slides/share/pgpkeys/yoichi.key#1 branch .. //depot/projects/docbook_slides/share/sgml/README.mirrors#1 branch .. //depot/projects/docbook_slides/share/sgml/articles.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/bibliography.sgml#1 branch .. //depot/projects/docbook_slides/share/sgml/books.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/catalog#1 branch .. //depot/projects/docbook_slides/share/sgml/default.dsl#1 branch .. //depot/projects/docbook_slides/share/sgml/freebsd.dsl#1 branch .. //depot/projects/docbook_slides/share/sgml/freebsd.dtd#1 branch .. //depot/projects/docbook_slides/share/sgml/freebsd.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/freebsd41.dtd#1 branch .. //depot/projects/docbook_slides/share/sgml/l10n.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/man-refs.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/man-refs.pl#1 branch .. //depot/projects/docbook_slides/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/docbook_slides/share/sgml/mirrors-master.xsl#1 branch .. //depot/projects/docbook_slides/share/sgml/mirrors.xml#1 branch .. //depot/projects/docbook_slides/share/sgml/pgp.dsl#1 branch .. //depot/projects/docbook_slides/share/sgml/spellcheck.dsl#1 branch .. //depot/projects/docbook_slides/share/sgml/trademarks.ent#1 branch .. //depot/projects/docbook_slides/share/sgml/transtable-common.xsl#1 branch .. //depot/projects/docbook_slides/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/docbook_slides/share/sgml/transtable-master.xsl#1 branch .. //depot/projects/docbook_slides/share/sgml/transtable.xml#1 branch .. //depot/projects/docbook_slides/share/sgml/urls.ent#1 branch .. //depot/projects/docbook_slides/share/web2c/pdftex.def#1 branch .. //depot/projects/docbook_slides/share/xsl/default.xsl#1 branch .. //depot/projects/docbook_slides/share/xsl/freebsd-common.xsl#1 branch .. //depot/projects/docbook_slides/share/xsl/freebsd-fo.xsl#1 branch .. //depot/projects/docbook_slides/share/xsl/freebsd-html-chunk.xsl#1 branch .. //depot/projects/docbook_slides/share/xsl/freebsd-html.xsl#1 branch .. //depot/projects/docbook_slides/share/xsl/freebsd.xsl#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:21: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 ECC0616A421; Mon, 15 Aug 2005 01:21:01 +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 AE46B16A41F for ; Mon, 15 Aug 2005 01:21:01 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79F2343D48 for ; Mon, 15 Aug 2005 01:21:01 +0000 (GMT) (envelope-from murray@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 j7F1L1I0003991 for ; Mon, 15 Aug 2005 01:21:01 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1L1kA003988 for perforce@freebsd.org; Mon, 15 Aug 2005 01:21:01 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:21:01 GMT Message-Id: <200508150121.j7F1L1kA003988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 81997 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, 15 Aug 2005 01:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=81997 Change 81997 by murray@murray_doc on 2005/08/15 01:20:13 Add OpenOffice.org template. This is the contents of an .sxi file uncompressed (it's just a .zip) with the content.xml file missing, as that will be generated from the XML content. This is the old BSDi slide template. Affected files ... .. //depot/projects/docbook_slides/share/openoffice/BSDi/META-INF/manifest.xml#1 add .. //depot/projects/docbook_slides/share/openoffice/BSDi/Pictures/10000000000004220000031AEAC840AF.png#1 add .. //depot/projects/docbook_slides/share/openoffice/BSDi/meta.xml#1 add .. //depot/projects/docbook_slides/share/openoffice/BSDi/mimetype#1 add .. //depot/projects/docbook_slides/share/openoffice/BSDi/settings.xml#1 add .. //depot/projects/docbook_slides/share/openoffice/BSDi/styles.xml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:22: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 D056416A421; Mon, 15 Aug 2005 01:22: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 8F94F16A41F for ; Mon, 15 Aug 2005 01:22:03 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49EBD43D45 for ; Mon, 15 Aug 2005 01:22:03 +0000 (GMT) (envelope-from murray@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 j7F1M35v004036 for ; Mon, 15 Aug 2005 01:22:03 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1M2Dm004033 for perforce@freebsd.org; Mon, 15 Aug 2005 01:22:02 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:22:02 GMT Message-Id: <200508150122.j7F1M2Dm004033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 81998 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, 15 Aug 2005 01:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=81998 Change 81998 by murray@murray_doc on 2005/08/15 01:22:01 Add nascent XSLT stylesheet to convert DocBook slides documents into OpenOffice XML files. Affected files ... .. //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#1 add .. //depot/projects/docbook_slides/share/openoffice/include.xsl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:24: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 91FB316A421; Mon, 15 Aug 2005 01:24: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 61CD316A41F for ; Mon, 15 Aug 2005 01:24:06 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E60643D45 for ; Mon, 15 Aug 2005 01:24:06 +0000 (GMT) (envelope-from murray@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 j7F1O6Kf004088 for ; Mon, 15 Aug 2005 01:24:06 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1O5tU004085 for perforce@freebsd.org; Mon, 15 Aug 2005 01:24:05 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:24:05 GMT Message-Id: <200508150124.j7F1O5tU004085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 81999 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, 15 Aug 2005 01:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=81999 Change 81999 by murray@murray_doc on 2005/08/15 01:23:51 Add Makefile support for .sxi format. Copy the template to OBJDIR, write a new content.xml file, and then zip it up as slides.sxi. Affected files ... .. //depot/projects/docbook_slides/share/mk/doc.slides.mk#2 edit Differences ... ==== //depot/projects/docbook_slides/share/mk/doc.slides.mk#2 (text+ko) ==== @@ -26,7 +26,7 @@ DOCBOOKSUFFIX?= xml MASTERDOC?= ${.CURDIR}/${DOC}.${DOCBOOKSUFFIX} -KNOWN_FORMATS= html pdf +KNOWN_FORMATS= html pdf sxi CSS_SHEET?= @@ -34,6 +34,9 @@ SLIDES_XSLHTML= ${SLIDES_XSLDIR}xhtml/default.xsl SLIDES_XSLPRINT?= ${SLIDES_XSLDIR}fo/plain.xsl +# Default OpenOffice.Org Template +TEMPLATE?= BSDi + # Loop through formats we should build. .for _curformat in ${FORMATS} _cf=${_curformat} @@ -51,6 +54,10 @@ .endif .endif +.if ${_cf} == "sxi" +CLEANDIRS+= sxi +.endif + .endfor XSLTPROCFLAGS?= --nonet --stringparam draft.mode no @@ -63,6 +70,11 @@ ${DOC}.html: ${SRCS} ${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLHTML} ${DOC}.xml +${DOC}.sxi: ${SRCS} + cp -Rp ${DOC_PREFIX}/share/openoffice/${TEMPLATE} sxi + ${XSLTPROC} ${XSLTPROCOPTS} ${DOC_PREFIX}/share/openoffice/${TEMPLATE}.xsl slides.xml > sxi/content.xml + (cd sxi; zip -r ../${DOC}.sxi .) + ${DOC}.fo: ${SRCS} .if defined(USE_SAXON) ${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$/.fo/} From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:43: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 7A6D816A421; Mon, 15 Aug 2005 01:43: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 2D41816A41F for ; Mon, 15 Aug 2005 01:43:30 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFD4343D45 for ; Mon, 15 Aug 2005 01:43:29 +0000 (GMT) (envelope-from murray@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 j7F1hT9m004766 for ; Mon, 15 Aug 2005 01:43:29 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1hTxm004763 for perforce@freebsd.org; Mon, 15 Aug 2005 01:43:29 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:43:29 GMT Message-Id: <200508150143.j7F1hTxm004763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 82000 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, 15 Aug 2005 01:43:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=82000 Change 82000 by murray@murray_doc on 2005/08/15 01:42:51 Add better XPath expression to select text and element nodes other than itemizedlists so we can indent properly for nested lists. Also add more robust template to print href if there is no text in the body of the element. Affected files ... .. //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#2 edit Differences ... ==== //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#2 (text+ko) ==== @@ -453,7 +453,7 @@ - + @@ -462,7 +462,16 @@ - + + + + + + + + + + From owner-p4-projects@FreeBSD.ORG Mon Aug 15 01:58: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 529D016A421; Mon, 15 Aug 2005 01:58: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 0DCC216A41F for ; Mon, 15 Aug 2005 01:58:49 +0000 (GMT) (envelope-from murray@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFE3943D46 for ; Mon, 15 Aug 2005 01:58:48 +0000 (GMT) (envelope-from murray@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 j7F1wm0v005276 for ; Mon, 15 Aug 2005 01:58:48 GMT (envelope-from murray@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F1wmtF005273 for perforce@freebsd.org; Mon, 15 Aug 2005 01:58:48 GMT (envelope-from murray@freebsd.org) Date: Mon, 15 Aug 2005 01:58:48 GMT Message-Id: <200508150158.j7F1wmtF005273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to murray@freebsd.org using -f From: Murray Stokely To: Perforce Change Reviews Cc: Subject: PERFORCE change 82001 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, 15 Aug 2005 01:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=82001 Change 82001 by murray@murray_doc on 2005/08/15 01:58:23 Remove superfluous comments. Add para template to properly setup paragraphs when used as top level elements in a . Affected files ... .. //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#3 edit Differences ... ==== //depot/projects/docbook_slides/share/openoffice/BSDi.xsl#3 (text+ko) ==== @@ -418,6 +418,8 @@ + + @@ -451,12 +453,9 @@ - - - @@ -474,6 +473,19 @@ + + + + + + + + + + + + +