From owner-p4-projects@FreeBSD.ORG Sun Jul 8 02:12:25 2007 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 36C2116A468; Sun, 8 Jul 2007 02:12:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E416016A400 for ; Sun, 8 Jul 2007 02:12:24 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D0E8913C45D for ; Sun, 8 Jul 2007 02:12:24 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l682COO1006690 for ; Sun, 8 Jul 2007 02:12:24 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l682CLB0006684 for perforce@freebsd.org; Sun, 8 Jul 2007 02:12:21 GMT (envelope-from delphij@freebsd.org) Date: Sun, 8 Jul 2007 02:12:21 GMT Message-Id: <200707080212.l682CLB0006684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123079 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, 08 Jul 2007 02:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=123079 Change 123079 by delphij@charlie on 2007/07/08 02:11:51 IFC Affected files ... .. //depot/projects/delphij_fork/ObsoleteFiles.inc#2 integrate .. //depot/projects/delphij_fork/UPDATING#2 integrate .. //depot/projects/delphij_fork/bin/sh/var.c#2 integrate .. //depot/projects/delphij_fork/etc/inetd.conf#2 integrate .. //depot/projects/delphij_fork/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/delphij_fork/include/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/main.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test.h#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/delphij_fork/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/SYS.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/pread.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/delphij_fork/lib/libgssapi/gss_display_status.c#2 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/delphij_fork/sbin/ping6/Makefile#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/FAQ#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/Overview#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/delphij_fork/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/delphij_fork/sys/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/delphij_fork/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#2 integrate .. //depot/projects/delphij_fork/sys/conf/files#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.amd64#2 integrate .. //depot/projects/delphij_fork/sys/conf/files.i386#2 integrate .. //depot/projects/delphij_fork/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/delphij_fork/sys/conf/options#2 integrate .. //depot/projects/delphij_fork/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/re/if_re.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/rp/rp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/snp/snp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/umass.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/delphij_fork/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_isppp.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/delphij_fork/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/delphij_fork/sys/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/delphij_fork/sys/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/delphij_fork/sys/kern/init_sysent.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_conf.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_sx.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/delphij_fork/sys/kern/sys_generic.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/syscalls.master#2 integrate .. //depot/projects/delphij_fork/sys/kern/systrace_args.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/tty_pts.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/delphij_fork/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/delphij_fork/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/delphij_fork/sys/net/if_lagg.c#2 integrate .. //depot/projects/delphij_fork/sys/net/if_lagg.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/dest6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/frag6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/mld6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/route6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/scope6.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/delphij_fork/sys/opencrypto/cast.c#2 integrate .. //depot/projects/delphij_fork/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/delphij_fork/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/delphij_fork/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/delphij_fork/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/delphij_fork/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sys/param.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/sx.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/syscall.mk#2 integrate .. //depot/projects/delphij_fork/sys/sys/sysproto.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_fault.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/regress.icase1.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/regress.icase2.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/regress.icase3.out#1 branch .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/delphij_fork/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/sed/compile.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/sed/defs.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/sed/sed.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdnd/isdnd.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdnd/isdnd.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdndebug/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdndecode/decode.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdnphone/defs.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdntel/defs.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdntelctl/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdntest/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/isdntrace/trace.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/man/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/i4b/man/i4b.4#2 integrate .. //depot/projects/delphij_fork/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/ppp/i4b.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/rrenumd/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/traceroute6/Makefile#2 integrate Differences ... ==== //depot/projects/delphij_fork/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.102 2007/07/03 13:06:45 mlaier Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070705: I4B headers repo-copied to include/i4b/ +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/i4b_cause.h +OLD_FILES+=usr/include/machine/i4b_debug.h +OLD_FILES+=usr/include/machine/i4b_ioctl.h +OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h +OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h +OLD_FILES+=usr/include/machine/i4b_trace.h +.endif +# 20070704: I4B 'modules' temporary disconnected +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i4bing.4.gz +OLD_FILES+=usr/share/man/man4/i4bipr.4.gz +OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz +.endif # 20070703: pf 4.1 import OLD_FILES+=usr/libexec/ftp-proxy # 20070701: KAME IPSec removal ==== //depot/projects/delphij_fork/UPDATING#2 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20070704: + The new IPsec code is now compiled in using the IPSEC option. The + IPSEC option now requires "device crypto" be defined in your kernel + configuration. The FAST_IPSEC kernel option is now deprecated. + 20070702: The packet filter (pf) code has been updated to OpenBSD 4.1 Please note the changed syntax - keep state is now on by default. Also @@ -41,6 +46,11 @@ cards should be configured using ifconfig(8), see the man page for more information. +20060612: + The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver + instead of the nve(4) driver. Please update your configuration + accordingly. + 20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If @@ -877,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.500 2007/07/03 13:06:44 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.502 2007/07/06 06:35:50 yongari Exp $ ==== //depot/projects/delphij_fork/bin/sh/var.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $"); #include #include @@ -278,6 +278,30 @@ return 0; } + +/* + * Sets/unsets an environment variable from a pointer that may actually be a + * pointer into environ where the string should not be manipulated. + */ +static void +change_env(char *s, int set) +{ + char *eqp; + char *ss; + + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + if (set && eqp != NULL) + (void) setenv(ss, eqp + 1, 1); + else + (void) unsetenv(ss); + ckfree(ss); + + return; +} + + /* * Same as setvar except that the variable and value are passed in * the first argument as name=value. Since the first argument will @@ -289,7 +313,6 @@ setvareq(char *s, int flags) { struct var *vp, **vpp; - char *p; int len; if (aflag) @@ -320,10 +343,7 @@ if (vp == &vmpath || (vp == &vmail && ! mpathset())) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -339,10 +359,7 @@ INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -603,10 +620,7 @@ vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - p = strchr(vp->text, '='); - *p = '\0'; - (void) setenv(vp->text, p + 1, 1); - *p = '='; + change_env(vp->text, 1); (void) setlocale(LC_ALL, ""); } goto found; @@ -798,7 +812,7 @@ if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + change_env(s, 0); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; ==== //depot/projects/delphij_fork/etc/inetd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.72 2006/08/31 17:15:10 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.73 2007/07/05 09:46:53 delphij Exp $ # # Internet server configuration database # @@ -118,9 +118,3 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat -# -# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf -# N.B.: inetd binds to * in the default installation so you should add -# an appropriate block rule to your pf.conf -# -#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/delphij_fork/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.116 2007/07/01 12:08:05 gnn Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.117 2007/07/06 07:20:59 bz Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -183,6 +183,8 @@ .. gssapi .. + i4b + .. isofs cd9660 .. ==== //depot/projects/delphij_fork/include/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.272 2007/07/01 12:08:05 gnn Exp $ +# $FreeBSD: src/include/Makefile,v 1.273 2007/07/06 07:20:59 bz Exp $ # # Doing a "make install" builds /usr/include. @@ -26,6 +26,9 @@ ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ wctype.h wordexp.h +I4BHDRS=i4b_cause.h i4b_debug.h i4b_ioctl.h i4b_rbch_ioctl.h \ + i4b_tel_ioctl.h i4b_trace.h + MHDRS= float.h floatingpoint.h stdarg.h PHDRS= sched.h semaphore.h _semaphore.h @@ -175,6 +178,13 @@ cd ${.CURDIR}/../sys/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \ ${DESTDIR}${INCLUDEDIR}/crypto +.if ${MACHINE_ARCH} == "i386" +.if ${MK_I4B} != "no" + cd ${.CURDIR}/../sys/i4b/include; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${I4BHDRS} \ + ${DESTDIR}${INCLUDEDIR}/i4b +.endif +.endif cd ${.CURDIR}/../sys/opencrypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto @@ -256,6 +266,11 @@ ln -fs ../../../sys/crypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done + cd ${.CURDIR}/../sys/i4b/include; \ + for h in ${I4BHDRS}; do \ + ln -fs ../../../sys/i4b/include/$$h \ + ${DESTDIR}${INCLUDEDIR}/i4b; \ + done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ ln -fs ../../../sys/opencrypto/$$h \ ==== //depot/projects/delphij_fork/lib/libarchive/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.75 2007/07/07 16:55:42 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -13,7 +13,12 @@ ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' +ARCHIVE_API_REV!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/.*\.//' +# Can't use /usr/bin/printf to format the version stamp here, because +# that's not available during installworld. Fortunately, awk is. +ARCHIVE_VERSION_STAMP!= echo ${ARCHIVE_API_MAJOR} ${ARCHIVE_API_MINOR} ${ARCHIVE_API_REV} | awk '{printf("%d%03d%03d",$$1,$$2,$$3)}' + # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the version number above. SHLIB_MAJOR= 4 @@ -31,13 +36,14 @@ # Build archive.h from archive.h.in by substituting version information. # Note: FreeBSD has inttypes.h, so enable that include in archive.h.in archive.h: archive.h.in Makefile - cat ${.CURDIR}/archive.h.in | \ - sed 's/@ARCHIVE_VERSION@/${VERSION}/g' | \ - sed 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' | \ - sed 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' | \ - sed 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' | \ - sed 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include /* For int64_t */|g' | \ - cat > archive.h + cat ${.CURDIR}/archive.h.in | sed \ + -e 's/@ARCHIVE_VERSION@/${VERSION}/g' \ + -e 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' \ + -e 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' \ + -e 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' \ + -e 's/@ARCHIVE_VERSION_STAMP@/${ARCHIVE_VERSION_STAMP}/g' \ + -e 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include /* For int64_t */|g' \ + > archive.h # archive.h needs to be cleaned CLEANFILES+= archive.h ==== //depot/projects/delphij_fork/lib/libarchive/archive.h.in#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.46 2007/07/06 15:36:37 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -50,31 +50,68 @@ extern "C" { #endif +/* + * Each of the version identifiers comes as a macro and a function. + * The macro identifies the installed header; the function identifies + * the library version (which may not be the same if you're using a + * dynamically-linked version of the library). + */ + +/* + * Textual name/version of the library, useful for version displays. + */ +#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" +const char * archive_version(void); /* - * If ARCHIVE_API_VERSION != archive_api_version(), then the library you - * were linked with is using an incompatible API to the one you were - * compiled with. This is almost certainly a fatal problem. + * Major version number: If ARCHIVE_API_VERSION != + * archive_api_version(), then the library you were linked with is + * using an incompatible API to the one you were compiled with. This + * is almost certainly a fatal problem. + */ +#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@ +int archive_api_version(void); + +/* + * Minor version number: ARCHIVE_API_FEATURE is incremented with each + * significant feature addition, so you can test (at compile or run + * time) if a particular feature is implemented. It's no big deal if + * ARCHIVE_API_FEATURE != archive_api_feature(), as long as both are + * high enough to include the features you're relying on. Specific + * values of FEATURE are documented here: * - * ARCHIVE_API_FEATURE is incremented with each significant feature - * addition, so you can test (at compile or run time) if a particular - * feature is implemented. It's no big deal if ARCHIVE_API_FEATURE != - * archive_api_feature(), as long as both are high enough to include - * the features you're relying on. Specific values of FEATURE are - * documented here: - * * 1 - Version tests are available. * 2 - archive_{read,write}_close available separately from _finish. * 3 - open_memory, open_memory2, open_FILE, open_fd available * 5 - archive_write_disk interface available + * + * Unfortunately, this count resets whenever ARCHIVE_API_VERSION changes, + * making it awkward to use in practice. For that reason, it is deprecated + * in favor of the more-accurate version stamp below. It will eventually + * be removed. */ -#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@ -int archive_api_version(void); #define ARCHIVE_API_FEATURE @ARCHIVE_API_MINOR@ int archive_api_feature(void); -/* Textual name/version of the library. */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" -const char * archive_version(void); + +/* + * The "version stamp" is a single integer that makes it easy to check + * the exact version: for version a.b.c, the version stamp is + * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has + * version stamp 2012108. + * + * This was introduced with libarchive 1.9.0 in the libarchive 1.x family + * and libarchive 2.2.4 in the libarchive 2.x family. The following + * may be useful if you really want to do feature detection for earlier + * libarchive versions: + * + * #ifndef ARCHIVE_VERSION_STAMP + * #define ARCHIVE_VERSION_STAMP \ + * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) + * #endif + */ +#define ARCHIVE_VERSION_STAMP @ARCHIVE_VERSION_STAMP@ +int archive_version_stamp(void); + #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 ==== //depot/projects/delphij_fork/lib/libarchive/archive_read_open_memory.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.4 2007/04/02 00:25:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $"); #include #include @@ -134,7 +134,7 @@ struct read_memory_data *mine = (struct read_memory_data *)client_data; (void)a; /* UNUSED */ - if (skip > mine->end - mine->buffer) + if ((off_t)skip > (off_t)(mine->end - mine->buffer)) skip = mine->end - mine->buffer; /* Round down to block size. */ skip /= mine->read_size; ==== //depot/projects/delphij_fork/lib/libarchive/archive_util.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.14 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.15 2007/07/06 15:36:38 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -51,6 +51,12 @@ return (ARCHIVE_API_VERSION); } +int +archive_version_stamp(void) +{ + return (ARCHIVE_VERSION_STAMP); +} + const char * archive_version(void) { ==== //depot/projects/delphij_fork/lib/libarchive/test/main.c#2 (text+ko) ==== @@ -32,14 +32,16 @@ #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.4 2007/06/13 03:30:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.5 2007/07/06 15:43:11 kientzle Exp $"); /* Default is to crash and try to force a core dump on failure. */ static int dump_on_failure = 1; /* Default is to print some basic information about each test. */ static int quiet_flag = 0; -/* Cumulative count of failures. */ +/* Cumulative count of component failures. */ static int failures = 0; +/* Cumulative count of skipped component tests. */ +static int skips = 0; /* * My own implementation of the standard assert() macro emits the @@ -59,6 +61,19 @@ static char msg[4096]; +/* Inform user that we're skipping a test. */ +void +skipping(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, " *** SKIPPING: "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + ++skips; +} + /* Common handling of failed tests. */ static void test_failed(struct archive *a) @@ -202,7 +217,7 @@ exit(1); } (*tests[i].func)(); - return (failures - failures_before); + return (failures == failures_before ? 0 : 1); } static void usage(void) @@ -226,7 +241,7 @@ int main(int argc, char **argv) { static const int limit = sizeof(tests) / sizeof(tests[0]); - int i, tests_run = 0, tests_succeeded = 0, opt; + int i, tests_run = 0, tests_failed = 0, opt; time_t now; char tmpdir[256]; @@ -266,13 +281,16 @@ exit(1); } - printf("Running libarchive tests in: %s\n", tmpdir); + if (!quiet_flag) { + printf("Running libarchive tests in: %s\n", tmpdir); + printf("Exercising %s\n", archive_version()); + } if (argc == 0) { /* Default: Run all tests. */ for (i = 0; i < limit; i++) { - if (test_run(i, tmpdir) == 0) - tests_succeeded++; + if (test_run(i, tmpdir)) + tests_failed++; tests_run++; } } else { @@ -282,13 +300,16 @@ printf("*** INVALID Test %s\n", *argv); usage(); } else { - if (test_run(i, tmpdir) == 0) - tests_succeeded++; + if (test_run(i, tmpdir)) + tests_failed++; tests_run++; } } } - - printf("%d of %d tests succeeded.\n", tests_succeeded, tests_run); - return (tests_succeeded == tests_run ? 0 : 1); + printf("\n"); + printf("%d of %d test groups reported failures\n", + tests_failed, tests_run); + printf(" Total of %d individual tests failed.\n", failures); + printf(" Total of %d individual tests were skipped.\n", skips); + return (tests_failed); } ==== //depot/projects/delphij_fork/lib/libarchive/test/test.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/test/test.h,v 1.3 2007/05/29 01:00:20 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/test/test.h,v 1.4 2007/07/06 15:43:11 kientzle Exp $ */ /* Every test program should #include "test.h" as the first thing. */ @@ -69,6 +69,18 @@ #endif /* + * ARCHIVE_VERSION_STAMP first appeared in 1.9 and libarchive 2.2.4. + * We can approximate it for earlier versions, though. + * This is used to disable tests of features not present in the current + * version. + */ +#ifndef ARCHIVE_VERSION_STAMP +#define ARCHIVE_VERSION_STAMP \ + (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) +#endif + + +/* * "list.h" is simply created by "grep DEFINE_TEST"; it has * a line like * DEFINE_TEST(test_function) @@ -106,6 +118,7 @@ /* Function declarations. These are defined in test_utility.c. */ void failure(const char *fmt, ...); +void skipping(const char *fmt, ...); void test_assert(const char *, int, int, const char *, struct archive *); void test_assert_equal_int(const char *, int, int, const char *, int, const char *, struct archive *); void test_assert_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, struct archive *); ==== //depot/projects/delphij_fork/lib/libarchive/test/test_acl_basic.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -165,7 +165,12 @@ assert(matched == 1); } } +#if ARCHIVE_VERSION_STAMP < 1009000 + /* Known broken before 1.9.0. */ + skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); +#else assertEqualInt(ARCHIVE_EOF, r); +#endif assert((mode & 0777) == (archive_entry_mode(ae) & 0777)); failure("Could not find match for ACL " "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')", ==== //depot/projects/delphij_fork/lib/libarchive/test/test_acl_pax.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -390,7 +390,12 @@ assert(matched == 1); } } +#if ARCHIVE_VERSION_STAMP < 1009000 + /* Known broken before 1.9.0. */ + skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); +#else assertEqualInt(ARCHIVE_EOF, r); +#endif assert((mode & 0777) == (archive_entry_mode(ae) & 0777)); failure("Could not find match for ACL " "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')", ==== //depot/projects/delphij_fork/lib/libarchive/test/test_archive_api_feature.c#2 (text+ko) ==== @@ -23,11 +23,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.2 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $"); DEFINE_TEST(test_archive_api_feature) { assertEqualInt(ARCHIVE_API_FEATURE, archive_api_feature()); assertEqualInt(ARCHIVE_API_VERSION, archive_api_version()); + /* + * Even though ARCHIVE_VERSION_STAMP only appears in + * archive.h after 1.9.0 and 2.2.3, the macro is synthesized + * in test.h, so this test is always valid. + */ + assertEqualInt(ARCHIVE_VERSION_STAMP / 1000, ARCHIVE_API_VERSION * 1000 + ARCHIVE_API_FEATURE); + /* + * The function, however, isn't always available. It appeared + * sometime in the middle of 2.2.3, but the synthesized value + * never has a release version, so the following conditional + * exactly determines whether the current library has the + * function. + */ +#if ARCHIVE_VERSION_STAMP / 1000 == 1009 || ARCHIVE_VERSION_STAMP > 2002000 + assertEqualInt(ARCHIVE_VERSION_STAMP, archive_version_stamp()); +#else + skipping("archive_version_stamp()"); +#endif assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version()); } ==== //depot/projects/delphij_fork/lib/libarchive/test/test_entry.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.1 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $"); /* * Most of these tests are system-independent, though a few depend on @@ -49,6 +49,7 @@ const char *xname; /* For xattr tests. */ const void *xval; /* For xattr tests. */ size_t xsize; /* For xattr tests. */ + int c; assert((e = archive_entry_new()) != NULL); @@ -72,13 +73,21 @@ archive_entry_set_ctime(e, 13580, 24681); assertEqualInt(archive_entry_ctime(e), 13580); assertEqualInt(archive_entry_ctime_nsec(e), 24681); +#if ARCHIVE_VERSION_STAMP >= 1009000 /* dev */ archive_entry_set_dev(e, 235); assertEqualInt(archive_entry_dev(e), 235); +#else + skipping("archive_entry_dev()"); +#endif /* devmajor/devminor are tested specially below. */ +#if ARCHIVE_VERSION_STAMP >= 1009000 /* filetype */ archive_entry_set_filetype(e, AE_IFREG); assertEqualInt(archive_entry_filetype(e), AE_IFREG); +#else + skipping("archive_entry_filetype()"); +#endif /* fflags are tested specially below */ /* gid */ archive_entry_set_gid(e, 204); @@ -104,9 +113,13 @@ assertEqualWString(archive_entry_hardlink_w(e), L"whardlink"); memset(wbuff, 0, sizeof(wbuff)); assertEqualWString(archive_entry_hardlink_w(e), L"whardlink"); +#if ARCHIVE_VERSION_STAMP >= 1009000 /* ino */ archive_entry_set_ino(e, 8593); assertEqualInt(archive_entry_ino(e), 8593); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 8 02:23:40 2007 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 D8C3516A468; Sun, 8 Jul 2007 02:23:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88F6E16A400 for ; Sun, 8 Jul 2007 02:23:39 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 771A113C4BE for ; Sun, 8 Jul 2007 02:23:39 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l682NdhX007408 for ; Sun, 8 Jul 2007 02:23:39 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l682NdLv007405 for perforce@freebsd.org; Sun, 8 Jul 2007 02:23:39 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 8 Jul 2007 02:23:39 GMT Message-Id: <200707080223.l682NdLv007405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 123080 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, 08 Jul 2007 02:23:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123080 Change 123080 by thompsa@thompsa_heff on 2007/07/08 02:22:52 Change ipw_setcurchan() to take a channel pointer. Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#20 (text+ko) ==== @@ -989,18 +989,11 @@ * Set driver state for current channel. */ static void -ipw_setcurchan(struct ipw_softc *sc, int chan) +ipw_setcurchan(struct ipw_softc *sc, struct ieee80211_channel *chan) { struct ieee80211com *ic = &sc->sc_ic; - if (chan == sc->curchan) - return; - - ic->ic_curchan = ieee80211_find_channel(ic, - ieee80211_ieee2mhz(chan, 0), - IEEE80211_CHAN_B); - sc->curchan = chan; - + ic->ic_curchan = chan; sc->sc_rxtap.wr_chan_freq = sc->sc_txtap.wt_chan_freq = htole16(ic->ic_curchan->ic_freq); sc->sc_rxtap.wr_chan_flags = sc->sc_txtap.wt_chan_flags = @@ -1015,6 +1008,8 @@ static void ipw_fix_channel(struct ipw_softc *sc, struct mbuf *m) { + struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_channel *c; struct ieee80211_frame *wh; uint8_t subtype; uint8_t *frm, *efrm; @@ -1035,11 +1030,18 @@ frm += 12; /* skip tstamp, bintval and capinfo fields */ while (frm < efrm) { - if (*frm == IEEE80211_ELEMID_DSPARMS) + if (*frm == IEEE80211_ELEMID_DSPARMS #if IEEE80211_CHAN_MAX < 255 - if (frm[2] <= IEEE80211_CHAN_MAX) + && frm[2] <= IEEE80211_CHAN_MAX #endif - ipw_setcurchan(sc, frm[2]); + ) { + c = ieee80211_find_channel(ic, + ieee80211_ieee2mhz(frm[2], 0), + IEEE80211_CHAN_B); + if (c == NULL) + c = &ic->ic_channels[0]; + ipw_setcurchan(sc, c); + } frm += frm[1] + 2; } @@ -1947,7 +1949,7 @@ static int ipw_setssid(struct ipw_softc *sc, void *ssid, size_t ssidlen) { - if (ssid == NULL) { + if (ssidlen == 0) { /* * A bug in the firmware breaks the ``don't associate'' * bit in the scan options command. To compensate for @@ -1983,7 +1985,7 @@ DPRINTF(("Setting channel to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_CHANNEL, &data, sizeof data); if (error == 0) - ipw_setcurchan(sc, le32toh(data)); + ipw_setcurchan(sc, chan); return error; } From owner-p4-projects@FreeBSD.ORG Sun Jul 8 02:31:50 2007 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 9224116A469; Sun, 8 Jul 2007 02:31:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60A9C16A41F for ; Sun, 8 Jul 2007 02:31:50 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE6E13C465 for ; Sun, 8 Jul 2007 02:31:50 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l682VoiC007972 for ; Sun, 8 Jul 2007 02:31:50 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l682VnM5007969 for perforce@freebsd.org; Sun, 8 Jul 2007 02:31:49 GMT (envelope-from delphij@freebsd.org) Date: Sun, 8 Jul 2007 02:31:49 GMT Message-Id: <200707080231.l682VnM5007969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123081 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, 08 Jul 2007 02:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123081 Change 123081 by delphij@charlie on 2007/07/08 02:31:13 skeljail - make use of nullfs(5) to simplify jail creation and management. Affected files ... .. //depot/projects/delphij_fork/Makefile#2 edit .. //depot/projects/delphij_fork/Makefile.inc1#2 edit .. //depot/projects/delphij_fork/etc/defaults/rc.conf#2 edit .. //depot/projects/delphij_fork/etc/rc.d/jail#2 edit Differences ... ==== //depot/projects/delphij_fork/Makefile#2 (text+ko) ==== @@ -9,6 +9,8 @@ # upgrades. # installworld - Install everything built by "buildworld". # world - buildworld + installworld, no kernel. +# installskel - Install directory structure and minimal set of files +# which is suitable for a skeleton jail. # buildkernel - Rebuild the kernel and the kernel-modules. # installkernel - Install the kernel and the kernel-modules. # installkernel.debug @@ -82,6 +84,7 @@ depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ + installskel \ installworld kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ @@ -93,6 +96,7 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} TGTS+= ${BITGTS} +.ORDER: buildworld installskel .ORDER: buildworld installworld .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel ==== //depot/projects/delphij_fork/Makefile.inc1#2 (text+ko) ==== @@ -586,6 +586,17 @@ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} +# installskel +# +# Installs a minimum set of files that can support a mini-jail +# +installskel: + @echo "--------------------------------------------------------------" + @echo ">>> Making installskel" + @echo "--------------------------------------------------------------" + {_+_}cd ${.CURDIR}; ${MAKE} hierarchy + {_+_}cd ${.CURDIR}/etc; ${MAKE} distribution + # # reinstall # ==== //depot/projects/delphij_fork/etc/defaults/rc.conf#2 (text+ko) ==== @@ -23,6 +23,15 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. +rc_fancy="NO" # Enables fancy messages for rc scripts. YES|NO|COLOR +rc_fancy_verbose="YES" # Enables fancy boot messages on system rc scripts +rc_fancy_msg_failed="FAILED" # Sets fancy word for 'failed' script. +rc_fancy_msg_error="ERROR" # Sets fancy word for scripts that errored. +rc_fancy_msg_skipped="SKIPPED" # Sets fancy word for scripts skipped. +rc_fancy_msg_ok="OK" # Sets fancy word for scripts that started ok. +rc_fancy_msg_width="8" # Max width for fancy message. +rc_fancy_cols="80" # Default columns on display + rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know @@ -570,6 +579,7 @@ ### Jail Configuration ####################################### ############################################################## jail_enable="NO" # Set to NO to disable starting of any jails +jail_skel_enable="NO" # Set to NO to disable skeleton jail by default jail_list="" # Space separated list of names of jails jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail @@ -599,6 +609,11 @@ #jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail #jail_example_fstab="" # fstab(5) for mount/umount #jail_example_flags="-l -U root" # flags for jail(8) +#jail_example_skel_enable="NO" # Whether to use skeleton jail +#jail_example_skel_root="/" # Mount jail from this template +#jail_example_skel_romounts="bin sbin lib libexec usr/bin usr/sbin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/share usr/ports" # Mount these directories read-only into jail +#jail_example_skel_rwmounts="" # Mount these directories read-write into jail + ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/delphij_fork/etc/rc.d/jail#2 (text+ko) ==== @@ -78,6 +78,16 @@ eval _consolelog=\"\${jail_${_j}_consolelog:-${jail_consolelog}}\" [ -z "${_consolelog}" ] && _consolelog="/var/log/jail_${_j}_console.log" + # Default settings for skel jail + eval _skel_enable=\"\${jail_${_j}_skel_enable:-${jail_skel_enable}}\" + [ -z "${_skel_enable}" ] && _skel_enable="NO" + eval _skel_root=\"\${jail_${_j}_skel_root:-${jail_skel_root}}\" + [ -z "${_skel_root}" ] && _skel_root="/" + eval _skel_romounts=\"\${jail_${_j}_skel_romounts:-${jail_skel_romounts}}\" + [ -z "${_skel_romounts}" ] && _skel_romounts="bin sbin lib libexec usr/bin usr/sbin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/share" + eval _skel_rwmounts=\"\${jail_${_j}_skel_rwmounts:-${jail_skel_rwmounts}}\" + [ -z "${_skel_rwmounts}" ] && _skel_rwmounts="usr/ports" + # Debugging aid # debug "$_j devfs enable: $_devfs" @@ -111,6 +121,10 @@ debug "$_j exec stop: $_exec_stop" debug "$_j flags: $_flags" debug "$_j consolelog: $_consolelog" + debug "$_j skel enable: $_skel_enable" + debug "$_j skel mount-readonly: $_skel_romounts" + debug "$_j skel mount-readwrite: $_skel_rwmounts" + debug "$_j skel mount skeleton from: $_skel_root" if [ -z "${_hostname}" ]; then err 3 "$name: No hostname has been defined for ${_j}" @@ -236,6 +250,14 @@ secure_umount ${_mountpt} done fi + if checkyesno _skel_enable; then + for _mntpt in ${_skel_romounts} ${_skel_rwmounts} + do + if [ -d "${_rootdir}/${_mntpt}" ] ; then + umount -f ${_rootdir}/${_mntpt} > /dev/null 2>&1 + fi + done + fi } # jail_mount_fstab() @@ -298,6 +320,17 @@ fi jail_mount_fstab fi + if checkyesno _skel_enable; then + info "Mounting skeleton for jail ${_jail} from ${_skel_root}" + for _mntpt in $_skel_romounts + do + mount_nullfs -ordonly ${_skel_root}/${_mntpt} ${_rootdir}/${_mntpt} > /dev/null 2>&1 + done + for _mntpt in $_skel_rwmounts + do + mount_nullfs ${_skel_root}/${_mntpt} ${_rootdir}/${_mntpt} > /dev/null 2>&1 + done + fi if checkyesno _devfs; then # If devfs is already mounted here, skip it. df -t devfs "${_devdir}" >/dev/null From owner-p4-projects@FreeBSD.ORG Sun Jul 8 02:34:55 2007 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 E33CD16A46B; Sun, 8 Jul 2007 02:34:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A384816A468 for ; Sun, 8 Jul 2007 02:34:54 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 915C713C458 for ; Sun, 8 Jul 2007 02:34:54 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l682Ysr9008141 for ; Sun, 8 Jul 2007 02:34:54 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l682YsV6008138 for perforce@freebsd.org; Sun, 8 Jul 2007 02:34:54 GMT (envelope-from delphij@freebsd.org) Date: Sun, 8 Jul 2007 02:34:54 GMT Message-Id: <200707080234.l682YsV6008138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123082 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, 08 Jul 2007 02:34:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=123082 Change 123082 by delphij@charlie on 2007/07/08 02:34:04 Oops, doesn't belong to this tree. Affected files ... .. //depot/projects/delphij_fork/etc/defaults/rc.conf#3 edit Differences ... ==== //depot/projects/delphij_fork/etc/defaults/rc.conf#3 (text+ko) ==== @@ -23,14 +23,6 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. -rc_fancy="NO" # Enables fancy messages for rc scripts. YES|NO|COLOR -rc_fancy_verbose="YES" # Enables fancy boot messages on system rc scripts -rc_fancy_msg_failed="FAILED" # Sets fancy word for 'failed' script. -rc_fancy_msg_error="ERROR" # Sets fancy word for scripts that errored. -rc_fancy_msg_skipped="SKIPPED" # Sets fancy word for scripts skipped. -rc_fancy_msg_ok="OK" # Sets fancy word for scripts that started ok. -rc_fancy_msg_width="8" # Max width for fancy message. -rc_fancy_cols="80" # Default columns on display rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late From owner-p4-projects@FreeBSD.ORG Sun Jul 8 04:43:41 2007 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 175A016A421; Sun, 8 Jul 2007 04:43:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9132416A468 for ; Sun, 8 Jul 2007 04:43:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7EA2813C45D for ; Sun, 8 Jul 2007 04:43:40 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l684he1O020853 for ; Sun, 8 Jul 2007 04:43:40 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l684he6P020850 for perforce@freebsd.org; Sun, 8 Jul 2007 04:43:40 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 8 Jul 2007 04:43:40 GMT Message-Id: <200707080443.l684he6P020850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 123084 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, 08 Jul 2007 04:43:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123084 Change 123084 by sephe@sephe_zealot:sam_wifi on 2007/07/08 04:43:02 Correct off-by-one bug when padding beacon's country ie. This should fix the problem that 11b STA can't associate with non-pureG 11g hostap. Sample beacon before this commit: 1 11:34:58.036277 Beacon (sephe-test) ESS CH: 6 2 0x0000: 8000 0000 ffff ffff ffff 0011 95ca 9a37 3 0x0010: 0011 95ca 9a37 200d 8151 5faf 0000 0000 4 0x0020: 6400 2104 000a 7365 7068 652d 7465 7374 5 0x0030: 0108 8284 8b96 0c12 1824 0301 0605 0400 6 0x0040: 0100 0007 044e 414f 2a01 0032 0430 4860 7 0x0050: 6c Let's take a look at line 6: vvvvv 0100 0007 044e 414f 2a01 0032 0430 4860 ^^^^^ 1) "2a01 00" in above line is ERP ie. 2) At position masked by "vvvvv", country ie is claimed to be 4bytes. It is actually 3 bytes, padding byte is missing. 3) STA is tricked into thinking country is 4 bytes and position marked by "^^^^^" is the start of next ie. 4) Position marked by "^^^^^" is unfortunately the supported rate set ie, but has 0 length. Since it is after the real supported rate set ie on line 5, STA will take this one as the supported rate set ie, then the supported rate ie saved at STA side is actually empty. 5) Ie at the position after "^^^^^" is a well formatted extended rate set ie. 6) Now STA will only have rates containd in extended rate set as AP's rate set. For a 11b STA, it will not even try to auth with the AP. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#7 (text+ko) ==== @@ -182,8 +182,10 @@ } } ie->len = frm - ie->cc; - if (ie->len & 1) /* pad to multiple of 2 */ + if (ie->len & 1) { /* Zero pad to multiple of 2 */ ie->len++; + *frm++ = 0; + } return frm; #undef CHAN_UNINTERESTING } From owner-p4-projects@FreeBSD.ORG Sun Jul 8 05:54:10 2007 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 35CC916A46D; Sun, 8 Jul 2007 05:54:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D675516A46B for ; Sun, 8 Jul 2007 05:54:09 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C31E413C480 for ; Sun, 8 Jul 2007 05:54:09 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l685s9JP037457 for ; Sun, 8 Jul 2007 05:54:09 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l685s9DB037453 for perforce@freebsd.org; Sun, 8 Jul 2007 05:54:09 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 05:54:09 GMT Message-Id: <200707080554.l685s9DB037453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123086 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, 08 Jul 2007 05:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123086 Change 123086 by andrew@andrew_hermies on 2007/07/08 05:53:54 When reading past the end of an array return NULL rather then failing an assert Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#6 (text+ko) ==== @@ -288,7 +288,8 @@ assert(obj != NULL); assert(obj->obj_type == FACUND_ARRAY); assert(obj->obj_assigned == 1); - assert(pos < obj->obj_array_count); + if (pos >= obj->obj_array_count) + return NULL; obj->obj_error = FACUND_OBJECT_ERROR_NONE; return obj->obj_array[pos]; From owner-p4-projects@FreeBSD.ORG Sun Jul 8 05:56:13 2007 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 42B2516A469; Sun, 8 Jul 2007 05:56:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED0E516A41F for ; Sun, 8 Jul 2007 05:56:12 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA1AE13C448 for ; Sun, 8 Jul 2007 05:56:12 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l685uCH1037595 for ; Sun, 8 Jul 2007 05:56:12 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l685uCcW037591 for perforce@freebsd.org; Sun, 8 Jul 2007 05:56:12 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 05:56:12 GMT Message-Id: <200707080556.l685uCcW037591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123087 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, 08 Jul 2007 05:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=123087 Change 123087 by andrew@andrew_hermies on 2007/07/08 05:55:39 Correct a for loop to actually loop through the items rather then geting stuck in an infinite loop Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#11 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#11 (text+ko) ==== @@ -301,8 +301,9 @@ facund_object_print(obj); break; case FACUND_ARRAY: - for (pos = 0, cur = facund_object_get_array_item(obj, pos); - cur != NULL; pos++) { + for (pos = 0; + (cur = facund_object_get_array_item(obj, pos)) != NULL; + pos++) { facund_object_print(__DECONST(struct facund_object *, cur)); } break; From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:03:23 2007 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 C833616A46B; Sun, 8 Jul 2007 06:03:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F79716A421 for ; Sun, 8 Jul 2007 06:03:22 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4C60C13C458 for ; Sun, 8 Jul 2007 06:03:22 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6863Mux039264 for ; Sun, 8 Jul 2007 06:03:22 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6863LIc039261 for perforce@freebsd.org; Sun, 8 Jul 2007 06:03:21 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:03:21 GMT Message-Id: <200707080603.l6863LIc039261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123088 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, 08 Jul 2007 06:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=123088 Change 123088 by andrew@andrew_hermies on 2007/07/08 06:03:12 When processing a call allow any children to set the response when they find bad data. Handle incorrect attributes in the call processing code Don't use a fixed size string when the element is unknown Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#6 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#10 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_private.h#6 (text+ko) ==== @@ -68,6 +68,7 @@ char current_call[32]; char call_id[8]; struct facund_object *call_arg; + struct facund_response *resp; }; #endif /* FACUND_PRIVATE_H */ ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ #define BUF_SIZE 128 -static void facund_server_call(struct facund_conn *, const char *,const char *, +static struct facund_response *facund_server_call(const char *, const char *, struct facund_object *); static void facund_server_start_tag(void *, const XML_Char *, const XML_Char**); static void facund_server_end_tag(void *, const XML_Char *); @@ -124,11 +124,9 @@ /* * Calls the correct function for the given call */ -static void -facund_server_call(struct facund_conn *conn, const char *name, const char *id, - struct facund_object *arg) +static struct facund_response * +facund_server_call(const char *name, const char *id, struct facund_object *arg) { - const char *msg; struct facund_response *resp; facund_call_cb *cb; DBT key, data; @@ -145,15 +143,17 @@ cb = *(facund_call_cb **)data.data; assert(cb != NULL); resp = cb(id, arg); - + if (resp == NULL) { + /* TODO: Remove Magic Number */ + resp = facund_response_new(id, 1, + "Method returned an invalid response", NULL); + } } else { - /* TODO: send a bad request response */ + /* TODO: Remove Magic Number */ + resp = facund_response_new(id, 1, "Invalid request", NULL); } - msg = facund_response_string(resp); - if (msg != NULL) { - facund_send(conn, msg, strlen(msg)); - } + return resp; } /* @@ -187,7 +187,7 @@ const XML_Char **attrs) { struct facund_conn *conn; - char str[1024]; + char *str; printf("> %s\n", name); conn = data; @@ -195,37 +195,58 @@ if (conn->current_call[0] == '\0' && strcmp(name, "call") == 0) { unsigned int i; const char *call_name, *id; + + assert(conn->resp == NULL); + if (attrs == NULL) { - /* TODO: Return an error */ + conn->resp = facund_response_new(NULL, + RESP_NO_ATTRIBUTE, + "No call attributes were sent", NULL); return; } call_name = id = NULL; for (i = 0; attrs[i] != NULL && attrs[i+1] != NULL; i += 2) { if (strcmp(attrs[i], "name") == 0) { - if (call_name != NULL) { - /* TODO: Return an error */ - return; + if (call_name != NULL && conn->resp == NULL) { + conn->resp = facund_response_new(NULL, + RESP_REPEATED_ATTRIBUTE, + "Call name was set multiple times", + NULL); } call_name = attrs[i + 1]; } else if (strcmp(attrs[i], "id") == 0) { - if (id != NULL) { - /* TODO: Return an error */ - return; + if (id != NULL && conn->resp == NULL) { + /* TODO: Don't use a magic number */ + conn->resp = facund_response_new(NULL, + RESP_REPEATED_ATTRIBUTE, + "Call ID was set multiple times", + NULL); } id = attrs[i + 1]; - } else { - /* TODO: Return an error */ - return; + } else if (conn->resp == NULL) { + /* + * This is entered when there is + * an unknown attribute sent and + * no other errors have occured. + */ + conn->resp = facund_response_new(NULL, + RESP_UNKNOWN_ATTRIBUTE, + "Unknown attribute was sent", NULL); } } strlcpy(conn->current_call, call_name, sizeof(conn->current_call)); strlcpy(conn->call_id, id, sizeof(conn->call_id)); + + /* Attempt to set the ID if it can be */ + facund_response_set_id(conn->resp, id); } else if (strcmp(name, "data") == 0) { struct facund_object *obj; if (attrs == NULL) { - /* TODO: Return an error */ + conn->resp = facund_response_new(NULL, + RESP_NO_ATTRIBUTE, + "No data attributes were sent", NULL); return; } obj = NULL; @@ -247,8 +268,11 @@ } else if (strcmp(name, "facund-client") == 0) { /* Pass */ } else { - snprintf(str, 1024, "", name); + asprintf(&str, "", name); + if (str == NULL) + return; facund_send(conn, str, strlen(str)); + free(str); } } @@ -261,8 +285,24 @@ conn = data; if (strcmp(name, "call") == 0) { - facund_server_call(conn, conn->current_call, conn->call_id, - conn->call_arg); + const char *msg; + struct facund_response *resp; + + if (conn->resp != NULL) { + resp = conn->resp; + conn->resp = NULL; + } else { + resp = facund_server_call(conn->current_call, + conn->call_id, conn->call_arg); + } + + /* Get the response string and send it to the client */ + msg = facund_response_string(resp); + if (msg != NULL) { + facund_send(conn, msg, strlen(msg)); + } + facund_response_free(resp); + conn->current_call[0] = '\0'; conn->call_id[0] = '\0'; facund_object_free(conn->call_arg); From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:08:29 2007 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 5E49016A469; Sun, 8 Jul 2007 06:08:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 321E516A421 for ; Sun, 8 Jul 2007 06:08:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1E4FD13C448 for ; Sun, 8 Jul 2007 06:08:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6868Tho039574 for ; Sun, 8 Jul 2007 06:08:29 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6868SAm039571 for perforce@freebsd.org; Sun, 8 Jul 2007 06:08:28 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:08:28 GMT Message-Id: <200707080608.l6868SAm039571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123089 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, 08 Jul 2007 06:08:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=123089 Change 123089 by andrew@andrew_hermies on 2007/07/08 06:07:50 Add classes to handle facund objects Add a class to be used for calls Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/call.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/data.py#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/data.py#2 (text+ko) ==== @@ -28,7 +28,7 @@ #TODO: Create an exception class(es) for bad data, etc -class Object(object): +class Object: def __init__(self, type): self.__parent = None self.__data = None @@ -54,18 +54,22 @@ return self.__data class Bool(Object): - def __init__(self): + def __init__(self, data = None): Object.__init__(self, "bool") + if data is not None: + self.setData(data) def setData(self, data): data = str(data).lower() Object.setData(self, data == 'true') class Int(Object): - def __init__(self): + def __init__(self, data = None): Object.__init__(self, "int") self.__min = (-0x7fffffff-1) self.__max = (0x7fffffff) + if data is not None: + self.setData(data) def setData(self, data): data = int(data) @@ -74,10 +78,12 @@ Object.setData(self, int(data)) class UnsignedInt(Object): - def __init__(self): + def __init__(self, data = None): Object.__init__(self, "unsigned int") self.__min = 0 self.__max = (0xffffffff) + if data is not None: + self.setData(data) def setData(self, data): data = int(data) @@ -86,8 +92,10 @@ Object.setData(self, int(data)) class String(Object): - def __init__(self): + def __init__(self, data = None): Object.__init__(self, "string") + if data is not None: + self.setData(data) def setData(self, data): Object.setData(self, str(data)) From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:24:50 2007 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 225AB16A46C; Sun, 8 Jul 2007 06:24:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7B9F16A400 for ; Sun, 8 Jul 2007 06:24:49 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B498013C4B9 for ; Sun, 8 Jul 2007 06:24:49 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l686OnfG040800 for ; Sun, 8 Jul 2007 06:24:49 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l686OnPk040797 for perforce@freebsd.org; Sun, 8 Jul 2007 06:24:49 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:24:49 GMT Message-Id: <200707080624.l686OnPk040797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123090 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, 08 Jul 2007 06:24:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123090 Change 123090 by andrew@andrew_hermies on 2007/07/08 06:24:02 Add a Directory class to define a base directory within a computer Allow calls to be sent to the back end Fix a typo Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#3 (text+ko) ==== @@ -28,6 +28,20 @@ import facund.network import threading +class Directory: + def __init__(self, name, computer): + self.__name = name + self.__computer = computer + + def getName(self): + return self.__name + + def getCommands(self): + return self.__computer.getCommands(self.__name) + + def runCommand(self, position): + return self.__computer.runCommand(position, self.__name) + class Computer(threading.Thread): '''A class to describe each computer able to be connected to''' def __init__(self, name, host): @@ -37,13 +51,14 @@ self.__dirs = [] self.__connected = False self.__connection = None + self.__commands = ['Avaliable', 'Downloaded', 'Installed'] def __str__(self): return self.__name + ": " + self.__host def addDir(self, dir): '''Adds a directory to the avaliable directories to update''' - self.__dirs.append(dir) + self.__dirs.append(facund.Directory(dir, self)) def getConnectionStatus(self): '''Returns the connection state''' @@ -54,13 +69,35 @@ return self.__dirs def getName(self): - '''Returns the Human redable name for the computer''' + '''Returns the Human readable name for the computer''' return self.__name def getHost(self): '''Returns the hostname/ip of the computer''' return self.__host + def getCommands(self, dir): + return self.__commands + + def runCommand(self, command, dir = None): + print self.__commands[command] + if self.__commands[command] == 'Avaliable': + return self.getUpdateList(dir) + else: + print 'TODO: Handle this command (%d)' % (command,); + + def getUpdateList(self, dir = None): + if dir is None: + for dir in self.__dirs: + args = None + else: + args = facund.Array() + args.append(facund.String("base")) + args.append(facund.String(dir)) + + call = facund.Call("list_updates", args) + self.__connection.doCall(call) + def connect(self): '''Connects to the remote computer''' if self.__connection is not None: From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:33:01 2007 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 1A69D16A47F; Sun, 8 Jul 2007 06:33:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C500516A468 for ; Sun, 8 Jul 2007 06:33:00 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B1C5C13C489 for ; Sun, 8 Jul 2007 06:33:00 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l686X0Ix041394 for ; Sun, 8 Jul 2007 06:33:00 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l686X0Ak041385 for perforce@freebsd.org; Sun, 8 Jul 2007 06:33:00 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:33:00 GMT Message-Id: <200707080633.l686X0Ak041385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123091 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, 08 Jul 2007 06:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123091 Change 123091 by andrew@andrew_hermies on 2007/07/08 06:32:47 Implement doCall in the network code to send a call to the server Clean up the data from a response Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#7 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#7 (text+ko) ==== @@ -64,6 +64,10 @@ self.parser.close() + def doCall(self, call): + self.socket.send(call.getCall()) + + def interact(self): '''Reads data from the connection and passes it to the XML parser''' @@ -112,6 +116,8 @@ elif name == "response": print str(self.__data) + del self.__data + self.__data = None elif name == "facund-server": # The server sent a close message From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:40:10 2007 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 6922316A468; Sun, 8 Jul 2007 06:40:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2113116A41F for ; Sun, 8 Jul 2007 06:40:10 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0D92E13C458 for ; Sun, 8 Jul 2007 06:40:10 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l686e9UU041816 for ; Sun, 8 Jul 2007 06:40:09 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l686e9qC041812 for perforce@freebsd.org; Sun, 8 Jul 2007 06:40:09 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:40:09 GMT Message-Id: <200707080640.l686e9qC041812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123092 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, 08 Jul 2007 06:40:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123092 Change 123092 by andrew@andrew_hermies on 2007/07/08 06:39:39 Add a controller to sit between the computer model and the gui Create a method to populate the children of a computer when connected or remove them Allow the controller to be set in the frontend Move the connected logic from the gui to the controller Move the handler used when an item is selected from the tree view to the controller Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund.py#7 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#6 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/controller.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#5 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#7 (text+ko) ==== @@ -40,10 +40,12 @@ if __name__ == "__main__": model = facund.gui.ComputerTreeModel() localComputer = facund.Computer("Local computer", '/tmp/facund') + localComputer.addDir('/') model.addComputer(localComputer) mainWindow = facund.gui.MainWindow('facund-fe.glade') - mainWindow.setComputerTreeModel(model) + + controller = facund.Controller(model, mainWindow); - mainWindow.run() + controller.run() ==== //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#6 (text+ko) ==== @@ -24,7 +24,9 @@ # SUCH DAMAGE. # -from computer import Computer +from call import * +from computer import * +from controller import * from data import * __all__ = ["gui", "network"] ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#5 (text+ko) ==== @@ -34,6 +34,7 @@ gtk.TreeStore.__init__(self, gobject.TYPE_STRING) self.__computers = {} + self.__iterators = {} def addComputer(self, computer): '''Adds a computer to the computer tree view''' @@ -47,11 +48,23 @@ # Add the computer iter = self.append(None) self.set(iter, 0, computer_name) + self.__iterators[computer] = iter + self.populateComputer(computer) - # Add the children - for dir in computer.getDirs(): - child_iter = self.append(iter) - self.set(child_iter, 0, dir) + def populateComputer(self, computer): + if computer.getConnectionStatus(): + # Add the directories + iter = self.__iterators[computer] + for dir in computer.getDirs(): + dir_iter = self.append(iter) + self.set(dir_iter, 0, dir.getName()) + # Add the commands for each directory + for command in dir.getCommands(): + command_iter = self.append(dir_iter) + self.set(command_iter, 0, command) + else: + pass + def getComputer(self, position): '''Returns the computer at the given position in the tree''' ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#5 (text+ko) ==== @@ -39,6 +39,9 @@ self.__widget = self.__xml.get_widget('facundWindow') self.__widget.connect('destroy', lambda *w: gtk.main_quit()) + def setController(self, controller): + self.__controller = controller + def setComputerTreeModel(self, model): '''Sets the model to use to for the computer tree''' self.__computerTreeModel = model @@ -63,32 +66,26 @@ connectedButton.set_sensitive(not connected) disconnectedButton.set_sensitive(connected) - def __getCurrentComputer(self, treeView): - '''Finds the currently selected computer''' - cursor = treeView.get_cursor() - position = cursor[0][0] - computer = self.__computerTreeModel.getComputer(position) - return computer - def onConnectClick(self, widget): '''Signal handler for the connect button''' treeView = self.__xml.get_widget('computerView') - computer = self.__getCurrentComputer(treeView) + computer = self.__controller.getCurrentComputer() computer.connect() self.setConnected(computer.getConnectionStatus()) + self.__computerTreeModel.populateComputer(computer) def onDisconnectClick(self, widget): '''Signal handler for the connect button''' treeView = self.__xml.get_widget('computerView') - computer = self.__getCurrentComputer(treeView) + computer = self.__controller.getCurrentComputer() computer.disconnect() self.setConnected(computer.getConnectionStatus()) + self.__computerTreeModel.populateComputer(computer) def onSelectComputer(self, widget): '''Signal handler for when the selected item is changed''' - computer = self.__getCurrentComputer(widget) - # Marke the computer as (dis)connected - self.setConnected(computer.getConnectionStatus()) + cursor = widget.get_cursor() + self.__controller.onComputerTreeSelect(cursor[0]) def run(self): '''Displays the main window. Does't return''' From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:01:55 2007 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 D74C916A46D; Sun, 8 Jul 2007 08:01:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 809A716A469 for ; Sun, 8 Jul 2007 08:01:54 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7061413C487 for ; Sun, 8 Jul 2007 08:01:54 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6881sx4048541 for ; Sun, 8 Jul 2007 08:01:54 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6881rI8048534 for perforce@freebsd.org; Sun, 8 Jul 2007 08:01:53 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 8 Jul 2007 08:01:53 GMT Message-Id: <200707080801.l6881rI8048534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123095 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, 08 Jul 2007 08:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=123095 Change 123095 by chub@chub-msdosfs on 2007/07/08 08:01:09 Changed bootsector declarations so that individual entities in the BPB and Extended bootsector can actually be addressed. Updated msdosfs vfs code to account for this change. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#3 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bpb.h#2 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/msdosfs_vfsops.c#2 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#3 (text+ko) ==== @@ -1,6 +1,9 @@ /* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.13 2005/09/29 14:09:46 peadar Exp $ */ /* $NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $ */ +#ifndef _FS_MSDOSFS_BOOTSECT_H +#define _FS_MSDOSFS_BOOTSECT_H + /*- * Written by Paul Popelka (paulp@uts.amdahl.com) * @@ -17,6 +20,8 @@ * October 1992 */ +#include + /* * Format of a boot sector. This is the first sector on a DOS floppy disk * or the fist sector of a partition on a hard disk. But, it is not the @@ -25,7 +30,8 @@ struct bootsector33 { u_int8_t bsJump[3]; /* jump inst E9xxxx or EBxx90 */ int8_t bsOemName[8]; /* OEM name and version */ - int8_t bsBPB[19]; /* BIOS parameter block */ + // int8_t bsBPB[19]; /* BIOS parameter block */ + struct bpb33 bsBPB; /* BIOS parameter block */ int8_t bsDriveNumber; /* drive number (0x80) */ int8_t bsBootCode[479]; /* pad so struct is 512b */ u_int8_t bsBootSectSig0; @@ -34,10 +40,20 @@ #define BOOTSIG1 0xaa }; +#define EXBOOTSIG 0x29 struct extboot { int8_t exDriveNumber; /* drive number (0x80) */ int8_t exReserved1; /* reserved */ int8_t exBootSignature; /* ext. boot signature (0x29) */ + u_int32_t exVolumeID; /* volume ID number */ + int8_t exVolumeLabel[11]; /* volume label */ + int8_t exFileSysType[8]; /* fs type (FAT12 or FAT16) */ +}; + +struct byte_extboot { + int8_t exDriveNumber; /* drive number (0x80) */ + int8_t exReserved1; /* reserved */ + int8_t exBootSignature; /* ext. boot signature (0x29) */ #define EXBOOTSIG 0x29 int8_t exVolumeID[4]; /* volume ID number */ int8_t exVolumeLabel[11]; /* volume label */ @@ -47,8 +63,8 @@ struct bootsector50 { u_int8_t bsJump[3]; /* jump inst E9xxxx or EBxx90 */ int8_t bsOemName[8]; /* OEM name and version */ - int8_t bsBPB[25]; /* BIOS parameter block */ - int8_t bsExt[26]; /* Bootsector Extension */ + struct bpb50 bsBPB; /* BIOS parameter block */ + struct extboot bsExt; /* Bootsector Extension */ int8_t bsBootCode[448]; /* pad so structure is 512b */ u_int8_t bsBootSectSig0; u_int8_t bsBootSectSig1; @@ -59,8 +75,8 @@ struct bootsector710 { u_int8_t bsJump[3]; /* jump inst E9xxxx or EBxx90 */ int8_t bsOEMName[8]; /* OEM name and version */ - int8_t bsBPB[53]; /* BIOS parameter block */ - int8_t bsExt[26]; /* Bootsector Extension */ + struct bpb710 bsBPB; /* BIOS parameter block */ + struct extboot bsExt; /* Bootsector Extension */ int8_t bsBootCode[420]; /* pad so structure is 512b */ u_int8_t bsBootSectSig0; u_int8_t bsBootSectSig1; @@ -73,3 +89,6 @@ struct bootsector50 bs50; struct bootsector710 bs710; }; + +#endif +// _FS_MSDOSFS_BOOTSECT_H ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bpb.h#2 (text+ko) ==== @@ -1,6 +1,9 @@ /* $FreeBSD: src/sys/fs/msdosfs/bpb.h,v 1.15 2007/01/05 05:28:57 rodrigc Exp $ */ /* $NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $ */ +#ifndef _FS_MSDOSFS_BPB_H +#define _FS_MSDOSFS_BPB_H + /*- * Written by Paul Popelka (paulp@uts.amdahl.com) * @@ -78,7 +81,7 @@ u_int32_t bpbRootClust; /* start cluster for root directory */ u_int16_t bpbFSInfo; /* filesystem info structure sector */ u_int16_t bpbBackup; /* backup boot sector */ - /* There is a 12 byte filler here, but we ignore it */ + u_int8_t bpbReserved[12]; /* 12 byte filler here */ }; /* @@ -153,7 +156,7 @@ u_int8_t bpbRootClust[4]; /* start cluster for root directory */ u_int8_t bpbFSInfo[2]; /* filesystem info structure sector */ u_int8_t bpbBackup[2]; /* backup boot sector */ - /* There is a 12 byte filler here, but we ignore it */ + u_int8_t bpbReserved[12]; /* 12 byte filler here */ }; /* @@ -170,3 +173,6 @@ u_int8_t fsifill3[508]; u_int8_t fsisig4[4]; }; + +#endif +// _FS_MSDOSFS_BPB_H ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/msdosfs_vfsops.c#2 (text+ko) ==== @@ -430,9 +430,9 @@ goto error_exit; bp->b_flags |= B_AGE; bsp = (union bootsector *)bp->b_data; - b33 = (struct byte_bpb33 *)bsp->bs33.bsBPB; - b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB; - b710 = (struct byte_bpb710 *)bsp->bs710.bsBPB; + b33 = (struct byte_bpb33 *)&bsp->bs33.bsBPB; + b50 = (struct byte_bpb50 *)&bsp->bs50.bsBPB; + b710 = (struct byte_bpb710 *)&bsp->bs710.bsBPB; #ifndef MSDOSFS_NOCHECKSIG if (bsp->bs50.bsBootSectSig0 != BOOTSIG0 @@ -487,7 +487,6 @@ /* XXX - We should probably check more values here */ if (!pmp->pm_BytesPerSec || !SecPerClust - || !pmp->pm_Heads #ifdef PC98 || !pmp->pm_SecPerTrack || pmp->pm_SecPerTrack > 255) { #else From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:03:58 2007 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 1FCBD16A46B; Sun, 8 Jul 2007 08:03:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C003E16A41F for ; Sun, 8 Jul 2007 08:03:57 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 977EC13C468 for ; Sun, 8 Jul 2007 08:03:57 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6883vXW049831 for ; Sun, 8 Jul 2007 08:03:57 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6883v2u049828 for perforce@freebsd.org; Sun, 8 Jul 2007 08:03:57 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 8 Jul 2007 08:03:57 GMT Message-Id: <200707080803.l6883v2u049828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123096 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, 08 Jul 2007 08:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123096 Change 123096 by chub@chub-msdosfs on 2007/07/08 08:03:16 Killed the endianness macros; using (get|put)u(long|short) defines and le(16|32)(dec|enc) functions to deal with the conversions instead. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#3 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#3 (text+ko) ==== @@ -44,14 +44,7 @@ #define G_LABEL_MSDOSFS_DIR "msdosfs" #define LABEL_NO_NAME "NO NAME " -/* - * Conversion macros for little endian encoded unsigned integers - * in byte streams to the local unsigned integer format. - */ #include -#define UINT16BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1]))) -#define UINT32BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1]) + \ - (65536*(p)[2]) + (16777216*(p)[3]))) static void g_label_msdosfs_taste(struct g_consumer *cp, char *label, size_t size) @@ -107,7 +100,7 @@ /* * Test if this is really a FAT volume and determine the FAT type. */ - if (UINT16BYTES(pfat_bpb50->bpbFATsecs) != 0) { + if (getushort(pfat_bpb50->bpbFATsecs) != 0) { /* The extended boot record is one place for FAT12/FAT16 * and another for FAT32. */ @@ -141,7 +134,7 @@ strlcpy(label, pfat_extboot->exVolumeLabel, MIN(size, sizeof(pfat_extboot->exVolumeLabel) + 1)); } - else if (UINT32BYTES(pfat_bpb710->bpbBigFATsecs) != 0) { + else if (getulong(pfat_bpb710->bpbBigFATsecs) != 0) { uint32_t fat_FirstDataSector, fat_BytesPerSector, offset; /* The extended boot record is one place for FAT12/FAT16 @@ -180,10 +173,10 @@ * the root directory. */ fat_FirstDataSector = - UINT16BYTES(pfat_bpb710->bpbResSectors) + + getushort(pfat_bpb710->bpbResSectors) + (pfat_bpb710->bpbFATs * - UINT32BYTES(pfat_bpb710->bpbBigFATsecs)); - fat_BytesPerSector = UINT16BYTES(pfat_bpb710->bpbBytesPerSec); + getulong(pfat_bpb710->bpbBigFATsecs)); + fat_BytesPerSector = getushort(pfat_bpb710->bpbBytesPerSec); G_LABEL_DEBUG(2, "MSDOSFS: FAT_FirstDataSector=0x%x, FAT_BytesPerSector=%d", From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:06:01 2007 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 1D52916A46B; Sun, 8 Jul 2007 08:06:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCEF516A421 for ; Sun, 8 Jul 2007 08:06:00 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ACF0913C4B8 for ; Sun, 8 Jul 2007 08:06:00 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68860GN049961 for ; Sun, 8 Jul 2007 08:06:00 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68860Wq049956 for perforce@freebsd.org; Sun, 8 Jul 2007 08:06:00 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 8 Jul 2007 08:06:00 GMT Message-Id: <200707080806.l68860Wq049956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123097 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, 08 Jul 2007 08:06:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123097 Change 123097 by chub@chub-msdosfs on 2007/07/08 08:05:55 Removes an unused field in bootsector. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/dosfs.h#2 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/dosfs.h#2 (text+ko) ==== @@ -52,7 +52,6 @@ u_int FATs; /* number of FATs */ u_int RootDirEnts; /* number of root directory entries */ u_int Media; /* media descriptor */ - u_int FATsmall; /* number of sectors per FAT */ u_int SecPerTrack; /* sectors per track */ u_int Heads; /* number of heads */ u_int32_t Sectors; /* total number of sectors */ From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:29:31 2007 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 73A4516A46D; Sun, 8 Jul 2007 08:29:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43DBE16A41F for ; Sun, 8 Jul 2007 08:29:31 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 310C813C4AD for ; Sun, 8 Jul 2007 08:29:31 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l688TVsY051797 for ; Sun, 8 Jul 2007 08:29:31 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l688TUHi051794 for perforce@freebsd.org; Sun, 8 Jul 2007 08:29:30 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 8 Jul 2007 08:29:30 GMT Message-Id: <200707080829.l688TUHi051794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123099 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, 08 Jul 2007 08:29:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=123099 Change 123099 by chub@chub-msdosfs on 2007/07/08 08:28:50 fsck_msdosfs's loading of the bootsector now uses the unified headers in fs/sys/msdosfs instead of hard coding offsets to variables. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/boot.c#2 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/boot.c#2 (text+ko) ==== @@ -30,8 +30,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include -#include #ifndef lint __RCSID("$NetBSD: boot.c,v 1.9 2003/07/24 19:25:46 ws Exp $"); static const char rcsid[] = @@ -44,131 +44,164 @@ #include #include +#include +#include #include "ext.h" #include "fsutil.h" int -readboot(dosfs, boot) - int dosfs; - struct bootblock *boot; +readboot(int dosfs, struct bootblock *boot) { - u_char block[DOSBOOTBLOCKSIZE]; - u_char fsinfo[2 * DOSBOOTBLOCKSIZE]; - u_char backup[DOSBOOTBLOCKSIZE]; + union bootsector buffer; + union bootsector backup; + struct byte_bpb50 *pfat50; + struct byte_bpb710 *pfat710; + struct byte_Extboot *pfatext; + struct fsinfo fsstruct; int ret = FSOK; - if (read(dosfs, block, sizeof block) < sizeof block) { + if (read(dosfs, &buffer, sizeof(union bootsector)) + < sizeof(union bootsector)) { perror("could not read boot block"); return FSFATAL; } - if (block[510] != 0x55 || block[511] != 0xaa) { - pfatal("Invalid signature in boot block: %02x%02x", block[511], block[510]); + if (buffer.bs50.bsBootSectSig0 != BOOTSIG0 || + buffer.bs50.bsBootSectSig1 != BOOTSIG1) { + pfatal("Invalid signature in boot block: %02x%02x", + buffer.bs50.bsBootSectSig1, + buffer.bs50.bsBootSectSig0); return FSFATAL; } + + /* set the bpb structs to the boot sector's bpb */ + pfat50 = (struct byte_bpb50 *)&buffer.bs50.bsBPB; + pfat710 = (struct byte_bpb710 *)&buffer.bs710.bsBPB; - memset(boot, 0, sizeof *boot); + memset(boot, 0, sizeof(struct bootblock)); boot->ValidFat = -1; - /* decode bios parameter block */ - boot->BytesPerSec = block[11] + (block[12] << 8); - boot->SecPerClust = block[13]; - boot->ResSectors = block[14] + (block[15] << 8); - boot->FATs = block[16]; - boot->RootDirEnts = block[17] + (block[18] << 8); - boot->Sectors = block[19] + (block[20] << 8); - boot->Media = block[21]; - boot->FATsmall = block[22] + (block[23] << 8); - boot->SecPerTrack = block[24] + (block[25] << 8); - boot->Heads = block[26] + (block[27] << 8); - boot->HiddenSecs = block[28] + (block[29] << 8) + (block[30] << 16) + (block[31] << 24); - boot->HugeSectors = block[32] + (block[33] << 8) + (block[34] << 16) + (block[35] << 24); + /* decode bios parameter block and store in a compacted + * architecture independent data structure for future use + */ + boot->BytesPerSec = getushort(pfat50->bpbBytesPerSec); + boot->SecPerClust = pfat50->bpbSecPerClust; + boot->ResSectors = getushort(pfat50->bpbResSectors); + boot->FATs = pfat50->bpbFATs; + boot->RootDirEnts = getushort(pfat50->bpbRootDirEnts); + boot->Sectors = getushort(pfat50->bpbSectors); + boot->Media = pfat50->bpbMedia; + boot->SecPerTrack = getushort(pfat50->bpbSecPerTrack); + boot->Heads = getushort(pfat50->bpbHeads); + boot->HiddenSecs = getulong(pfat50->bpbHiddenSecs); + boot->HugeSectors = getulong(pfat50->bpbHugeSectors); - boot->FATsecs = boot->FATsmall; + /* first defaulting to FAT12/FAT16 for number of FAT sectors */ + boot->FATsecs = getushort(pfat50->bpbFATsecs); - if (!boot->RootDirEnts) + if (boot->RootDirEnts == 0) { + /* FAT32 parsing */ boot->flags |= FAT32; - if (boot->flags & FAT32) { - boot->FATsecs = block[36] + (block[37] << 8) - + (block[38] << 16) + (block[39] << 24); - if (block[40] & 0x80) - boot->ValidFat = block[40] & 0x0f; + boot->FATsecs = getulong(pfat710->bpbBigFATsecs); + if (pfat710->bpbExtFlags[0] & 0x80) { + boot->ValidFat = pfat710->bpbExtFlags[0] & 0x0f; + } /* check version number: */ - if (block[42] || block[43]) { - /* Correct? XXX */ + if (pfat710->bpbFSVers[0] != 0 || + pfat710->bpbFSVers[1] != 0) { pfatal("Unknown file system version: %x.%x", - block[43], block[42]); + pfat710->bpbFSVers[1], + pfat710->bpbFSVers[0]); return FSFATAL; } - boot->RootCl = block[44] + (block[45] << 8) - + (block[46] << 16) + (block[47] << 24); - boot->FSInfo = block[48] + (block[49] << 8); - boot->Backup = block[50] + (block[51] << 8); + + boot->RootCl = getulong(pfat710->bpbRootClust); + boot->FSInfo = getushort(pfat710->bpbFSInfo); + boot->Backup = getushort(pfat710->bpbBackup); if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) - != boot->FSInfo * boot->BytesPerSec - || read(dosfs, fsinfo, sizeof fsinfo) - != sizeof fsinfo) { + != boot->FSInfo * boot->BytesPerSec) { + perror("could not seek to fsinfo block to read"); + return FSFATAL; + } + + if (read(dosfs, &fsstruct, sizeof(struct fsinfo)) + != sizeof(struct fsinfo)) { perror("could not read fsinfo block"); return FSFATAL; } - if (memcmp(fsinfo, "RRaA", 4) - || memcmp(fsinfo + 0x1e4, "rrAa", 4) - || fsinfo[0x1fc] - || fsinfo[0x1fd] - || fsinfo[0x1fe] != 0x55 - || fsinfo[0x1ff] != 0xaa - || fsinfo[0x3fc] - || fsinfo[0x3fd] - || fsinfo[0x3fe] != 0x55 - || fsinfo[0x3ff] != 0xaa) { + + if (memcmp(fsstruct.fsisig1, "RRaA", 4) || + memcmp(fsstruct.fsisig2, "rrAa", 4) || + memcmp(fsstruct.fsisig3, "\0\0\125\252", 4) || + memcmp(fsstruct.fsisig4, "\0\0\125\252", 4)) { pwarn("Invalid signature in fsinfo block"); + if (ask(0, "fix")) { - memcpy(fsinfo, "RRaA", 4); - memcpy(fsinfo + 0x1e4, "rrAa", 4); - fsinfo[0x1fc] = fsinfo[0x1fd] = 0; - fsinfo[0x1fe] = 0x55; - fsinfo[0x1ff] = 0xaa; - fsinfo[0x3fc] = fsinfo[0x3fd] = 0; - fsinfo[0x3fe] = 0x55; - fsinfo[0x3ff] = 0xaa; + memcpy(fsstruct.fsisig1, "RRaA", 4); + memcpy(fsstruct.fsisig2, "rrAa", 4); + memcpy(fsstruct.fsisig3, "\0\0\125\252", 4); + memcpy(fsstruct.fsisig4, "\0\0\125\252", 4); + if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) - != boot->FSInfo * boot->BytesPerSec - || write(dosfs, fsinfo, sizeof fsinfo) - != sizeof fsinfo) { - perror("Unable to write FSInfo"); + != boot->FSInfo * boot->BytesPerSec) { + perror("could not seek to fsinfo block to fix/write"); + return FSFATAL; + } + + if (write(dosfs, &fsstruct, sizeof(struct fsinfo)) + != sizeof(struct fsinfo)) { + perror("could not write fixed fsinfo"); return FSFATAL; } + ret = FSBOOTMOD; - } else + } + else { + /* we didn't fix the corrupted FSInfo block */ boot->FSInfo = 0; + } } - if (boot->FSInfo) { - boot->FSFree = fsinfo[0x1e8] + (fsinfo[0x1e9] << 8) - + (fsinfo[0x1ea] << 16) - + (fsinfo[0x1eb] << 24); - boot->FSNext = fsinfo[0x1ec] + (fsinfo[0x1ed] << 8) - + (fsinfo[0x1ee] << 16) - + (fsinfo[0x1ef] << 24); + + if (boot->FSInfo != 0) { + boot->FSFree = getulong(fsstruct.fsinfree); + boot->FSNext = getulong(fsstruct.fsinxtfree); } if (lseek(dosfs, boot->Backup * boot->BytesPerSec, SEEK_SET) - != boot->Backup * boot->BytesPerSec - || read(dosfs, backup, sizeof backup) != sizeof backup) { + != boot->Backup * boot->BytesPerSec) { + perror("could not seek to read backup bootblock"); + return FSFATAL; + } + + if (read(dosfs, &backup, sizeof(union bootsector)) + != sizeof(union bootsector)) { perror("could not read backup bootblock"); return FSFATAL; } - backup[65] = block[65]; /* XXX */ - if (memcmp(block + 11, backup + 11, 79)) { - /* Correct? XXX */ + + // never written back to disk + //backup.bs710.bsExt.exReserved1 = buffer.bs710.bsExt.exReserved1; + + if (memcmp(buffer.bs710.bsBPB, + backup.bs710.bsBPB, + sizeof(struct bpb710)) || + memcmp(buffer.bs710.bsExt, + backup.bs710.bsExt, + sizeof(struct extboot))) { + pfatal("backup doesn't compare to primary bootblock"); if (alwaysno) pfatal("\n"); else return FSFATAL; } - /* Check backup FSInfo? XXX */ + + /* Unnecessary to check the backup FSInfo because there isn't + * an physical backup copy of the FSInfo block. There's only a + * backup of the FSInfo block number, which was checked (bsBPB) above. + */ } boot->ClusterOffset = (boot->RootDirEnts * 32 + boot->BytesPerSec - 1) @@ -190,13 +223,14 @@ boot->NumSectors = boot->Sectors; } else boot->NumSectors = boot->HugeSectors; - boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) / boot->SecPerClust; + boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) + / boot->SecPerClust; - if (boot->flags&FAT32) + if (boot->flags & FAT32) boot->ClustMask = CLUST32_MASK; - else if (boot->NumClusters < (CLUST_RSRVD&CLUST12_MASK)) + else if (boot->NumClusters < (CLUST_RSRVD & CLUST12_MASK)) boot->ClustMask = CLUST12_MASK; - else if (boot->NumClusters < (CLUST_RSRVD&CLUST16_MASK)) + else if (boot->NumClusters < (CLUST_RSRVD & CLUST16_MASK)) boot->ClustMask = CLUST16_MASK; else { pfatal("Filesystem too big (%u clusters) for non-FAT32 partition", @@ -230,33 +264,38 @@ } int -writefsinfo(dosfs, boot) - int dosfs; - struct bootblock *boot; +writefsinfo(int dosfs, struct bootblock *boot) { + struct fsinfo fsstruct; u_char fsinfo[2 * DOSBOOTBLOCKSIZE]; - if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) - != boot->FSInfo * boot->BytesPerSec - || read(dosfs, fsinfo, sizeof fsinfo) != sizeof fsinfo) { - perror("could not read fsinfo block"); + if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) + != boot->FSInfo * boot->BytesPerSec) { + perror("could not seek to fsinfo block to read"); + return FSFATAL; + } + + if (read(dosfs, &fsstruct, sizeof(struct fsinfo)) + != sizeof(struct fsinfo)) { + perror("could not read fsinfo block"); + return FSFATAL; + } + + putulong(&fsstruct.fsinfree, boot->FSFree); + putulong(&fsstruct.fsinxtfree, boot->FSNext); + + if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) + != boot->FSInfo * boot->BytesPerSec) { + perror("could not seek to fsinfo block to write new block"); + return FSFATAL; + } + + if (write(dosfs, &fsstruct, sizeof(struct fsinfo)) + != sizeof(struct fsinfo)) { + perror("could not write fixed fsinfo"); return FSFATAL; } - fsinfo[0x1e8] = (u_char)boot->FSFree; - fsinfo[0x1e9] = (u_char)(boot->FSFree >> 8); - fsinfo[0x1ea] = (u_char)(boot->FSFree >> 16); - fsinfo[0x1eb] = (u_char)(boot->FSFree >> 24); - fsinfo[0x1ec] = (u_char)boot->FSNext; - fsinfo[0x1ed] = (u_char)(boot->FSNext >> 8); - fsinfo[0x1ee] = (u_char)(boot->FSNext >> 16); - fsinfo[0x1ef] = (u_char)(boot->FSNext >> 24); - if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) - != boot->FSInfo * boot->BytesPerSec - || write(dosfs, fsinfo, sizeof fsinfo) - != sizeof fsinfo) { - perror("Unable to write FSInfo"); - return FSFATAL; - } + /* * Technically, we should return FSBOOTMOD here. * @@ -264,7 +303,7 @@ * support for FAT32) doesn't maintain the FSINFO block * correctly, it has to be fixed pretty often. * - * Therefor, we handle the FSINFO block only informally, + * Therefore, we handle the FSINFO block only informally, * fixing it if necessary, but otherwise ignoring the * fact that it was incorrect. */ From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:52:43 2007 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 5FBF816A46D; Sun, 8 Jul 2007 08:52:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16A0E16A400; Sun, 8 Jul 2007 08:52:43 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168]) by mx1.freebsd.org (Postfix) with ESMTP id D65DC13C46A; Sun, 8 Jul 2007 08:52:42 +0000 (UTC) (envelope-from jmg@hydrogen.funkthat.com) Received: from hydrogen.funkthat.com (93umwt6hi0l5wxh7@localhost.funkthat.com [127.0.0.1]) by hydrogen.funkthat.com (8.13.6/8.13.3) with ESMTP id l688FEwZ054956; Sun, 8 Jul 2007 01:15:14 -0700 (PDT) (envelope-from jmg@hydrogen.funkthat.com) Received: (from jmg@localhost) by hydrogen.funkthat.com (8.13.6/8.13.3/Submit) id l688FCZE054954; Sun, 8 Jul 2007 01:15:12 -0700 (PDT) (envelope-from jmg) Date: Sun, 8 Jul 2007 01:15:11 -0700 From: John-Mark Gurney To: "Constantine A. Murenin" Message-ID: <20070708081511.GX1221@funkthat.com> Mail-Followup-To: "Constantine A. Murenin" , Andre Oppermann , freebsd-arch@FreeBSD.org, Rui Paulo , Shteryana Shopova , Perforce Change Reviews References: <200707062345.l66Njpx3091970@repoman.freebsd.org> <468ED66E.5080400@fnop.net> <468F517D.3010709@freebsd.org> <46904153.7040909@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46904153.7040909@FreeBSD.org> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html Cc: Rui Paulo , Shteryana Shopova , Perforce Change Reviews , Andre Oppermann , freebsd-arch@FreeBSD.org Subject: Re: Porting OpenBSD's sysctl hw.sensors framework to FreeBSD (was: Re: PERFORCE change 123040 for review) X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: John-Mark Gurney List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2007 08:52:43 -0000 Constantine A. Murenin wrote this message on Sat, Jul 07, 2007 at 21:43 -0400: > Hardware sensors tree is going to be pretty deep down. Under sysctl(8) > the variable names will look like this: > > hw.sensors.lm0.temp0 > > whereas in reality, the tree has five levels: > > hw.sensors.lm0.temp.0 I'm curious, why do we want/need these in the kernel as opposed to a userland library/utility to provide this info? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-p4-projects@FreeBSD.ORG Sun Jul 8 11:21:14 2007 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 3D48F16A469; Sun, 8 Jul 2007 11:21:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CB3D916A468 for ; Sun, 8 Jul 2007 11:21:13 +0000 (UTC) (envelope-from fabio@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B911013C447 for ; Sun, 8 Jul 2007 11:21:13 +0000 (UTC) (envelope-from fabio@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68BLDo5078108 for ; Sun, 8 Jul 2007 11:21:13 GMT (envelope-from fabio@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68BLDfH078103 for perforce@freebsd.org; Sun, 8 Jul 2007 11:21:13 GMT (envelope-from fabio@FreeBSD.org) Date: Sun, 8 Jul 2007 11:21:13 GMT Message-Id: <200707081121.l68BLDfH078103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fabio@FreeBSD.org using -f From: Fabio Checconi To: Perforce Change Reviews Cc: Subject: PERFORCE change 123107 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, 08 Jul 2007 11:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=123107 Change 123107 by fabio@fabio_gror on 2007/07/08 11:20:11 Import on perforce the work done by now on the Linux KVM port. Until now the project has been tracked with git: http://feanor.sssup.it/~fabio/git/?p=soc07.git Affected files ... .. //depot/projects/soc2007/fabio-lkvm/kvm-17/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/Makefile.csdemo#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/configure#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/doxygen.conf#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/drivers/Kbuild#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/drivers/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/drivers/hypercall.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/Kbuild#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/debug.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/external-module-compat.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/i386.config#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/include/linux/kvm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/include/linux/kvm_para.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/include/linux/magic.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/include/linux/mutex.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/kvm-kmod.spec#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/kvm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/kvm_main.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/kvm_svm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/kvm_vmx.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/mmu.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/paging_tmpl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/segment_descriptor.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/svm.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/svm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/vmx-debug.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/vmx.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/vmx.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/x86_64.config#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/x86_emulate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kernel/x86_emulate.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kvm#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kvm.spec#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/kvm_stat#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/.cvsignore#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/COPYING#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/COPYING.LIB#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/Changelog#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/LICENSE#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/Makefile.target#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/README#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/TODO#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/VERSION#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/a.out.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/aes.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/aes.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/alpha-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/alpha.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/arm-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/arm-semi.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/arm.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/alsaaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/audio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/audio.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/audio_int.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/audio_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/coreaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/dsound_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/dsoundaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/fmodaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/mixeng.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/mixeng.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/mixeng_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/noaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/ossaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/rate_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/sdlaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/sys-queue.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/wavaudio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/audio/wavcapture.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-bochs.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-cloop.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-cow.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-dmg.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-qcow.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-qcow2.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-raw.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-vmdk.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-vpc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block-vvfat.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/block_int.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/e_atan2l.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/e_logl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/e_powl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/e_remainderl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/e_sqrtl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_ceill.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_cosl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_floorl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_isnormal.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_ldexpl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_llrint.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_llrintf.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_llrintl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_lrint.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_lrintf.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_lrintl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_rintl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_round.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_sinl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/amd64/s_tanl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/e_atan2l.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/e_logl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/e_powl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/e_remainderl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/e_sqrtl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_ceill.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_cosl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_floorl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_isnormal.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_ldexpl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_llrint.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_llrintf.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_llrintl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_lrint.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_lrintf.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_lrintl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_rintl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_round.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_sinl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/i386/s_tanl.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bsd/sysdep.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/bswap.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/check_ops.sh#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/cocoa.m#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/configure#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/console.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/cpu-all.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/cpu-defs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/cpu-exec.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/cutils.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/commpage.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/ioctls.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/ioctls_types.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/machload.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/main.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/mmap.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/qemu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/signal.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/syscall.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/darwin-user/syscalls.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/dis-asm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/disas.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/disas.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/dyngen-exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/dyngen-op.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/dyngen.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/dyngen.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/elf.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/elf_ops.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/exec-all.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/exec.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat-macros.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat-native.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat-native.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat-specialize.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/fpu/softfloat.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/gdbstub.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/gdbstub.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hostregs_helper.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/acpi.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/adb.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/adlib.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/apb_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/apic.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_boot.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_gic.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_pic.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_pic.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_sysctl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/arm_timer.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cdrom.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cirrus_vga.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cirrus_vga_rop.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cirrus_vga_rop2.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cs4231.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/cuda.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/dma.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/es1370.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/esp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/fdc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/fmopl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/fmopl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/grackle_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/gt64xxx.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/heathrow_pic.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/hypercall.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/hypercall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/i8254.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/i8259.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ide.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/integratorcp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/iommu.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/isa_mmio.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/lsi53c895a.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/m48t59.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/m48t59.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/mc146818rtc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/mips_int.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/mips_malta.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/mips_r4k.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/mips_timer.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ne2000.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/openpic.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/parallel.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pci_host.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pckbd.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pcnet.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pcspk.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pflash_cfi02.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/piix_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl011.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl050.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl080.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl110.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl110_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/pl190.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ppc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ppc_chrp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ppc_prep.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/prep_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/ps2.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/realview.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/rtl8139.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sb16.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/scsi-disk.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/serial.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sh7750.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sh7750_regnames.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sh7750_regnames.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sh7750_regs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/shix.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/slavio_intctl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/slavio_misc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/slavio_serial.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/slavio_timer.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/smbus.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/smbus_eeprom.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/smc91c111.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sparc32_dma.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sun4m.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/sun4u.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/tc58128.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/tcx.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/unin_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb-hid.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb-hub.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb-msd.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb-ohci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb-uhci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/usb.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/versatile_pci.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/versatilepb.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/vga.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/vga_int.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/hw/vga_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/i386-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/i386-vl.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/i386.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/ia64.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/ar#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/common#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/da#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/de#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/de-ch#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/en-gb#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/en-us#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/es#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/et#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fi#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fo#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fr#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fr-be#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fr-ca#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/fr-ch#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/hr#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/hu#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/is#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/it#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/ja#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/lt#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/lv#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/mk#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/modifiers#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/nl#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/nl-be#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/no#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/pl#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/pt#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/pt-br#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/ru#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/sl#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/sv#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/th#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/keymaps/tr#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/kqemu.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/kqemu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/arm/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/arm/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/arm/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/elfload.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/flat.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/flatload.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/i386/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/i386/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/i386/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/ioctls.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/linuxload.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/m68k-semi.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/m68k-sim.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/m68k/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/m68k/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/m68k/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/main.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/mips/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/mips/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/mips/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/mmap.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/path.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/ppc/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/ppc/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/ppc/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/qemu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sh4/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sh4/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sh4/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/signal.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/socket.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc64/syscall.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc64/syscall_nr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/sparc64/termbits.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/syscall.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/syscall_defs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/syscall_types.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/linux-user/vm86.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/loader.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/m68k-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/m68k.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/migration.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/mips-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/monitor.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/osdep.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/osdep.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/README#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/bios.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/bios.diff#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/linux_boot.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/linux_boot.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/ohw.diff#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/openbios-sparc32#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/ppc_rom.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/pxe-ne2k_pci.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/pxe-pcnet.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/pxe-rtl8139.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/vgabios-cirrus.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/vgabios.bin#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/vgabios.diff#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/pc-bios/video.x#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/ppc-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/ppc.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-binfmt-conf.sh#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-doc.texi#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-img.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-img.texi#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-kvm.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-kvm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu-tech.texi#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/qemu_socket.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/readline.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/s390.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sdl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sdl_keysym.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sh4-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/COPYRIGHT#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/bootp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/bootp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/cksum.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ctl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/debug.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/debug.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/icmp_var.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/if.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/if.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ip.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ip_icmp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ip_icmp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ip_input.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/ip_output.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/libslirp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/main.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/mbuf.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/mbuf.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/misc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/misc.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/sbuf.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/sbuf.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/slirp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/slirp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/slirp_config.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/socket.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/socket.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_input.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_output.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_subr.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_timer.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_timer.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcp_var.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tcpip.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tftp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/tftp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/udp.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/slirp/udp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/softmmu_exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/softmmu_header.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/softmmu_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sparc-dis.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sparc.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/sparc64.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tap-win32.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/double_cpdo.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/extended_cpdo.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11.inl#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11_cpdo.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11_cpdt.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpa11_cprt.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpopcode.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpopcode.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/fpsr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/nwfpe/single_cpdo.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/op_helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/op_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/op_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-arm/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/helper2.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/opreg_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/ops_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/ops_sse.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/ops_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/ops_template_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/translate-copy.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-i386/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/m68k-qreg.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/op-hacks.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/qregs.def#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-m68k/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/TODO#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/fop_template.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/mips-defs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/op_helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/op_helper_mem.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/op_mem.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/op_template.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-mips/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/op_helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/op_helper_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/op_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/op_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-ppc/translate_init.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/README.sh4#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/op_helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/op_mem.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sh4/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/exec.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/fbranch_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/fop_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/op_helper.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/op_mem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/op_template.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/target-sparc/translate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/.cvsignore#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/hello-arm.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/hello-i386.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/hello-mips.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/linux-test.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/pi_10.com#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/qruncom.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/runcom.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/sha1.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386-code16.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386-muldiv.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386-shift.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386-vm86.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test-i386.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/test_path.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/tests/testthread.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/texi2pod.pl#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/thunk.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/thunk.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/translate-all.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/translate-op.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/usb-bsd.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/usb-linux.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/usb-stub.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vgafont.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vnc.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vnc_keysym.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/vnchextile.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/x86_64.ld#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/qemu/x_keymap.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/scripts/65-kvm.rules#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/scripts/kvm#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/scripts/mkbootdisk#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/scripts/qemu-ifup#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/scripts/run_img#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/COPYRIGHT#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/bootstrap.lds#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/configure#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/flat.lds#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/kvmctl.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/kvmctl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/main.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/access.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/bootstrap.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/cstart.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/cstart64.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/irq.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/memtest1.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/print.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/print.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/printf.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/printf.h#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/sieve.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/simple.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/stringio.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/test32.S#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/vm.c#1 add .. //depot/projects/soc2007/fabio-lkvm/kvm-17/user/test/vm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/README#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/README.drivers#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/atomic.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/bitops.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/bug.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/cpufeature.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/current.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/desc.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/desc_defs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/highmem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/io.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/kmap_types.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/msr.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/mutex.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/page.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/pgtable.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/processor.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/segment.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/semaphore.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/system.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/topology.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/types.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/uaccess.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/asm/vm86.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/bsd.linux_kmod.mk#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/ldev_stub.c#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/ldev_stub.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/bug.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/cache.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/capability.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/compiler.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/config.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/cpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/cpumask.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/cputype.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/ctype.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/dcache.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/debugfs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/device.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/err.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/errno.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/file.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/fs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/gfp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/highmem.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/init.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/interrupt.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/ioctl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/jiffies.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/kernel.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/kobject.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/kref.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/linkage.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/list.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/magic.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/miscdevice.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/mm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/module.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/moduleparam.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/mount.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/mutex.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/namei.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/notifier.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/page.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/pagemap.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/param.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/percpu.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/pm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/poll.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/proc_fs.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/profile.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/reboot.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/sched.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/signal.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/slab.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/smp.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/smp_lock.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/spinlock.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/stat.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/stddef.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/string.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/sysdev.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/time.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/topology.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/types.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/usb.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/version.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/videodev.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/videodev2.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/vmalloc.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux/wait.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/linux_compat.c#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/media/v4l2-common.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/media/v4l2-dev.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/pwc-ioctl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/linux_compat/pwcview.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/Kconfig#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/Makefile#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/Makefile.kld#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/include/linux/kvm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/include/linux/kvm_para.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/kvm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/kvm_main.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/kvm_svm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/kvm_vmx.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/mmu.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/paging_tmpl.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/segment_descriptor.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/svm.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/svm.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/vmx.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/vmx.h#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/x86_emulate.c#1 add .. //depot/projects/soc2007/fabio-lkvm/lkvm/x86_emulate.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 8 11:28:29 2007 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 0C17C16A469; Sun, 8 Jul 2007 11:28:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D4FB316A400 for ; Sun, 8 Jul 2007 11:28:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9E7013C458 for ; Sun, 8 Jul 2007 11:28:25 +0000 (UTC) (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.8/8.13.8) with ESMTP id l68BSOJj078567 for ; Sun, 8 Jul 2007 11:28:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68BSOsh078564 for perforce@freebsd.org; Sun, 8 Jul 2007 11:28:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 8 Jul 2007 11:28:24 GMT Message-Id: <200707081128.l68BSOsh078564@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 123109 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, 08 Jul 2007 11:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=123109 Change 123109 by rwatson@rwatson_peppercorn on 2007/07/08 11:28:00 We're now working on OpenBSM 1.0alpah15 not alpha14; move some recent history into a new section and update configure.ac. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#52 edit .. //depot/projects/trustedbsd/openbsm/VERSION#16 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#52 (text+ko) ==== @@ -1,3 +1,9 @@ +OpenBSM 1.0 alpha 15 + +- Fix bug when processing in_addr_ex tokens. +- Restore the behavior of printing the string/text specified while + auditing arg32 tokens. + OpenBSM 1.0 alpha 14 - Fix endian issues when processing IPv6 addresses for extended subject @@ -5,9 +11,6 @@ - gcc41 warnings clean. - Teach audit_submit(3) about getaudit_addr(2). - Add support for zonename tokens. -- Fix bug when processing in_addr_ex tokens. -- Restore the behavior of printing the string/text specified while - auditing arg32 tokens. OpenBSM 1.0 alpha 13 @@ -287,4 +290,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#51 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#52 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#16 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_14 +OPENBSM_1_0_ALPHA_15 ==== //depot/projects/trustedbsd/openbsm/configure.ac#35 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0alpha14], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#34 $]) +AC_INIT([OpenBSM], [1.0alpha15], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Sun Jul 8 12:21:17 2007 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 3D46716A476; Sun, 8 Jul 2007 12:21:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 067E816A46D; Sun, 8 Jul 2007 12:21:17 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) by mx1.freebsd.org (Postfix) with ESMTP id AB55013C458; Sun, 8 Jul 2007 12:21:16 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (unknown [192.168.61.3]) by phk.freebsd.dk (Postfix) with ESMTP id B1BDE17380; Sun, 8 Jul 2007 12:03:01 +0000 (UTC) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.14.1/8.14.1) with ESMTP id l68C30Ep066354; Sun, 8 Jul 2007 12:03:01 GMT (envelope-from phk@critter.freebsd.dk) To: Robert Watson From: "Poul-Henning Kamp" In-Reply-To: Your message of "Sun, 08 Jul 2007 11:44:54 +0100." <20070708113624.C13758@fledge.watson.org> Date: Sun, 08 Jul 2007 12:03:00 +0000 Message-ID: <66353.1183896180@critter.freebsd.dk> Sender: phk@critter.freebsd.dk Cc: Rui Paulo , Andre Oppermann , Perforce Change Reviews , "Constantine A. Murenin" , Shteryana Shopova , freebsd-arch@FreeBSD.org Subject: Re: Porting OpenBSD's sysctl hw.sensors framework to FreeBSD (was: Re: PERFORCE change 123040 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, 08 Jul 2007 12:21:17 -0000 In message <20070708113624.C13758@fledge.watson.org>, Robert Watson writes: >While Andre's proposed goal of eliminating static sysctl nodes for 8.0 is >laudable, a casual glimpse run found 261 references to top-level CTL_ >constants in src outside of the kernel, so there's quite a bit of work to be >done, [...] Nothing that couldn't be emulated, either in libraries or a kernel-shim. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-p4-projects@FreeBSD.ORG Sun Jul 8 12:36:53 2007 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 3307216A468; Sun, 8 Jul 2007 12:36:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F076B16A400 for ; Sun, 8 Jul 2007 12:36:52 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DF33F13C44B for ; Sun, 8 Jul 2007 12:36:52 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68CaquH085157 for ; Sun, 8 Jul 2007 12:36:52 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68CaqCs085154 for perforce@freebsd.org; Sun, 8 Jul 2007 12:36:52 GMT (envelope-from dongmei@FreeBSD.org) Date: Sun, 8 Jul 2007 12:36:52 GMT Message-Id: <200707081236.l68CaqCs085154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 123112 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, 08 Jul 2007 12:36:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=123112 Change 123112 by dongmei@dongmei-soc2007-home on 2007/07/08 12:36:27 Update Makefile Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#2 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/auanalyzer.core#2 delete Differences ... ==== //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#2 (text+ko) ==== @@ -1,3 +1,21 @@ -CC = gcc -all: - ${CC} -D_U_="" -DHAVE_CONFIG_H `pkg-config --cflags --libs gtk+-2.0` hello.c gui_utils.c recent.c epan/except.c -o hello +# basic GTK+ app makefile +.PATH: ${.CURDIR} +.PATH: ${.CURDIR}/gtk +.PATH: ${.CURDIR}/image + +SOURCES = main.c menu.c list_view.c tree_view.c file_dlg.c gui_utils.c simple_dialog.c trail_file_dlg.c filesystem.c buffer.c except.c file_access.c strerror.c tfile.c tsess.c file_util.c +OBJS = ${SOURCES:.c=.o} +CFLAGS = `pkg-config gtk+-2.0 --cflags` -D_U_="" +LDADD = `pkg-config gtk+-2.0 --libs` -lbsm +CC = gcc +PACKAGE = auanalyzer + +all: ${OBJS} + ${CC} -o ${PACKAGE} ${OBJS} ${LDADD} + +.c.o: + ${CC} ${CFLAGS} -c $< +clean: + rm ${PACKAGE} ${OBJS} +# end of file + From owner-p4-projects@FreeBSD.ORG Sun Jul 8 13:32:10 2007 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 CEC2716A421; Sun, 8 Jul 2007 13:32:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 623B316A46E for ; Sun, 8 Jul 2007 13:32:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F77613C459 for ; Sun, 8 Jul 2007 13:32:09 +0000 (UTC) (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.8/8.13.8) with ESMTP id l68DW9gm099609 for ; Sun, 8 Jul 2007 13:32:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68DW9Z2099606 for perforce@freebsd.org; Sun, 8 Jul 2007 13:32:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 8 Jul 2007 13:32:09 GMT Message-Id: <200707081332.l68DW9Z2099606@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 123117 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, 08 Jul 2007 13:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123117 Change 123117 by rwatson@rwatson_peppercorn on 2007/07/08 13:31:24 Synchronize audit kernel event list to OpenSolaris, including picking up the *at(2) system call events. Tidy up, correct, enhance comments. In two cases where OpenBSM defines events that duplicate Solaris events, prefer the Solaris definition. Flag a few more events as Solaris-specific. Remove XXX comments that are no longer required. Observer that we're getting really close to Solaris events colliding with older Darwin events. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#53 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#49 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#53 (text+ko) ==== @@ -3,6 +3,8 @@ - Fix bug when processing in_addr_ex tokens. - Restore the behavior of printing the string/text specified while auditing arg32 tokens. +- Synchronized audit event list to Solaris, picking up the *at(2) system call + definitions, now required for FreeBSD and Linux. OpenBSM 1.0 alpha 14 @@ -290,4 +292,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#52 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#53 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#49 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#49 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -44,11 +44,12 @@ #define AUE_NULL 0 #define AUE_EXIT 1 #define AUE_FORK 2 +#define AUE_FORKALL AUE_FORK /* Solaris-specific. */ #define AUE_OPEN 3 #define AUE_CREAT 4 #define AUE_LINK 5 #define AUE_UNLINK 6 -#define AUE_DELETE AUE_UNLINK +#define AUE_DELETE AUE_UNLINK /* Darwin-specific. */ #define AUE_EXEC 7 #define AUE_CHDIR 8 #define AUE_MKNOD 9 @@ -57,7 +58,7 @@ #define AUE_UMOUNT 12 #define AUE_JUNK 13 /* Solaris-specific. */ #define AUE_ACCESS 14 -#define AUE_CHECKUSERACCESS AUE_ACCESS +#define AUE_CHECKUSERACCESS AUE_ACCESS /* Darwin-specific. */ #define AUE_KILL 15 #define AUE_STAT 16 #define AUE_LSTAT 17 @@ -156,7 +157,7 @@ #define AUE_SEMOP 110 #define AUE_CORE 111 /* Solaris-specific, currently. */ #define AUE_CLOSE 112 -#define AUE_SYSTEMBOOT 113 +#define AUE_SYSTEMBOOT 113 /* Solaris-specific. */ #define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ #define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ #define AUE_WRITEL 128 /* Solaris-specific. */ @@ -179,9 +180,14 @@ #define AUE_GETKERNSTATE 147 /* Solaris-specific. */ #define AUE_SETKERNSTATE 148 /* Solaris-specific. */ #define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ -#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_AUDITSTAT 150 /* Solaris-specific. */ +#define AUE_REVOKE 151 +#define AUE_MAC 152 /* Solaris-specific. */ #define AUE_ENTERPROM 153 /* Solaris-specific. */ #define AUE_EXITPROM 154 /* Solaris-specific. */ +#define AUE_IFLOAT 155 /* Solaris-specific. */ +#define AUE_PFLOAT 156 /* Solaris-specific. */ +#define AUE_UPRIV 157 /* Solaris-specific. */ #define AUE_IOCTL 158 #define AUE_SOCKET 183 #define AUE_SENDTO 184 @@ -193,28 +199,30 @@ #define AUE_RECVMSG 190 #define AUE_RECVFROM 191 #define AUE_READ 192 +#define AUE_GETDENTS 193 #define AUE_LSEEK 194 #define AUE_WRITE 195 #define AUE_WRITEV 196 #define AUE_NFS 197 /* Solaris-specific. */ #define AUE_READV 198 - /* XXXRW: XXX Solaris old stat()? */ +#define AUE_OSTAT 199 /* Solaris-specific. */ #define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ #define AUE_STIME 201 /* XXXRW: Solaris old stime? */ #define AUE_UTIME 202 /* XXXRW: Solaris old utime? */ #define AUE_NICE 203 /* XXXRW: Solaris old nice? */ - /* XXXRW: Solaris old setpgrp? */ -#define AUE_SETGID 205 /* XXXRW: Solaris old setgid? */ - /* XXXRW: Solaris readl? */ - /* XXXRW: Solaris readvl()? */ +#define AUE_OSETPGRP 204 /* Solaris-specific. */ +#define AUE_SETGID 205 +#define AUE_READL 206 /* Solaris-specific. */ +#define AUE_READVL 207 /* Solaris-specific. */ +#define AUE_FSTAT 208 #define AUE_DUP2 209 #define AUE_MMAP 210 #define AUE_AUDIT 211 -#define AUE_PRIOCNTLSYS 212 +#define AUE_PRIOCNTLSYS 212 /* Solaris-specific. */ #define AUE_MUNMAP 213 #define AUE_SETEGID 214 #define AUE_SETEUID 215 -#define AUE_PUTMSG 216 +#define AUE_PUTMSG 216 /* Solaris-specific. */ #define AUE_GETMSG 217 /* Solaris-specific. */ #define AUE_PUTPMSG 218 /* Solaris-specific. */ #define AUE_GETPMSG 219 /* Solaris-specific. */ @@ -231,26 +239,27 @@ #define AUE_AUDITON_SETCOND 230 #define AUE_AUDITON_GETCLASS 231 #define AUE_AUDITON_SETCLASS 232 -#define AUE_UTSSYS 233 /* Solaris-specific. */ +#define AUE_FUSERS 233 /* Solaris-specific; also UTSSYS? */ #define AUE_STATVFS 234 -#define AUE_XSTAT 235 -#define AUE_LXSTAT 236 +#define AUE_XSTAT 235 /* Solaris-specific. */ +#define AUE_LXSTAT 236 /* Solaris-specific. */ #define AUE_LCHOWN 237 #define AUE_MEMCNTL 238 /* Solaris-specific. */ #define AUE_SYSINFO 239 /* Solaris-specific. */ #define AUE_XMKNOD 240 /* Solaris-specific. */ #define AUE_FORK1 241 - /* XXXRW: Solaris modctl()? */ +#define AUE_MODCTL 242 /* Solaris-specific. */ #define AUE_MODLOAD 243 #define AUE_MODUNLOAD 244 #define AUE_MODCONFIG 245 /* Solaris-specific. */ #define AUE_MODADDMAJ 246 /* Solaris-specific. */ -#define AUE_SOCKACCEPT 247 -#define AUE_SOCKCONNECT 248 -#define AUE_SOCKSEND 249 -#define AUE_SOCKRECEIVE 250 +#define AUE_SOCKACCEPT 247 /* Solaris-specific. */ +#define AUE_SOCKCONNECT 248 /* Solaris-specific. */ +#define AUE_SOCKSEND 249 /* Solaris-specific. */ +#define AUE_SOCKRECEIVE 250 /* Solaris-specific. */ #define AUE_ACLSET 251 #define AUE_FACLSET 252 +#define AUE_DOORFS 253 /* Solaris-specific. */ #define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */ #define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */ #define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */ @@ -262,11 +271,42 @@ #define AUE_P_ONLINE 262 /* Solaris-specific. */ #define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */ #define AUE_INST_SYNC 264 /* Solaris-specific. */ -#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */ +#define AUE_SOCKCONFIG 265 /* Solaris-specific. */ #define AUE_SETAUDIT_ADDR 266 #define AUE_GETAUDIT_ADDR 267 +#define AUE_UMOUNT2 268 /* Solaris-specific. */ +#define AUE_FSAT 269 /* Solaris-specific. */ +#define AUE_OPENAT_R 270 +#define AUE_OPENAT_RC 271 +#define AUE_OPENAT_RT 272 +#define AUE_OPENAT_RTC 273 +#define AUE_OPENAT_W 274 +#define AUE_OPENAT_WC 275 +#define AUE_OPENAT_WT 276 +#define AUE_OPENAT_WTC 277 +#define AUE_OPENAT_RW 278 +#define AUE_OPENAT_RWC 279 +#define AUE_OPENAT_RWT 280 +#define AUE_OPENAT_RWTC 281 +#define AUE_RENAMEAT 282 +#define AUE_FSTATAT 283 +#define AUE_FCHOWNAT 284 +#define AUE_FUTIMESAT 285 +#define AUE_UNLINKAT 286 #define AUE_CLOCK_SETTIME 287 #define AUE_NTP_ADJTIME 288 +#define AUE_SETPPRIV 289 /* Solaris-specific. */ +#define AUE_MODDEVPLCY 290 /* Solaris-specific. */ +#define AUE_MODADDPRIV 291 /* Solaris-specific. */ +#define AUE_CRYPTOADM 292 /* Solaris-specific. */ +#define AUE_CONFIGKSSL 293 /* Solaris-specific. */ +#define AUE_BRANDSYS 294 /* Solaris-specific. */ +#define AUE_PF_POLICY_ADDRULE 295 /* Solaris-specific. */ +#define AUE_PF_POLICY_DELRULE 296 /* Solaris-specific. */ +#define AUE_PF_POLICY_CLONE 297 /* Solaris-specific. */ +#define AUE_PF_POLICY_FLIP 298 /* Solaris-specific. */ +#define AUE_PF_POLICY_FLUSH 299 /* Solaris-specific. */ +#define AUE_PF_POLICY_ALGS 300 /* Solaris-specific. */ /* * Events added for Apple Darwin that potentially collide with future Solaris @@ -281,30 +321,30 @@ #define AUE_DARWIN_PROFILE 305 #define AUE_DARWIN_KTRACE 306 #define AUE_DARWIN_SETLOGIN 307 -#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ +#define AUE_DARWIN_REBOOT 308 #define AUE_DARWIN_REVOKE 309 #define AUE_DARWIN_UMASK 310 #define AUE_DARWIN_MPROTECT 311 -#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ -#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ -#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ +#define AUE_DARWIN_SETPRIORITY 312 +#define AUE_DARWIN_SETTIMEOFDAY 313 +#define AUE_DARWIN_FLOCK 314 #define AUE_DARWIN_MKFIFO 315 #define AUE_DARWIN_POLL 316 -#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ +#define AUE_DARWIN_SOCKETPAIR 317 #define AUE_DARWIN_FUTIMES 318 #define AUE_DARWIN_SETSID 319 #define AUE_DARWIN_SETPRIVEXEC 320 /* Darwin-specific. */ -#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ -#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ -#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ +#define AUE_DARWIN_NFSSVC 321 +#define AUE_DARWIN_GETFH 322 +#define AUE_DARWIN_QUOTACTL 323 #define AUE_DARWIN_ADDPROFILE 324 /* Darwin-specific. */ #define AUE_DARWIN_KDEBUGTRACE 325 /* Darwin-specific. */ #define AUE_DARWIN_KDBUGTRACE AUE_KDEBUGTRACE #define AUE_DARWIN_FSTAT 326 #define AUE_DARWIN_FPATHCONF 327 #define AUE_DARWIN_GETDIRENTRIES 328 -#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ -#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ +#define AUE_DARWIN_TRUNCATE 329 +#define AUE_DARWIN_FTRUNCATE 330 #define AUE_DARWIN_SYSCTL 331 #define AUE_DARWIN_MLOCK 332 #define AUE_DARWIN_MUNLOCK 333 @@ -343,6 +383,11 @@ * These often duplicate events added to the Solaris set by Darwin, but use * event identifiers in a higher range in order to avoid colliding with * future Solaris additions. + * + * If an event in this section is later added to Solaris, we prefer the + * Solaris event identifier, and add _OPENBSM_ to the OpenBSM-specific + * identifier so that old trails can still be processed, but new trails use + * the Solaris identifier. */ #define AUE_GETFSSTAT 43001 #define AUE_PTRACE 43002 @@ -351,7 +396,7 @@ #define AUE_PROFILE 43005 #define AUE_KTRACE 43006 #define AUE_SETLOGIN 43007 -#define AUE_REVOKE 43008 +#define AUE_OPENBSM_REVOKE 43008 /* Solaris event now preferred. */ #define AUE_UMASK 43009 #define AUE_MPROTECT 43010 #define AUE_MKFIFO 43011 @@ -362,7 +407,7 @@ #define AUE_ADDPROFILE 43016 /* Darwin-specific. */ #define AUE_KDEBUGTRACE 43017 /* Darwin-specific. */ #define AUE_KDBUGTRACE AUE_KDEBUGTRACE -#define AUE_FSTAT 43018 +#define AUE_OPENBSM_FSTAT 43018 /* Solaris event now preferred. */ #define AUE_FPATHCONF 43019 #define AUE_GETDIRENTRIES 43020 #define AUE_SYSCTL 43021 ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#21 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#22 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -140,8 +140,13 @@ 148:AUE_SETKERNSTATE:setkernstate(2):ad 149:AUE_GETPORTAUDIT:getportaudit(2):ad 150:AUE_AUDITSTAT:auditstat(2):ad +151:AUE_REVOKE:revoke(2):cl +152:AUE_MAC:Solaris AUE_MAC:no 153:AUE_ENTERPROM:enter prom:ad 154:AUE_EXITPROM:exit prom:ad +155:AUE_IFLOAT:Solaris AUE_IFLOAT:no +156:AUE_PFLOAT:Solaris AUE_PFLOAT:no +157:AUE_UPRIV:Solaris AUE_UPRIV:no 158:AUE_IOCTL:ioctl(2):io 173:AUE_ONESIDE:one-sided session record:nt 174:AUE_MSGGETL:msggetl(2):ip @@ -165,19 +170,19 @@ 196:AUE_WRITEV:writev(2):no 197:AUE_NFS:nfs server:ad 198:AUE_READV:readv(2):no -199:AUE_OSTAT:old stat(2):fa +199:AUE_OSTAT:Solaris old stat(2):fa 200:AUE_SETUID:setuid(2):pc 201:AUE_STIME:old stime(2):ad 202:AUE_UTIME:old utime(2):fm 203:AUE_NICE:old nice(2):pc -204:AUE_OSETPGRP:old setpgrp(2):pc +204:AUE_OSETPGRP:Solaris old setpgrp(2):pc 205:AUE_SETGID:setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no 209:AUE_DUP2:dup2(2):no 210:AUE_MMAP:mmap(2):no 211:AUE_AUDIT:audit(2):ot -212:AUE_PRIOCNTLSYS:priocntlsys(2):pc +212:AUE_PRIOCNTLSYS:Solaris priocntlsys(2):pc 213:AUE_MUNMAP:munmap(2):cl 214:AUE_SETEGID:setegid(2):pc 215:AUE_SETEUID:seteuid(2):pc @@ -201,7 +206,7 @@ 233:AUE_UTSSYS:utssys(2) - fusers:ad 234:AUE_STATVFS:statvfs(2):fa 235:AUE_XSTAT:xstat(2):fa -236:AUE_LXSTAT:lx6stat(2):fa +236:AUE_LXSTAT:lxstat(2):fa 237:AUE_LCHOWN:lchown(2):fm 238:AUE_MEMCNTL:memcntl(2):ot 239:AUE_SYSINFO:sysinfo(2):ad @@ -230,12 +235,43 @@ 262:AUE_P_ONLINE:p_online(2):ad 263:AUE_PROCESSOR_BIND:processor_bind(2):ad 264:AUE_INST_SYNC:inst_sync(2):ad +265:AUE_SOCKCONFIG:configure socket:nt 266:AUE_SETAUDIT_ADDR:setaudit_addr(2):ad 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad -268:AUE_CLOCK_SETTIME:clock_settime(2):ad -269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad +268:AUE_UMOUNT2:Solaris umount(2):ad +269:AUE_FSAT:fsat(2) - place holder:no +270:AUE_OPENAT_R:openat(2) - read:fr +271:AUE_OPENAT_RC:openat(2) - read,creat:fc,fr,fa,fm +272:AUE_OPENAT_RT:openat(2) - read,trunc:fd,fr,fa,fm +273:AUE_OPENAT_RTC:openat(2) - read,creat,trunc:fc,fd,fr,fa,fm +274:AUE_OPENAT_W:openat(2) - write:fw +275:AUE_OPENAT_WC:openat(2) - write,creat:fc,fw,fa,fm +276:AUE_OPENAT_WT:openat(2) - write,trunc:fd,fw,fa,fm +277:AUE_OPENAT_WTC:openat(2) - write,creat,trunc:fc,fd,fw,fa,fm +278:AUE_OPENAT_RW:openat(2) - read,write:fr,fw +279:AUE_OPENAT_RWC:openat(2) - read,write,create:fc,fw,fr,fa,fm +280:AUE_OPENAT_RWTC:openat(2) - read,write,creat,trunc:fc,fd,fw,fr,fa,fm +282:AUE_RENAMEAT:renameat(2):fc,fd +283:AUE_FSTATAT:fstatat(2):fa +284:AUE_FCHOWNAT:fchownat(2):fm +285:AUE_FUTIMESAT:futimesat(2):fm +286:AUE_UNLINKAT:unlinkat(2):fd +287:AUE_CLOCK_SETTIME:clock_settime(2):ad +288:AUE_NTP_ADJTIME:ntp_adjtime(2):ad +289:AUE_SETPPRIV:setppriv(2):pc +290:AUE_MODDEVPLCY:modctl(2) - configure device policy:ad +291:AUE_MODADDPRIV:modctl(2) - configure additional privilege:ad +292:AUE_CRYPTOADM:kernel cryptographic framework:ad +293:AUE_CONFIGKSSL:configure kernel SSL:ad +294:AUE_BRANDSYS:brandsys(2):ot +295:AUE_PF_POLICY_ADDRULE:Add IPsec policy rule:ad +296:AUE_PF_POLICY_DELRULE:Delete IPsec policy rule:ad +297:AUE_PF_POLICY_CLONE:Clone IPsec policy:ad +298:AUE_PF_POLICY_FLIP:Flip IPsec policy:ad +299:AUE_PF_POLICY_FLUSH:Flush IPsec policy rules:ad +300:AUE_PF_POLICY_ALGS:Update IPsec algorithms:ad # -# What follows are deprecated Darwin event numbers that may someday conflict +# What follows are deprecated Darwin event numbers that may soon conflict # with Solaris events. # 301:AUE_DARWIN_GETFSSTAT:getfsstat(2):fa @@ -309,7 +345,7 @@ 43005:AUE_PROFILE:profil(2):pc 43006:AUE_KTRACE:ktrace(2):pc 43007:AUE_SETLOGIN:setlogin(2):pc -43008:AUE_REVOKE:revoke(2):cl +43008:AUE_OPENBSM_REVOKE:revoke(2):cl 43009:AUE_UMASK:umask(2):pc 43010:AUE_MPROTECT:mprotect(2):fm 43011:AUE_MKFIFO:mkfifo(2):fc @@ -319,7 +355,7 @@ 43015:AUE_SETPRIVEXEC:setprivexec(2):pc 43016:AUE_ADDPROFILE:system call:pc 43017:AUE_KDEBUGTRACE:system call:pc -43018:AUE_FSTAT:fstat(2):fa +43018:AUE_OPENBSM_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa 43020:AUE_GETDIRENTRIES:getdirentries(2):no 43021:AUE_SYSCTL:sysctl(3):ot From owner-p4-projects@FreeBSD.ORG Sun Jul 8 14:26:27 2007 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 B25C516A50F; Sun, 8 Jul 2007 14:26:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76DB616A4FB for ; Sun, 8 Jul 2007 14:26:26 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5D43A13C4C2 for ; Sun, 8 Jul 2007 14:26:26 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68EQQ4M006921 for ; Sun, 8 Jul 2007 14:26:26 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68EQP6S006917 for perforce@freebsd.org; Sun, 8 Jul 2007 14:26:25 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 8 Jul 2007 14:26:25 GMT Message-Id: <200707081426.l68EQP6S006917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123127 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, 08 Jul 2007 14:26:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=123127 Change 123127 by taleks@taleks_th on 2007/07/08 14:26:13 Overall: removed flags parameter from pxe_ip_send() and related functions, so now every sending function expects that ip/tcp/udp header is allocated by higher level code. pxe_corre_alloc_packet() is unused, will be removed. pxe_buffer: write/read code updated, pxe_buffer_alloc() function now also inits members of PXE_BUFFER structure. Default receive buffer size set to 32768, more optimal for fast connections. There is still problem in tests with data receiving exceeding buffer sizes after closing connection. Most probably corruption of stack during buffer read/write. pxe_connection: add pxe_tcp_check_connection() which sends ACK if have big space in recv buffer and have not receivig packets (situation after small receiving window). pxe_tcp_read() also starts pxe_core_recv_packets() if have big unused space in buffer. pxe_core: added for experimental purposes "exclusive" protocol handling. Which blocks receiving by PXE core other protocols. Usefull when remote host is agreessively sends packets and it's MAC address is unknown, in some cases this lead to infinite cyce of ARP packets sending. pxe_segment: adde pxe_resend_drop_same() function to remove from resending queue packets with same sequence number, in most cases with same flags but different ack number. Some updates in checks of parameters of functions to be more accurate with NULL pointer. pxe_sock: made pxe_recv() behaviour more similar to blocking function. pxe_tcp: mainly tcp_process_7() changed to update correctly FIN & SYN segments sequence numbers. Also pxe_tcp_syssend() modified to drop same packets. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#18 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#14 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.h#4 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#9 (text+ko) ==== @@ -63,12 +63,23 @@ const MAC_ADDR * pxe_arp_table_search(uint32_t ip) { +#ifdef PXE_DEBUG_HELL + printf("pxe_arp_table_search(): started\n"); +#endif int entry = 0; for (; entry < MAX_ARP_ENTRIES + 1; ++entry) { - if (arp_table[entry].ip4.ip == ip) - return (const MAC_ADDR *)&(arp_table[entry].mac); + if (arp_table[entry].ip4.ip == ip) { + + uint8_t *mac = &arp_table[entry].mac[0]; +#ifdef PXE_DEBUG_HELL + printf("pxe_arp_table_search(): %2x:%2x:%2x:%2x:%2x:%2x\n", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] + ); +#endif + return (const MAC_ADDR *)mac; + } } return (NULL); @@ -319,6 +330,8 @@ if (res != NULL) return (res); + pxe_core_exclusive(PXE_PROTOCOL_ARP); + PXE_ARP_WAIT_DATA wait_data; wait_data.ip = ip; @@ -327,5 +340,7 @@ if (!pxe_await(pxe_arp_await, PXE_MAX_ARP_TRY, PXE_TIME_TO_DIE, &wait_data)) { } + pxe_core_exclusive(0); + return (wait_data.mac); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#2 (text+ko) ==== @@ -18,8 +18,8 @@ #define PXE_AWAIT_NEXTTRY 0x03 /* continue with next try */ #define PXE_AWAIT_BREAK 0x04 /* wait ended with failure */ -#define TIME_DELTA_MS 100 -#define TIME_DELTA 100000 +#define TIME_DELTA_MS 10 +#define TIME_DELTA 10000 /* universal waiting function */ int pxe_await(pxe_await_func func, uint16_t try_counter, uint32_t timeout, void *data); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#4 (text+ko) ==== @@ -13,7 +13,12 @@ pxe_buffer_write(PXE_BUFFER *buf, const void *from, uint16_t size) { uint16_t to_write = (size < buf->bufleft) ? size : buf->bufleft; - + +#ifdef PXE_DEBUG_HELL + printf("pxe_buffer_write(): fstart %d, fend %d, bufleft %d (of %d), to_write %d (%d)\n", + buf->fstart, buf->fend, buf->bufleft, buf->bufsize, to_write, size); +#endif + if (to_write == 0) /* no space left*/ return (0); @@ -26,31 +31,35 @@ } else {/* may be need to place, using two memcpy operations */ - /* right part of space */ + /* right part of buffer */ uint16_t part1 = buf->bufsize - buf->fstart; - uint16_t part2 = 0; - + /* left part of buffer */ + uint16_t part2 = to_write - part1; + + if (part1) + pxe_memcpy(from, buf->data + buf->fstart, part1); + if (part1 >= to_write) { - pxe_memcpy(from, buf->data + buf->fstart, to_write); buf->fstart += to_write; + + if (buf->fstart > buf->bufsize) { + printf("pxe_buffer_write(): internal error! fstart = %d", buf->fstart); + } } else { - pxe_memcpy(from, buf->data + buf->fstart, part1); - /* left part of space */ - part2 = to_write - part1; pxe_memcpy(from + part1, buf->data, part2); - buf->fstart = part2; + buf->fstart = part2; } + #ifdef PXE_DEBUG_HELL - printf("pxe_buffer_write(): fstart %d, fend %d, bufleft %d (of %d)\n\tpart1 %d, part2 %d, to_write %d (%d)\n", - buf->fstart, buf->fend, buf->bufleft, buf->bufsize, part1, part2, to_write, size); -#endif + printf("pxe_buffer_write(): fstart %d, fend %d, bufsize %d\n\tpart1 %d, part2 %d, to_write %d (%d)\n", + buf->fstart, buf->fend, buf->bufsize, part1, part2, to_write, size); +#endif } - buf->bufleft -= to_write; -#ifdef PXE_DEBUG_HELL - printf("bufleft %d (-%d)\n", buf->bufleft, to_write); +#ifdef PXE_DEBUG + printf("pxe_buffer_write(): bufleft %d (-%d)\n", buf->bufleft, to_write); #endif return (to_write); } @@ -58,7 +67,7 @@ /* pxe_buffer_read() - reades data from buffer, if possible * in: * buf - pointer to buffer structure - * to - pointer to data to read to + * to - pointer to data to read to, if NULL data is read but not placed anywhere * size - size of data buffer * out: * actual count of read bytes @@ -77,36 +86,31 @@ uint16_t fend = buf->fend; uint16_t bufsize = buf->bufsize; - if (fstart < fend) { /* two cases */ - - if (fend != bufsize) { /* case one: |**s...e***| */ - /* right part of buffer */ - uint16_t part1 = bufsize - fend; - /* left part of buffer */ - uint16_t part2 = to_read - part1; + if (fstart <= fend) { /* two cases handling: |*s...e**|, |***se***| */ + /* right part of buffer */ + uint16_t part1 = bufsize - fend; + /* left part of buffer */ + uint16_t part2 = to_read - part1; - if (to != NULL) { - pxe_memcpy(buf->data + fend, to, part1); + if (part1 && (to != NULL) ) + pxe_memcpy(buf->data + fend, to, part1); + + if (part1 >= to_read) { + buf->fend += to_read; + } else { + if (to != NULL) pxe_memcpy(buf->data, to + part1, part2); - } - - buf->fend = part2; + + buf->fend = part2; + } - } else { /* case two: |***s.....e| */ - - if (to != NULL) - pxe_memcpy(buf->data, to, to_read); + } else { /* third case: |..e**s...| */ - buf->fend = to_read; - } - - } else { /* third case: |..e**s...|*/ if (to != NULL) pxe_memcpy(buf->data + buf->fend, to, to_read); buf->fend += to_read; - } - + } buf->bufleft += to_read; @@ -143,14 +147,18 @@ pxe_buffer_memalloc(PXE_BUFFER *buffer, uint16_t size) { - if (buffer->data != NULL) { /* don't alloc nothing, if mem already allocated */ - return (0); + if (buffer->data == NULL) { /* alloc if not already allocated */ + buffer->data = pxe_alloc(size); + + if (buffer->data == NULL) + return (0); } - buffer->data = pxe_alloc(size); - - if (buffer->data == NULL) - return (0); + + buffer->bufsize = size; + buffer->bufleft = size; + buffer->fstart = 0; + buffer->fend = size; return (1); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#4 (text+ko) ==== @@ -4,7 +4,7 @@ #include /* buffer size choosed by default for sending/recieving*/ -#define PXE_DEFAULT_RECV_BUFSIZE 8192 +#define PXE_DEFAULT_RECV_BUFSIZE 32768 #define PXE_DEFAULT_SEND_BUFSIZE 4096 /* pxe_buffer - buffer related information */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#5 (text+ko) ==== @@ -221,26 +221,26 @@ if (connection->state == PXE_TCP_CLOSED) { /* already closed */ #ifdef PXE_DEBUG printf("pxe_tcp_disconnect(): connection already is closing.\n"); -#endif +#endif return (1); } /* if connection in established state - initiate active close */ - if (connection->state == PXE_TCP_ESTABLISHED) { - if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { - printf("pxe_tcp_disconnect(): failed to send FIN.\n"); - free_connection(connection); - return (0); - } + if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { + printf("pxe_tcp_disconnect(): failed to send FIN.\n"); + free_connection(connection); + return (0); } - /* update sequence number */ connection->next_send += 1; - connection->state = PXE_TCP_FIN_WAIT1; + + if (connection->state == PXE_TCP_ESTABLISHED) + connection->state = PXE_TCP_FIN_WAIT1; + connection->state_out = PXE_TCP_FIN; #ifdef PXE_DEBUG printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); -#endif +#endif PXE_TCP_WAIT_DATA wait_data; wait_data.connection = connection; @@ -248,7 +248,7 @@ /* await TIME_WITE state. * connection will fell in this state in pxe_tcp_callback(), - * TODO: add waiting of TCP_CLOSED also + * TODO: add waiting of LAST_ACK also */ if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get to TIME_WAIT state */ free_connection(connection); @@ -265,7 +265,7 @@ #ifdef PXE_DEBUG printf("pxe_tcp_disconnect(): connection closed.\n"); -#endif +#endif return (1); } @@ -404,8 +404,8 @@ if (result != 0) { /* if receive window was zero and now is big enough, notify remote host */ - if ( (recv_buffer->bufleft > PXE_DEFAULT_RECV_BUFSIZE / 4) && - (connection->winlock == 1) ) + if ( (connection->winlock == 1) && + (recv_buffer->bufleft > PXE_DEFAULT_RECV_BUFSIZE / 4)) { if (!pxe_tcp_syssend(connection, PXE_TCP_ACK)) { printf("pxe_tcp_read(): failed to notify remote host about window.\n"); @@ -415,8 +415,9 @@ } } - /* process new packets if there are any */ - pxe_core_recv_packets(); + /* process new packets if too low data in buffer */ + if (recv_buffer->bufleft > recv_buffer->bufsize / 2) + pxe_core_recv_packets(); return (result); } @@ -468,6 +469,51 @@ return (1); } +/* pxe_tcp_check_connection() - checks connections state by sending ACK, + * used e,g, to notify remote host about enough window to recv + * in: + * sock - TCP socket to check connection for + * out: + * 0 - failed + * 1 - success + */ +int +pxe_tcp_check_connection(PXE_SOCKET *sock) +{ +#ifdef PXE_DEBUG + printf("pxe_tcp_check_connection(): started.\n"); +#endif + PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); + + if (connection == NULL) { + printf("pxe_tcp_check_connection(): no connection for filter 0x%x (socket: 0x%x).\n", + sock->filter, sock + ); + return (0); + } + + if (connection->state != PXE_TCP_ESTABLISHED) { + printf("pxe_tcp_check_connection(): connection 0x%x is not in established state(%d).\n", + connection, connection->state + ); + return (0); /* connection not in established state, ignore available data */ + } + + PXE_BUFFER *buffer = connection->recv; + + /* send ACK ony if we place for one segment at least */ + if (buffer->bufleft < buffer->bufsize / 2) { + return (0); + } + + if (!pxe_tcp_syssend(connection, PXE_TCP_ACK)) { + printf("pxe_tcp_check_connection(): failed to send ACK.\n"); + return (0); + } + + return (1); +} + void pxe_connection_stats() { ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#4 (text+ko) ==== @@ -89,4 +89,7 @@ /* pushes current segment data */ int pxe_tcp_push(PXE_SOCKET *sock); +/* checks connection, by sending ACK */ +int pxe_tcp_check_connection(PXE_SOCKET *sock); + #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#18 (text+ko) ==== @@ -22,6 +22,7 @@ #define PXE_BUFFER_SIZE 0x1000 static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; static uint8_t data_buffer[PXE_BUFFER_SIZE]; +static uint8_t exclusive_protocol = 0; static pxenv_t *pxenv = NULL; /* PXENV+ */ static pxe_t *pxe = NULL; /* !PXE */ static BOOTPLAYER bootplayer; /* PXE Cached information. */ @@ -425,7 +426,7 @@ * 1 - success * 0 - failed */ -int +static int pxe_core_call(int func) { #ifdef PXE_DEBUG_HELL @@ -520,6 +521,7 @@ if (undi_send->Status != 0) { printf("%d: pxe_core_transmit(): failed with status 0x%x\n", tryCount, undi_send->Status); + delay(100); continue; } @@ -541,7 +543,7 @@ * 0 - failed * 1 - success */ -int +static int pxe_core_get_packet(int func, t_PXENV_UNDI_ISR *undi_isr ) { #ifdef PXE_DEBUG_HELL @@ -586,7 +588,7 @@ if (count == 10) return (0); - delay(1000); /* wait, may be it will be not busy later */ + delay(10); /* wait, may be it will be not busy later */ continue; } @@ -682,11 +684,23 @@ ++packets_dropped; drop_flag = 1; /* clear queue, receiving all frames of packet */ } + + /* experimental: to avoid resendings of ip packets for unknown MAC*/ + if (exclusive_protocol && (protocol != exclusive_protocol)) { +#ifdef PXE_DEBUG + printf("recv_packets(): dropping packet, not exclusive protocol (%d != %d).\n", + protocol, exclusive_protocol + ); +#endif + ++packets_dropped; + drop_flag = 1; /* clear queue, receiving all frames of packet */ + } /* sanity check */ if (frame_size < PXE_BUFFER_SIZE) { pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); +/* pxe_memcpy(PTOV(undi_isr->Frame.segment * 16 + undi_isr->Frame.offset), data_buffer, frame_size); */ } else { printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.\n", PXE_BUFFER_SIZE, frame_size); @@ -916,6 +930,22 @@ core_protocol[proto]=proc; } +/* pxe_core_exclusive() - sets protocol exclusive when receiving packets + * in: + * proto - IP protocol number + * out: + * none + */ +void +pxe_core_exclusive(uint8_t proto) +{ +#ifdef PXE_DEBUG_HELL + printf("pxe_core_exlusive(): %d protocol.\n", proto); +#endif + exclusive_protocol = proto; +} + + /* pxe_get_mymac() - returns NIC MAC * in: * none ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#14 (text+ko) ==== @@ -106,6 +106,9 @@ /* registers protocol */ void pxe_core_register(uint8_t ip_proto, pxe_protocol_call proc); +/* set this protocol exclusive, other packets are ignored */ +void pxe_core_exclusive(uint8_t proto); + /* returns NIC MAC */ const MAC_ADDR *pxe_get_mymac(); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#9 (text+ko) ==== @@ -118,7 +118,7 @@ reply_icmphdr->checksum = ~pxe_ip_checksum(reply_icmphdr, sizeof(PXE_ICMP_HDR) + data_size); - if (!pxe_ip_send(pack->data, iphdr->src_ip, PXE_ICMP_PROTOCOL, pack->data_size, 1) && echo_flags) { + if (!pxe_ip_send(pack->data, iphdr->src_ip, PXE_ICMP_PROTOCOL, pack->data_size) && echo_flags) { printf("pxe_ping(): failed to send echo reply.\n"); } @@ -193,7 +193,7 @@ icmphdr->checksum = ~(pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR) + 32)); - if (!pxe_ip_send(data, ip->ip, PXE_ICMP_PROTOCOL, pack_size, 1) && echo_flags) { + if (!pxe_ip_send(data, ip->ip, PXE_ICMP_PROTOCOL, pack_size) && echo_flags) { printf("pxe_ping(): failed to send echo reply.\n"); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#9 (text+ko) ==== @@ -350,54 +350,39 @@ * dst_ip - destination IP address * protocol- IP stack protocol (e.g. UDP) * size - size of data buffer - * flags - 1 if space reserved in buffer for IP header, 0 - otherwise * out: * 0 - failed * 1 - success */ int -pxe_ip_send(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size, int flags) +pxe_ip_send(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size) { - uint16_t pack_size = (flags == 0) ? size + sizeof(PXE_IP_HDR) : size; - PXE_PACKET pack; - PXE_PACKET* pack_out = &pack; + PXE_PACKET pack_out; int status = 0; - /* flags == 0: there is no space for ip header in user buffer - * flags == 1: user manually allocated space for ip header - */ - if (flags == 0) { - pack_out = pxe_core_alloc_packet(pack_size); - - if (pack_out == NULL) { /* failed to allocate packet*/ - return (0); - } - - /* copying user data */ - pxe_memcpy(data, pack_out->data + sizeof(PXE_IP_HDR), size); - } else { + pack_out.data = data; + pack_out.data_size = size; - pack_out->data = data; - pack_out->data_size = size; - } - - /* creating ip header */ - pxe_create_ip_hdr(pack_out->data, dst_ip, protocol, pack_size, 0); + pxe_create_ip_hdr(pack_out.data, dst_ip, protocol, size, 0); - /* setting pxe_core packet parameters*/ - pack_out->flags = (dst_ip != PXE_IP_BCAST) ? PXE_SINGLE : PXE_BCAST; - pack_out->protocol = PXE_PROTOCOL_IP; + /* setting pxe_core packet parameters */ + pack_out.flags = (dst_ip != PXE_IP_BCAST) ? PXE_SINGLE : PXE_BCAST; + pack_out.protocol = PXE_PROTOCOL_IP; - /* find gateway or direct MAC*/ + /* find gateway or direct MAC */ uint32_t ip_to_send = dst_ip; - if (pack_out->flags != PXE_BCAST) { + if (pack_out.flags != PXE_BCAST) { ip_to_send = pxe_ip_route_find(dst_ip); - pack_out->dest_mac = pxe_arp_ip4mac(ip_to_send); - } + pack_out.dest_mac = pxe_arp_ip4mac(ip_to_send); + } +#ifdef PXE_DEBUG_HELL + printf("pxe_ip_send(): %d proto, 0x%x, %s.\n", protocol, pack_out.dest_mac, + pack_out.flags == PXE_SINGLE ? "single" : "bcast"); +#endif - if ( (pack_out->flags != PXE_BCAST) && (pack_out->dest_mac == NULL) ) { + if ( (pack_out.flags != PXE_BCAST) && (pack_out.dest_mac == NULL) ) { /* MAC is not found for destination ip or gateway */ #ifdef PXE_DEBUG PXE_IPADDR dst; @@ -411,7 +396,7 @@ ); #endif } else { - if (!pxe_core_transmit(pack_out)) { + if (!pxe_core_transmit(&pack_out)) { #ifdef PXE_DEBUG printf("pxe_ip_send(): failed to send packet.\n"); #endif @@ -420,9 +405,5 @@ } } - if (flags == 0) { - pxe_core_commit(pack_out); - } - return (status); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#7 (text+ko) ==== @@ -79,7 +79,7 @@ int pxe_ip_route_default(uint32_t gw); /* sends ip packet */ -int pxe_ip_send(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size, int flags); +int pxe_ip_send(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size); /* show route table */ void pxe_ip_route_stat(); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#5 (text+ko) ==== @@ -84,6 +84,9 @@ void *data = NULL; PXE_TCP_QUEUED_SEGMENT *segment = NULL; + if (connection->send == NULL) + return (NULL); + for ( ; block_index < PXE_TCP_BLOCK_COUNT; ++block_index) { /* start of block */ @@ -168,7 +171,7 @@ pxe_resend_check(PXE_TCP_CONNECTION *connection) { #ifdef PXE_DEBUG - printf("pxe_resend_check(): started.\n"); + printf("pxe_resend_check(): started, state %d.\n", connection->state); #endif PXE_BUFFER *buffer = connection->send; void *data = buffer->data; @@ -203,6 +206,10 @@ segment->trys += 1; segment->resend_at += PXE_RESEND_TIME * segment->trys; + if (segment->trys == PXE_RESEND_TRYS) { + /* TODO: need to break connection */ + } + tcp_update_segment(connection, segment); pxe_tcp_send_segment(connection, segment); @@ -226,6 +233,10 @@ /* resend later, with more delay with every try */ segment->trys += 1; segment->resend_at += PXE_RESEND_TIME * segment->trys; + + if (segment->trys == PXE_RESEND_TRYS) { + /* TODO: need to break connection */ + } tcp_update_segment(connection, segment); pxe_tcp_send_segment(connection, segment); @@ -239,6 +250,72 @@ } } +/* pxe_resend_drop_same() - removes from resend queue older segments with same + * sequence number to avoid duplicate resending of same ACKs and etc. + * in: + * connection - connection to update segments for + * segment - segment to check with + * out: + * none + */ +void +pxe_resend_drop_same(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *new_segment) +{ +#ifdef PXE_DEBUG + printf("pxe_resend_drop_same(): started.\n"); +#endif + uint32_t drop_seq = new_segment->seq; + PXE_BUFFER *buffer = connection->send; + void *data = buffer->data; + int block_index = 0; + PXE_TCP_QUEUED_SEGMENT *segment = NULL; + uint8_t *buf_blocks = connection->buf_blocks; + + for ( ; block_index < PXE_TCP_BLOCK_COUNT; ++block_index) { + + /* block is used exclusevely by one "big" packet, skip this */ + if (buf_blocks[block_index] == PXE_TCP_BLOCK_EXCLUSIVE) { + + continue; + } + + if (buf_blocks[block_index] == PXE_TCP_BLOCK_FREE) + continue; /* block is unused */ + + /* pointer to head chunk of block */ + data = buffer->data + block_index * PXE_TCP_CHUNK_COUNT * connection->chunk_size; + + segment = (PXE_TCP_QUEUED_SEGMENT *)data; + + if (segment == new_segment) + continue; + + /* block is dirty, need to check chunks manually */ + int chunk_index = 0; + + for ( ; chunk_index < PXE_TCP_CHUNK_COUNT; ++chunk_index) { + + if (segment == new_segment) /* skip segment if it's new_segment */ + continue; + + if ( (segment->status != PXE_SEGMENT_FREE) && + (segment->seq == drop_seq) ) + { /* this segment is renewed by new segment */ +#ifdef PXE_DEBUG_HELL + printf("pxe_resend_drop_same(): dropping chunk %d#%d.\n", + chunk_index, block_index + ); +#endif + tcp_segment_free(connection, block_index, segment); + } + + /* point segment to next chunk */ + data += connection->chunk_size; + segment = (PXE_TCP_QUEUED_SEGMENT *)data; + } + } +} + /* pxe_resend_update() - update segments that were acked * in: * connection - connection to update segments for @@ -273,7 +350,7 @@ continue; /* it was not ever sent yet */ if (connection->una >= segment->seq) { /* segment was acked, release it */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_resend_update(): block %d acked.\n", block_index); #endif tcp_segment_free(connection, block_index, segment); @@ -303,9 +380,22 @@ } } +/* pxe_start_segment() - fills initial data in headers for provided segment + * in: + * connection - connection to update segments for + * segment - segment to start + * add_options - 1 if add default options (mss), 0 - do not add anything + * out: + * none + */ void tcp_start_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment, int add_options) { + if (segment == NULL) { + printf("tcp_start_segment(): segment = NULL.\n"); + return; + } + PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); /* reserving 8 bytes for options */ @@ -340,9 +430,22 @@ segment->seq = connection->next_send; } +/* pxe_finish_segment() - finishes segmentm calculates checksums and fills sequence numbers + * in: + * connection - connection to update segments for + * segment - segment to start + * tcp_flags - flags of header (PXE_TCP_...) + * out: + * none + */ void tcp_finish_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment, uint8_t tcp_flags) { + if (segment == NULL) { + printf("tcp_finish_segment(): segment = NULL.\n"); + return; + } + PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); uint16_t length = segment->size - sizeof(PXE_IP_HDR); @@ -393,9 +496,21 @@ #endif } +/* pxe_update_segment() - updates segment at resending, recalcs checksum for updated header + * in: + * connection - connection to update segments for + * segment - segment to start + * out: + * none + */ void tcp_update_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment) { + if (segment == NULL) { + printf("tcp_update_segment(): segment = NULL.\n"); + return; + } + PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); uint16_t length = segment->size - sizeof(PXE_IP_HDR); @@ -450,9 +565,14 @@ int pxe_tcp_send_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment) { + if (segment == NULL) { + printf("pxe_tcp_send_segment(): segment = NULL.\n"); + return (0); + } + PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); - if (!pxe_ip_send(tcp_packet, connection->dst_ip, PXE_TCP_PROTOCOL, segment->size, 1)) { + if (!pxe_ip_send(tcp_packet, connection->dst_ip, PXE_TCP_PROTOCOL, segment->size)) { printf("pxe_tcp_send_segment(): failed to send tcp packet to 0x%x\n", connection->dst_ip); return (0); } @@ -497,7 +617,6 @@ printf(" %d bytes.\n", length); #endif - /* check received packets */ return (1); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#4 (text+ko) ==== @@ -11,8 +11,10 @@ #define PXE_SEGMENT_USED 0x01 /* segment is filled with data, sent but not ACKed yet */ #define PXE_SEGMENT_SENT 0x02 -/* default resend time if not acked in seconds */ -#define PXE_RESEND_TIME 5 +/* default resend time if not acked, in seconds */ +#define PXE_RESEND_TIME 1 +/* default resend trys */ +#define PXE_RESEND_TRYS 5 /* how much blocks in buffer */ #define PXE_TCP_BLOCK_COUNT 8 @@ -56,6 +58,9 @@ /* updates resend queue, removes ACKed segments */ void pxe_resend_update(PXE_TCP_CONNECTION *connection); +/* removes segments that are dublicates or old versions of new segment */ +void pxe_resend_drop_same(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment); + /* destroys resend queue */ void pxe_resend_free(PXE_TCP_CONNECTION *connection); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#12 (text+ko) ==== @@ -94,11 +94,6 @@ return (-1); } - sbuf->bufsize = PXE_DEFAULT_SEND_BUFSIZE; - sbuf->bufleft = PXE_DEFAULT_SEND_BUFSIZE; - sbuf->fstart = 0; - sbuf->fend = sbuf->bufsize; - if (!pxe_buffer_memalloc(rbuf, PXE_DEFAULT_RECV_BUFSIZE)) { pxe_buffer_memfree(sbuf); @@ -106,11 +101,6 @@ return (-1); } - rbuf->bufsize = PXE_DEFAULT_RECV_BUFSIZE; - rbuf->bufleft = PXE_DEFAULT_RECV_BUFSIZE; - rbuf->fstart = 0; - rbuf->fend = rbuf->bufsize; - return (socket); } @@ -365,7 +355,7 @@ printf("pxe_sendto(): %8x:%d -> %8x:%d, size = %d bytes.\n", pxe_get_ip32(PXE_IP_MY), lport, ip, port, size); #endif - if (!pxe_udp_send(udp_pack, ip, port, lport, size + sizeof(PXE_UDP_PACKET), 1)) { + if (!pxe_udp_send(udp_pack, ip, port, lport, size + sizeof(PXE_UDP_PACKET))) { printf("pxe_sendto(): failed to send data.\n"); return (-1); } @@ -498,19 +488,52 @@ PXE_SOCKET *sock = &pxe_sockets[socket]; PXE_FILTER_ENTRY *filter = sock->filter; + + if ( (filter->protocol != PXE_UDP_PROTOCOL) && + (filter->protocol != PXE_TCP_PROTOCOL) ) + { + printf("pxe_recv(): only TCP and UDP sockets are implemented.\n"); + return (-1); + } - if (filter->protocol == PXE_UDP_PROTOCOL) { + uint32_t timer = 0; + uint32_t check_timer = 0; + + int result = 0; - return pxe_udp_read(sock, tobuf, buflen); + while (1) { - } else if (filter->protocol == PXE_TCP_PROTOCOL) { + if (filter->protocol == PXE_UDP_PROTOCOL) { - return pxe_tcp_read(sock, tobuf, buflen); - } + result = pxe_udp_read(sock, tobuf, buflen); + + } else { - printf("pxe_recv(): only TCP and UDP sockets are implemented.\n"); + result = pxe_tcp_read(sock, tobuf, buflen); + + } + + if (result != 0) + break; + + if (timer > PXE_SOCKET_TIMEOUT * 1000) + break; + + if (filter->protocol == PXE_TCP_PROTOCOL) { - return (-1); + if (check_timer > PXE_SOCKET_CHECK_TIMEOUT) { + check_timer = 0; + pxe_tcp_check_connection(sock); + } + } + + check_timer += 10; + timer += 10; + /* idle 10 ms */ + delay(10000); + } + + return (result); } /* pxe_recvfrom() - receive data to socket with information about sender ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#10 (text+ko) ==== @@ -12,6 +12,10 @@ #define PXE_DEFAULT_SOCKETS 8 /* default count of waiting queue */ #define PXE_DEFAULT_WAITCOUNT 3 +/* socket timeout when receiving data, in seconds */ +#define PXE_SOCKET_TIMEOUT 30 +/* timeout, after that force connection checking, in milliseconds */ +#define PXE_SOCKET_CHECK_TIMEOUT 200 /* socket states */ #define PXE_SOCKET_FREE 0x0 /* socket unused and free for allocating */ #define PXE_SOCKET_USED 0x1 /* socket structure used */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#7 (text+ko) ==== @@ -109,6 +109,12 @@ int tcp_is_acceptable(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet, uint16_t seglen) { + if (connection == NULL) + return (0); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 8 14:35:40 2007 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 E876316A485; Sun, 8 Jul 2007 14:35:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B02D116A46E for ; Sun, 8 Jul 2007 14:35:39 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9FD2713C4BD for ; Sun, 8 Jul 2007 14:35:39 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68EZdJW007642 for ; Sun, 8 Jul 2007 14:35:39 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68EZddO007639 for perforce@freebsd.org; Sun, 8 Jul 2007 14:35:39 GMT (envelope-from thioretic@FreeBSD.org) Date: Sun, 8 Jul 2007 14:35:39 GMT Message-Id: <200707081435.l68EZddO007639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123130 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, 08 Jul 2007 14:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123130 Change 123130 by thioretic@thioretic on 2007/07/08 14:34:58 Some rethinking of api (eg. no initto in make_device); Some logic stuff. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#10 edit .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#8 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#10 (text+ko) ==== @@ -105,4 +105,22 @@ # driver without any probing. Also a device may have multiple parents # and children. At this point it becomes obvious, that we should let # a driver not just process, but also produce and destroy an io request. - + # Inportant note: from above-said one can see, that since now newbus + # won't be a tree, it will be a graph! + # New logic: + # probe/attach: the dev->driver is set to drv_compat(driver) to be + # probed and attached. + # detach: will detach DRV_LOWEST driver and all filters consequently. + # As for functional devices (let's call like this all drivers with + # DR_REQDEV flag set), the following scenario looks reasonable: + # + # driver_handler: make_dev() & attach_all_parents() & DEVICE_PROBE + # DEVICE_PROBE: driver_probe + # driver_probe: parents = get_all_parents() + # FOR_EACH (parent, parents){ + # if (DEVICE_INFO (parent) == bad) + # detach_parent(parent) + # } + # + # here driver_handler & DEVICE_PROBE reside in subr_bus + # driver_probe resides in driver ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#8 (text+ko) ==== @@ -93,6 +93,7 @@ typedef TAILQ_HEAD(pdevclass_list, pdevclass) pdevclass_list_t; typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; typedef TAILQ_HEAD(device_list, device) device_list_t; +typedef TAILQ_HEAD(pdevice_list, pdevice) pdevice_list_t; typedef TAILQ_HEAD(drv_compat_list, drv_compat) drv_compat_list_t; typedef TAILQ_HEAD(pdrv_compat_list, pdrv_compat) pdrv_compat_list_t; @@ -133,8 +134,8 @@ TAILQ_ENTRY(device) link; /**< list of devices in parent */ TAILQ_ENTRY(device) devlink; /**< global device list membership */ //device_t parent; /**< parent of this device */ - device_list_t parents; - device_list_t children; /**< list of child devices */ + /*device_list_t*/ pdevice_list_t parents; + /*device_list_t*/ pdevice_list_t children; /**< list of child devices */ /* * Details of this device. @@ -163,11 +164,18 @@ u_char pad; void *ivars; /**< instance variables */ void *softc; /**< current driver's variables */ + u_long refs; struct sysctl_ctx_list sysctl_ctx; /**< state for sysctl variables */ struct sysctl_oid *sysctl_tree; /**< state for sysctl variables */ }; +struct pdevice { + device_t device_ptr; + TAILQ(pdevice) link; +}; + + static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc"); @@ -1335,7 +1343,7 @@ dev = dc->devices[i]; if (/*dev->driver == driver*/ is_device_driver(dev, driver) && !TAILQ_EMPTY(&(dev->parents)) && - (TAILQ_FIRST(&(dev->parent->devclass))) == busclass) { + (TAILQ_FIRST(&(dev->parents)))->device_ptr->devclass == busclass) { if ((error = device_detach(dev)) != 0) return (error); device_set_driver(dev, NULL); @@ -1411,7 +1419,7 @@ dev = dc->devices[i]; if (/*dev->driver == driver*/ is_device_driver(dev, driver) && !TAILQ_EMPTY(&(dev->parents) && - (TAILQ_FIRST(&(dev->parent)))->devclass == busclass) { + (TAILQ_FIRST(&(dev->parents)))->device_ptr->devclass == busclass) { if ((error = device_quiesce(dev)) != 0) return (error); } @@ -1832,12 +1840,13 @@ * @returns the new device */ static device_t -make_device(device_t parent, const char *name, int unit, driver_t *initto) /*TODO*/ +make_device(device_t parent, const char *name, int unit/*, driver_t *initto*/) /*TODO*/ { device_t dev; devclass_t dc; int level; drv_compat_t drvc; + pdevice *pd; PDEBUG(("%s at %s as unit %d", name, DEVICENAME(parent), unit)); @@ -1856,26 +1865,30 @@ if (!dev) return (NULL); TAILQ_INIT(&(dev->parents)); - TAILQ_INSERT_TAIL(&(dev->parents), *parent, link) + pd = malloc(sizeof(struct pdevice), M_BUS, M_NOWAIT|M_ZERO); + pd->device_ptr = parent; + TAILQ_INSERT_TAIL(&(dev->parents), pd, link); TAILQ_INIT(&(dev->children)); //kobj_init((kobj_t) dev, &null_class); kobj_init((kobj_t) dev, &drv_compat_ctrl_driver) //dev->driver = NULL; for (level=DRV_LOWEST; level<=DRV_TOPMOST; level++) TAILQ_INIT(&((dev->drivers)[level])); - if (initto){ + /*if (initto){ drvc = drv_compat_find_driver (initto); if (!(drvc->topology_ops = kobj_create (initto, M_BUS, M_NOWAIT|M_ZERO))) /*todo what??*/; - dev->devclass = devclass_find (DRIVERNAME(driver)); + /* dev->devclass = devclass_find (DRIVERNAME(driver)); level = drv_compat_flags2idx(drvc->flags); TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); dev->state = DS_ALIVE; } - else{ + else{*/ dev->devclass = NULL; dev->state = DS_NOTPRESENT; - } + /*}*/ + + dev->refs = 0; dev->unit = unit; dev->nameunit = NULL; dev->desc = NULL; @@ -1965,19 +1978,22 @@ device_t device_add_child_ordered(device_t dev, int order, const char *name, int unit) { - device_t child; - device_t place; + /*device_t*/ pdevice *child; + /*device_t*/ pdevice *place; PDEBUG(("%s at %s with order %d as unit %d", name, DEVICENAME(dev), order, unit)); - child = make_device(dev, name, unit, NULL); - if (child == NULL) - return (child); + child = malloc (sizeof(pdevice), M_BUS, M_NOWAIT|M_ZERO); + child->device_ptr = make_device(dev, name, unit/*, NULL*/); + if (child->device_ptr == NULL){ + free (child); + return (NULL); + } child->order = order; TAILQ_FOREACH(place, &dev->children, link) { - if (place->order > order) + if (place->device_ptr->order > order) break; } @@ -1994,6 +2010,7 @@ */ TAILQ_INSERT_TAIL(&dev->children, child, link); } + child->device_ptr->refs++; bus_data_generation_update(); return (child); @@ -2013,39 +2030,54 @@ * @retval non-zero a unit error code describing the error */ int -device_delete_child(device_t dev, device_t child) +device_delete_child(device_t dev, device_t child) /*TODO*/ { int error; - device_t grandchild; + /*device_t*/ pdevice *grandchild; + pdevice *pd; PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev))); - + + child->refs--; + if (child->refs) goto deletefromparent; /* remove children first */ while ( (grandchild = TAILQ_FIRST(&child->children)) ) { - error = device_delete_child(child, grandchild); + error = device_delete_child(child, grandchild->device_ptr); if (error) return (error); + free (grandchild); } if ((error = device_detach(child)) != 0) return (error); if (child->devclass) devclass_delete_device(child->devclass, child); - TAILQ_REMOVE(&dev->children, child, link); +deletefromparent: + TAILQ_FOREACH_SAFE(pd, &dev->children, link){ + if (pd->device_ptr == child){ + TAILQ_REMOVE(&dev->children, child, link); + free (pd); + break; + } + } + + if (child->refs) + return (0); + TAILQ_REMOVE(&bus_data_devices, child, devlink); kobj_delete((kobj_t) child, M_BUS); - + bus_data_generation_update(); return (0); } static int is_device_parent (device_t dev, device_t child){ - device_t dc; + pdevice *dc; TAILQ_FOREACH (dc, &(child->parents), link){ - if (dc == dev) return (1); + if (dc->device_ptr == dev) return (TRUE); } - return (0); + return (FALSE); } /** @@ -2263,8 +2295,11 @@ device_t device_get_parent(device_t dev) /*TODO*/ { - if (!TAILQ_EMPTY(&(dev->parents))) - return (TAILQ_FIRST(&(dev->parents))); + pdevice *pd; + if (!TAILQ_EMPTY(&(dev->parents))){ + pd = TAILQ_FIRST(&(dev->parents)); + return (pd->device_ptr); + } return (NULL); } @@ -2288,7 +2323,7 @@ device_get_children(device_t dev, device_t **devlistp, int *devcountp) { int count; - device_t child; + /*device_t*/ pdevice *child; device_t *list; count = 0; @@ -2302,7 +2337,7 @@ count = 0; TAILQ_FOREACH(child, &dev->children, link) { - list[count] = child; + list[count] = child->device_ptr; count++; } @@ -2584,12 +2619,12 @@ void device_busy(device_t dev) { - device_t parent; + pdevice *parent; if (dev->state < DS_ATTACHED) panic("device_busy: called for unattached device"); if (dev->busy == 0 && !TAILQ_EMPTY(&(dev->parents))){ TAILQ_FOREACH (parent, &(dev->parents), link){ - device_busy(parent); + device_busy(parent->device_ptr); } } dev->busy++; @@ -2602,6 +2637,7 @@ void device_unbusy(device_t dev) { + pdevice *parent; if (dev->state != DS_BUSY) panic("device_unbusy: called for non-busy device %s", device_get_nameunit(dev)); @@ -2609,7 +2645,7 @@ if (dev->busy == 0) { if (/*dev->parent*/!TAILQ_EMPTY(&(dev->parents))){ TAILQ_FOREACH (parent, &(dev->parents), link){ - device_unbusy(parent); + device_unbusy(parent->device_ptr); } } //device_unbusy(dev->parent); @@ -2713,6 +2749,8 @@ int device_set_driver(device_t dev, driver_t *driver) { + drv_compat_t drvc; + if (dev->state >= DS_ATTACHED) return (EBUSY); @@ -2723,23 +2761,26 @@ free(dev->softc, M_BUS_SC); dev->softc = NULL; } - kobj_delete((kobj_t) dev, 0); - dev->driver = driver; + //kobj_delete((kobj_t) dev, 0); + dev->driver = drvc = drv_compat_find_driver (driver); if (driver) { - kobj_init((kobj_t) dev, (kobj_class_t) driver); + if (!(drvc->topology_ops = kobj_create (initto, M_BUS, M_NOWAIT|M_ZERO))) + /*todo what??*/; + dev->driver = drvc; + //kobj_init((kobj_t) dev, (kobj_class_t) driver); if (!(dev->flags & DF_EXTERNALSOFTC) && driver->size > 0) { dev->softc = malloc(driver->size, M_BUS_SC, M_NOWAIT | M_ZERO); if (!dev->softc) { - kobj_delete((kobj_t) dev, 0); - kobj_init((kobj_t) dev, &null_class); + //kobj_delete((kobj_t) dev, 0); + //kobj_init((kobj_t) dev, &null_class); dev->driver = NULL; return (ENOMEM); } } - } else { + } /*else { kobj_init((kobj_t) dev, &null_class); - } + }*/ bus_data_generation_update(); return (0); @@ -2824,12 +2865,13 @@ device_attach(device_t dev) { int error; - device_t parent; + pdevice *pd; + drv_compat_t drvc; device_sysctl_init(dev); if (!device_is_quiet(dev)){ - TAILQ_FOREACH (parent, &(dev->parents), link){ - device_print_child(parent, dev); + TAILQ_FOREACH (pd, &(dev->parents), link){ + device_print_child(pd->device_ptr, dev); } } if ((error = DEVICE_ATTACH(dev)) != 0) { @@ -2842,6 +2884,12 @@ device_sysctl_fini(dev); dev->state = DS_NOTPRESENT; return (error); + } else { + drvc = dev->driver; + dev->devclass = devclass_find (DRIVERNAME(drvc->driver)); + level = drv_compat_flags2idx(drvc->flags); + TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); + driver = NULL; } dev->state = DS_ATTACHED; devadded(dev); @@ -2868,7 +2916,7 @@ device_detach(device_t dev) { int error; - device_t parent; + pdevice *pd; GIANT_REQUIRED; @@ -2882,9 +2930,9 @@ return (error); devremoved(dev); device_printf(dev, "detached\n"); - if (!TAILQ_EMPTY(&(dev->parent))){ - TAILQ_FOREACH (parent, &(dev->parents), link){ - BUS_CHILD_DETACHED(parent, dev); + if (!TAILQ_EMPTY(&(dev->parents))){ + TAILQ_FOREACH (pd, &(dev->parents), link){ + BUS_CHILD_DETACHED(pd->device_ptr, dev); } } @@ -3338,10 +3386,10 @@ int bus_generic_attach(device_t dev) { - device_t child; + /*device_t*/ pdevice *child; TAILQ_FOREACH(child, &dev->children, link) { - device_probe_and_attach(child); + device_probe_and_attach(child->device_ptr); } return (0); @@ -4112,7 +4160,7 @@ case MOD_LOAD: TAILQ_INIT(&bus_data_devices); kobj_class_compile((kobj_class_t) &root_driver); - root_bus = make_device(NULL, "root", 0, NULL); + root_bus = make_device(NULL, "root", 0/*, NULL*/); root_bus->desc = "System root bus"; kobj_init((kobj_t) root_bus, (kobj_class_t) &root_driver); root_bus->driver = &root_driver; @@ -4221,6 +4269,7 @@ kobj_class_t driver; char* parents[]; int count=0, isfilter; + device_t dev; dmd = (struct driver_module_data *)arg; drv_intnl = dmd->dmd_driver; @@ -4278,7 +4327,17 @@ } if(drv_intnl->flags & DR_REQDEV){ /*restrict to DR_LOWEST? */ - make_device (root_bus, DRIVERNAME(driver), -1, driver); + dev = make_device (root_bus, DRIVERNAME(driver), -1/*, driver*/); + device_set_driver(dev, driver); + /*if (!hasclass)*/ + device_set_devclass(child, dl->driver->name); + + /* Fetch any flags for the device before probing. + resource_int_value(dl->driver->name, child->unit, + "flags", &child->devflags); + */ + + result = DEVICE_PROBE(dev); /* todo: set all parents for device * parents are all devices (alive) in parent * devclasses From owner-p4-projects@FreeBSD.ORG Sun Jul 8 14:51:01 2007 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 F332C16A468; Sun, 8 Jul 2007 14:51:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D16D516A41F for ; Sun, 8 Jul 2007 14:51:00 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C27B813C447 for ; Sun, 8 Jul 2007 14:51:00 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68Ep0jm008924 for ; Sun, 8 Jul 2007 14:51:00 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68Ep0qI008921 for perforce@freebsd.org; Sun, 8 Jul 2007 14:51:00 GMT (envelope-from thioretic@FreeBSD.org) Date: Sun, 8 Jul 2007 14:51:00 GMT Message-Id: <200707081451.l68Ep0qI008921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123132 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, 08 Jul 2007 14:51:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123132 Change 123132 by thioretic@thioretic on 2007/07/08 14:50:51 Detach fix. Plus to change 123130 desc: Cause newbus is now graph, a references counter (refs) is added to device struct. Device is deleted as soon as refs is 0. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#9 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#9 (text+ko) ==== @@ -2940,7 +2940,7 @@ devclass_delete_device(dev->devclass, dev); dev->state = DS_NOTPRESENT; - device_set_driver(dev, NULL); + //device_set_driver(dev, NULL); device_set_desc(dev, NULL); device_sysctl_fini(dev); From owner-p4-projects@FreeBSD.ORG Sun Jul 8 17:38:19 2007 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 E661716A421; Sun, 8 Jul 2007 17:38:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A006316A400 for ; Sun, 8 Jul 2007 17:38:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8E9B413C448 for ; Sun, 8 Jul 2007 17:38:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68HcI04039992 for ; Sun, 8 Jul 2007 17:38:18 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68Hbd7i039977 for perforce@freebsd.org; Sun, 8 Jul 2007 17:37:39 GMT (envelope-from csjp@freebsd.org) Date: Sun, 8 Jul 2007 17:37:39 GMT Message-Id: <200707081737.l68Hbd7i039977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 123149 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, 08 Jul 2007 17:38:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123149 Change 123149 by csjp@push on 2007/07/08 17:37:06 Integrate the zerocopybpf branch Affected files ... .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/intr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/kdb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/profile.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pte.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/zcopybpf/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/README.quirks#1 branch .. //depot/projects/zcopybpf/src/sys/cam/cam.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/zcopybpf/src/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.sparc64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.sun4v#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#8 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#9 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.amd64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.arm#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.ia64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.pc98#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.mk#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#7 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.amd64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.arm#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.i386#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.pc98#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#4 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.h#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aha/aha.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/amd/amd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/asr/asr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/README#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/md/md.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/build-version.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/version.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-list.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-pal.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-template.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-queue.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-channel.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-config.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-device.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-driver.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-event.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-fifo.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmt.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-regs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-ring.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-stats.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-types.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xge-osdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xge-queue.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-config.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/nxge/xgell-version.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/clone.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sound/clone.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ds1.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/unit.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sound/unit.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/version.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/trm/trm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/wds/wd7000.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/umapfs/umap.h#2 delete .. //depot/projects/zcopybpf/src/sys/fs/umapfs/umap_subr.c#3 delete .. //depot/projects/zcopybpf/src/sys/fs/umapfs/umap_vfsops.c#3 delete .. //depot/projects/zcopybpf/src/sys/fs/umapfs/umap_vnops.c#3 delete .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/zcopybpf/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/zcopybpf/src/sys/i386/include/kdb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/zcopybpf/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/iavc/iavc_isa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/capi/iavc/iavc_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_isppp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/zcopybpf/src/sys/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/ksched.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_core.c#3 delete .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_prof.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_unit.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 8 19:54:55 2007 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 05BF716A468; Sun, 8 Jul 2007 19:54:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AAFE416A400 for ; Sun, 8 Jul 2007 19:54:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 99B3613C457 for ; Sun, 8 Jul 2007 19:54:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68JssAe052078 for ; Sun, 8 Jul 2007 19:54:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68Jr6m4052000 for perforce@freebsd.org; Sun, 8 Jul 2007 19:53:06 GMT (envelope-from marcel@freebsd.org) Date: Sun, 8 Jul 2007 19:53:06 GMT Message-Id: <200707081953.l68Jr6m4052000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 123155 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, 08 Jul 2007 19:54:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=123155 Change 123155 by marcel@marcel_xcllnt on 2007/07/08 19:52:05 IFC @123152 Affected files ... .. //depot/projects/powerpc/ObsoleteFiles.inc#9 integrate .. //depot/projects/powerpc/UPDATING#10 integrate .. //depot/projects/powerpc/bin/date/date.1#2 integrate .. //depot/projects/powerpc/bin/df/df.c#5 integrate .. //depot/projects/powerpc/bin/ed/Makefile#2 integrate .. //depot/projects/powerpc/bin/sh/var.c#3 integrate .. //depot/projects/powerpc/cddl/lib/Makefile#3 integrate .. //depot/projects/powerpc/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/powerpc/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/powerpc/contrib/bind9/CHANGES#3 integrate .. //depot/projects/powerpc/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ#3 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/powerpc/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/powerpc/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/README#3 integrate .. //depot/projects/powerpc/contrib/bind9/README.idnkit#1 branch .. //depot/projects/powerpc/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/aclconf.c#2 delete .. //depot/projects/powerpc/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/aclconf.h#2 delete .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/configure.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 8 20:42:56 2007 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 BB26D16A469; Sun, 8 Jul 2007 20:42:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5FB2416A400 for ; Sun, 8 Jul 2007 20:42:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4ED1113C45B for ; Sun, 8 Jul 2007 20:42:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68Kgt80057362 for ; Sun, 8 Jul 2007 20:42:55 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68Kgtd3057359 for perforce@freebsd.org; Sun, 8 Jul 2007 20:42:55 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 8 Jul 2007 20:42:55 GMT Message-Id: <200707082042.l68Kgtd3057359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123157 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, 08 Jul 2007 20:42:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123157 Change 123157 by gcooper@optimus-revised_pkgtools on 2007/07/08 20:41:56 Added minor buffering attempts for parsing +CONTENTS (it appears that this is a point of concern when installing files -- lags quite a bit according to the data I've compiled over the lifetime of the process), and simple profiling scripts (in Perl and bourne shell) to help illustrate my point. Please note that in its current state this requires a lot of disk space. I racked up 25 GB of text files and logs for running 500 iterations on 128 packages. Use ./run_prof.sh with arguments (origin name for a package) or none to glob for all packages present in /usr/ports/packages/All Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#1 add Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#3 (text+ko) ==== @@ -136,18 +136,35 @@ sb.st_size = 100000; /* Make up a plausible average size */ } Home = make_playpen(playpen, sb.st_size * 4); + + static struct timespec before, after, time_diff; + if (!Home) errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); where_to = Home; + + clock_gettime(CLOCK_REALTIME, &before); + /* Since we can call ourselves recursively, keep notes on where we came from */ if (!getenv("_TOP")) setenv("_TOP", Home, 1); + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "_TOP setenv", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + if (unpack(pkg_fullname, extract)) { warnx( "unable to extract table of contents file from '%s' - not a package?", pkg_fullname); goto bomb; } + + clock_gettime(CLOCK_REALTIME, &before); + cfile = fopen(CONTENTS_FNAME, "r"); if (!cfile) { warnx( @@ -155,6 +172,14 @@ CONTENTS_FNAME); goto bomb; } + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "+CONTENTS fopen", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + read_plist(&Plist, cfile); fclose(cfile); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#3 (text+ko) ==== @@ -105,6 +105,17 @@ #define PLIST_FMT_VER_MAJOR 1 #define PLIST_FMT_VER_MINOR 1 +#define BUFFER_TRY 1 +#define SIMPLE_PROF_TRY 1 + +#ifndef BUFFER_TRY +#define BUFFER_TRY 0 +#endif + +#ifndef SIMPLE_PROF_TRY +#define SIMPLE_PROF_TRY 0 +#endif + enum _plist_t { PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD, PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE, @@ -158,7 +169,18 @@ char *where_playpen(void); void leave_playpen(void); off_t min_free(const char *); +//static char *find_playpen(char *, off_t); + +#if SIMPLE_PROF_TRY + +char *make_playpen_np(char *, off_t); +void leave_playpen_np(void); +char *find_playpen_np(char *, off_t); + +char* run_generic_playpen_prof(char *fn_name, ...); +#endif + /* String */ char *get_dash_string(char **); char *copy_string(const char *); @@ -189,6 +211,10 @@ int unpack(const char *, const char *); void format_cmd(char *, int, const char *, const char *, const char *); +#if SIMPLE_PROF_TRY +int delete_hierarchy_np(const char *, Boolean, Boolean); +#endif + /* Msg */ void upchuck(const char *); void barf(const char *, ...); @@ -213,6 +239,19 @@ int delete_package(Boolean, Boolean, Package *); Boolean make_preserve_name(char *, int, const char *, const char *); +#if SIMPLE_PROF_TRY + +int run_generic_plist_prof(char *fn_name, ...); +void add_plist_np(Package *, plist_t, const char *); +void add_plist_top_np(Package *, plist_t, const char *); +void delete_plist_np(Package *pkg, Boolean all, plist_t type, const char *name); +void write_plist_np(Package *, FILE *); +void read_plist_np(Package *, FILE *); +int plist_cmd_np(const char *, char **); +int delete_package_np(Boolean, Boolean, Package *); + +#endif + /* For all */ int pkg_perform(char **); int real_main(int, char **); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#3 (text+ko) ==== @@ -32,16 +32,72 @@ static char PenLocation[FILENAME_MAX]; static char Previous[FILENAME_MAX]; +#if SIMPLE_PROF_TRY +char * +run_generic_playpen_prof(char *fn_name, ...) +{ + + static struct timespec before, after, time_diff; + + va_list arg_list; + + va_start(arg_list, fn_name); + + clock_gettime(CLOCK_PROF, &before); + + char *ret_string = NULL; + + if(!strcmp(fn_name, "make_playpen")) { + + char *pen = va_arg(arg_list, char*); + off_t sz = va_arg(arg_list, off_t); + + ret_string = make_playpen_np(pen, sz); + + } else if(!strcmp(fn_name, "find_playpen")) { + + char *pen = va_arg(arg_list, char*); + off_t sz = va_arg(arg_list, off_t); + + ret_string = find_playpen_np(pen, sz); + + } else if(!strcmp(fn_name, "leave_playpen")) { + leave_playpen_np(); + } + + clock_gettime(CLOCK_PROF, &after); + + va_end(arg_list); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", fn_name, (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + + return ret_string; + +} +#endif + char * where_playpen(void) { return PenLocation; } +static char * +find_playpen(char *pen, off_t sz) { +#if SIMPLE_PROF_TRY + return run_generic_playpen_prof("find_playpen", pen, sz); +} + /* Find a good place to play. */ -static char * -find_play_pen(char *pen, off_t sz) +char * +find_playpen_np(char *pen, off_t sz) { +#endif + char *cp; struct stat sb; @@ -91,14 +147,23 @@ free(pstack[pdepth--]); } +char * +make_playpen(char *pen, off_t sz) +{ +#if SIMPLE_PROF_TRY + return run_generic_playpen_prof("make_playpen", pen, sz); +} + /* * Make a temporary directory to play in and chdir() to it, returning * pathname of previous working directory. */ char * -make_playpen(char *pen, off_t sz) +make_playpen_np(char *pen, off_t sz) { - if (!find_play_pen(pen, sz)) +#endif + + if (!find_playpen(pen, sz)) return NULL; if (!mkdtemp(pen)) { @@ -139,10 +204,19 @@ return Previous; } +void +leave_playpen() +{ +#if SIMPLE_PROF_TRY + run_generic_playpen_prof("leave_playpen"); +} + /* Convenience routine for getting out of playpen */ void -leave_playpen() +leave_playpen_np() { +#endif + void (*oldsig)(int); /* Don't interrupt while we're cleaning up */ ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#3 (text+ko) ==== @@ -25,10 +25,109 @@ #include #include +#include +#include + +#if SIMPLE_PROF_TRY +int +run_generic_plist_prof(char *fn_name, ...) +{ + + static struct timespec before, after, time_diff; + + va_list arg_list; + + int ret_code = 0; + + va_start(arg_list, fn_name); + + clock_gettime(CLOCK_REALTIME, &before); + + if(!strcmp(fn_name, "read_plist")) { + + Package *pkg = va_arg(arg_list, Package*); + FILE *fp = va_arg(arg_list, FILE*); + + read_plist_np(pkg, fp); + + } else if(!strcmp(fn_name, "write_plist")) { + + Package *pkg = va_arg(arg_list, Package*); + FILE *fp = va_arg(arg_list, FILE*); + + write_plist_np(pkg, fp); + + } else if(!strcmp(fn_name, "delete_package")) { + + Boolean ign_err = va_arg(arg_list, Boolean); + Boolean rem_dirs = va_arg(arg_list, Boolean); + + Package *pkg = va_arg(arg_list, Package*); + + ret_code = delete_package_np(ign_err, rem_dirs, pkg); + + } else if(!strcmp(fn_name, "delete_hierarchy")) { + + char *dirname = (char*) va_arg(arg_list, const char*); + + Boolean ign_err = va_arg(arg_list, Boolean); + Boolean rem_dirs = va_arg(arg_list, Boolean); + + ret_code = delete_hierarchy_np(dirname, ign_err, rem_dirs); + + } else if(!strcmp(fn_name, "plist_cmd")) { + + char * str = va_arg(arg_list, char*); + char ** arg = va_arg(arg_list, char**); + + ret_code = plist_cmd_np(str, arg); + + } else if(!strcmp(fn_name, "add_plist")) { + + Package *p = va_arg(arg_list, Package*); + plist_t type = va_arg(arg_list, plist_t); + const char *arg = va_arg(arg_list, const char*); + + add_plist_np(p, type, arg); + + } else if(!strcmp(fn_name, "add_plist_top")) { + + Package *p = va_arg(arg_list, Package*); + plist_t type = va_arg(arg_list, plist_t); + const char *arg = va_arg(arg_list, const char*); + + add_plist_top_np(p, type, arg); + + } + + clock_gettime(CLOCK_REALTIME, &after); + + va_end(arg_list); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", fn_name, (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + + return ret_code; + +} +#endif + /* Add an item to a packing list */ void add_plist(Package *p, plist_t type, const char *arg) { +#if SIMPLE_PROF_TRY + run_generic_plist_prof("add_plist", p, type, arg); +} + +void +add_plist_np(Package *p, plist_t type, const char *arg) +{ +#endif + PackingList tmp; tmp = new_plist_entry(); @@ -54,11 +153,20 @@ default: break; } + } void add_plist_top(Package *p, plist_t type, const char *arg) { +#if SIMPLE_PROF_TRY + run_generic_plist_prof("add_plist_top", p, type, arg); +} + +void +add_plist_top_np(Package *p, plist_t type, const char *arg) +{ +#endif PackingList tmp; tmp = new_plist_entry(); @@ -176,13 +284,22 @@ pkg->head = pkg->tail = NULL; } +int +plist_cmd(const char *s, char **arg) +{ +#if SIMPLE_PROF_TRY + return run_generic_plist_prof("plist_cmd", s, arg); +} + /* * For an ascii string denoting a plist command, return its code and * optionally its argument(s) */ int -plist_cmd(const char *s, char **arg) +plist_cmd_np(const char *s, char **arg) { +#endif + char cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */ char *cp; const char *sp; @@ -251,32 +368,85 @@ return FAIL; } +void +read_plist(Package *pkg, FILE *fp) +{ +#if SIMPLE_PROF_TRY + run_generic_plist_prof("read_plist", pkg, fp); +} + /* Read a packing list from a file */ void -read_plist(Package *pkg, FILE *fp) +read_plist_np(Package *pkg, FILE *fp) { - char *cp, pline[FILENAME_MAX]; - int cmd, major, minor; +#endif + +#if BUFFER_TRY + +#define MAX_BUFFER_LINES 20 + + char pline[MAX_BUFFER_LINES][FILENAME_MAX]; + + int i = -1; + int j = -1; + +#else + char pline[FILENAME_MAX]; +#endif + + char *cp; + int cmd, len, major, minor; pkg->fmtver_maj = 1; pkg->fmtver_mnr = 0; pkg->origin = NULL; + +#if BUFFER_TRY + + while (i) { + + for(i = 0; i < MAX_BUFFER_LINES && fgets(pline[i], FILENAME_MAX, fp); i++) ; + + if(!i) + break; + + for(j = 0; j < i; j++) { + + len = strlen(pline[j]); + + while(len && isspace(pline[j][len-1])) + pline[j][--len] = '\0'; + if(!len) + continue; + cp = pline[j]; + +#else + while (fgets(pline, FILENAME_MAX, fp)) { - int len = strlen(pline); + len = strlen(pline); while (len && isspace(pline[len - 1])) pline[--len] = '\0'; if (!len) continue; cp = pline; - if (pline[0] != CMD_CHAR) { + +#endif + + if (cp[0] != CMD_CHAR) { cmd = PLIST_FILE; goto bottom; } + +#if BUFFER_TRY + cmd = plist_cmd(pline[j] + 1, &cp); +#else cmd = plist_cmd(pline + 1, &cp); +#endif + if (cmd == FAIL) { warnx("%s: unknown command '%s' (package tools out of date?)", - __func__, pline); + __func__, cp); goto bottom; } if (*cp == '\0') { @@ -298,15 +468,31 @@ exit(2); } } + bottom: add_plist(pkg, cmd, cp); +#if BUFFER_TRY + + } +#endif + } + +} + +void +write_plist(Package *pkg, FILE *fp) +{ +#if SIMPLE_PROF_TRY + run_generic_plist_prof("write_plist", pkg, fp); } /* Write a packing list to a file, converting commands to ascii equivs */ void -write_plist(Package *pkg, FILE *fp) +write_plist_np(Package *pkg, FILE *fp) { +#endif + PackingList plist = pkg->head; while (plist) { @@ -402,6 +588,13 @@ } } +int +delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) +{ +#if SIMPLE_PROF_TRY + return run_generic_plist_prof("delete_package", ign_err, nukedirs, pkg); +} + /* * Delete the results of a package installation. * @@ -409,14 +602,18 @@ * run it too in cases of failure. */ int -delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) +delete_package_np(Boolean ign_err, Boolean nukedirs, Package *pkg) { +#endif + PackingList p; const char *Where = ".", *last_file = ""; Boolean fail = SUCCESS; Boolean preserve; char tmp[FILENAME_MAX], *name = NULL; char *prefix = NULL; + char linkbuf[FILENAME_MAX]; + int len; preserve = find_plist_option(pkg, "preserve") ? TRUE : FALSE; for (p = pkg->head; p; p = p->next) { @@ -464,8 +661,6 @@ * by readlink(). */ if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) { - int len; - char linkbuf[FILENAME_MAX]; if ((len = readlink(tmp, linkbuf, FILENAME_MAX)) > 0) cp = MD5Data((unsigned char *)linkbuf, len, buf); @@ -536,13 +731,23 @@ #define REMOVE(file,ie) (remove(file) && !(ie)) #endif +int +delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) +{ +#if SIMPLE_PROF_TRY + return run_generic_plist_prof("delete_hierarchy", dir, ign_err, nukedirs); +} + /* Selectively delete a hierarchy */ int -delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) +delete_hierarchy_np(const char *dir, Boolean ign_err, Boolean nukedirs) { +#endif + char *cp1, *cp2; cp1 = cp2 = strdup(dir); + if (!fexists(dir)) { if (!ign_err) warnx("%s '%s' doesn't exist", From owner-p4-projects@FreeBSD.ORG Sun Jul 8 20:46:00 2007 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 17D5F16A46C; Sun, 8 Jul 2007 20:46:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE04A16A469 for ; Sun, 8 Jul 2007 20:45:59 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CF0D013C457 for ; Sun, 8 Jul 2007 20:45:59 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68KjxUh057584 for ; Sun, 8 Jul 2007 20:45:59 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68Kjx1h057581 for perforce@freebsd.org; Sun, 8 Jul 2007 20:45:59 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 8 Jul 2007 20:45:59 GMT Message-Id: <200707082045.l68Kjx1h057581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123158 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, 08 Jul 2007 20:46:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=123158 Change 123158 by gcooper@optimus-revised_pkgtools on 2007/07/08 20:45:33 On second thought, I should check to make sure that the package directory (/usr/ports/packages/All) exists before running a lot of iterations with the perl scripts, which may result in 'interesting' failures. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#2 (text+ko) ==== @@ -8,6 +8,7 @@ ITERATIONS=500 LOG_DIR="/store/motonoad0/profile_logs" +PACKAGE_DIR="/usr/ports/packages/All" echo "Please change LOG_DIR's value" exit -1; @@ -16,7 +17,12 @@ [ ! -d "$LOG_DIR" ] && mkdir -p $LOG_DIR -cd /usr/ports/packages/All +if [ ! -d "$PACKAGE_DIR" ] ; then + echo "ERROR: $PACKAGE_DIR doesn't exist; exiting.." + exit -1; +fi + +cd $PACKAGE_DIR for i in $pkgs; do $SCRIPT_DIR/prof_process.pl $ITERATIONS ${i}* $LOG_DIR From owner-p4-projects@FreeBSD.ORG Sun Jul 8 21:15:41 2007 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 0111516A46E; Sun, 8 Jul 2007 21:15:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B97DC16A421 for ; Sun, 8 Jul 2007 21:15:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C821813C48A for ; Sun, 8 Jul 2007 21:15:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l68LFdb5069602 for ; Sun, 8 Jul 2007 21:15:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l68LFZl4069597 for perforce@freebsd.org; Sun, 8 Jul 2007 21:15:35 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 8 Jul 2007 21:15:35 GMT Message-Id: <200707082115.l68LFZl4069597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 123159 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, 08 Jul 2007 21:15:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123159 Change 123159 by kmacy@parmacvm:opentoe_parvm on 2007/07/08 21:15:04 IFC Affected files ... .. //depot/projects/opentoe/ObsoleteFiles.inc#11 integrate .. //depot/projects/opentoe/UPDATING#11 integrate .. //depot/projects/opentoe/bin/sh/var.c#4 integrate .. //depot/projects/opentoe/etc/inetd.conf#2 integrate .. //depot/projects/opentoe/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/opentoe/include/Makefile#5 integrate .. //depot/projects/opentoe/lib/libarchive/Makefile#7 integrate .. //depot/projects/opentoe/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/main.c#5 integrate .. //depot/projects/opentoe/lib/libarchive/test/test.h#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/opentoe/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/opentoe/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/arm/SYS.h#2 integrate .. //depot/projects/opentoe/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/opentoe/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/opentoe/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/ia64/SYS.h#2 integrate .. //depot/projects/opentoe/lib/libc/ia64/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/opentoe/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/opentoe/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/opentoe/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/opentoe/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/opentoe/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/opentoe/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/opentoe/lib/libc/sys/pread.c#2 integrate .. //depot/projects/opentoe/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/opentoe/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/opentoe/lib/libgssapi/gss_display_status.c#3 integrate .. //depot/projects/opentoe/sbin/ifconfig/iflagg.c#3 integrate .. //depot/projects/opentoe/sbin/ping6/Makefile#3 integrate .. //depot/projects/opentoe/share/examples/isdn/FAQ#2 integrate .. //depot/projects/opentoe/share/examples/isdn/Overview#2 integrate .. //depot/projects/opentoe/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/opentoe/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/opentoe/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/opentoe/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/opentoe/sys/Makefile#5 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/opentoe/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/opentoe/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/opentoe/sys/conf/NOTES#9 integrate .. //depot/projects/opentoe/sys/conf/files#12 integrate .. //depot/projects/opentoe/sys/conf/files.amd64#6 integrate .. //depot/projects/opentoe/sys/conf/files.i386#6 integrate .. //depot/projects/opentoe/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/opentoe/sys/conf/options#11 integrate .. //depot/projects/opentoe/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/opentoe/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/opentoe/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/opentoe/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/opentoe/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/opentoe/sys/dev/re/if_re.c#5 integrate .. //depot/projects/opentoe/sys/dev/rp/rp.c#3 integrate .. //depot/projects/opentoe/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/opentoe/sys/dev/snp/snp.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/opentoe/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/umass.c#6 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/opentoe/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/opentoe/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/opentoe/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/opentoe/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/opentoe/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/opentoe/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/opentoe/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/opentoe/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/opentoe/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/opentoe/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/opentoe/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/opentoe/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/opentoe/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/opentoe/sys/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/opentoe/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/opentoe/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/opentoe/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/opentoe/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/opentoe/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/opentoe/sys/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/opentoe/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/opentoe/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/opentoe/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/opentoe/sys/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/opentoe/sys/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/opentoe/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/opentoe/sys/kern/init_sysent.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_conf.c#5 integrate .. //depot/projects/opentoe/sys/kern/kern_sx.c#8 integrate .. //depot/projects/opentoe/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/opentoe/sys/kern/subr_unit.c#3 integrate .. //depot/projects/opentoe/sys/kern/sys_generic.c#5 integrate .. //depot/projects/opentoe/sys/kern/syscalls.c#2 integrate .. //depot/projects/opentoe/sys/kern/syscalls.master#2 integrate .. //depot/projects/opentoe/sys/kern/systrace_args.c#2 integrate .. //depot/projects/opentoe/sys/kern/tty_pts.c#3 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/opentoe/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/opentoe/sys/net/if_lagg.c#4 integrate .. //depot/projects/opentoe/sys/net/if_lagg.h#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/opentoe/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/opentoe/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/opentoe/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/dest6.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/frag6.c#3 integrate .. //depot/projects/opentoe/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6.h#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/opentoe/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/opentoe/sys/netinet6/mld6.c#3 integrate .. //depot/projects/opentoe/sys/netinet6/nd6.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/route6.c#3 integrate .. //depot/projects/opentoe/sys/netinet6/scope6.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/opentoe/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/opentoe/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/opentoe/sys/opencrypto/cast.c#2 integrate .. //depot/projects/opentoe/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/opentoe/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/opentoe/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/opentoe/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/opentoe/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/opentoe/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/opentoe/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/opentoe/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/opentoe/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/opentoe/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/opentoe/sys/sys/param.h#8 integrate .. //depot/projects/opentoe/sys/sys/sx.h#7 integrate .. //depot/projects/opentoe/sys/sys/syscall.h#2 integrate .. //depot/projects/opentoe/sys/sys/syscall.mk#2 integrate .. //depot/projects/opentoe/sys/sys/sysproto.h#2 integrate .. //depot/projects/opentoe/sys/sys/systm.h#8 integrate .. //depot/projects/opentoe/sys/vm/vm_fault.c#7 integrate .. //depot/projects/opentoe/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase1.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase2.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.icase3.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/opentoe/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/opentoe/usr.bin/sed/compile.c#2 integrate .. //depot/projects/opentoe/usr.bin/sed/defs.h#2 integrate .. //depot/projects/opentoe/usr.bin/sed/sed.1#3 integrate .. //depot/projects/opentoe/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/opentoe/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdnd/isdnd.8#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdnd/isdnd.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdndebug/main.c#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdndecode/decode.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdnphone/defs.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdntel/defs.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdntelctl/main.c#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdntest/main.c#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/isdntrace/trace.h#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/man/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/i4b/man/i4b.4#2 integrate .. //depot/projects/opentoe/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/opentoe/usr.sbin/ppp/i4b.c#2 integrate .. //depot/projects/opentoe/usr.sbin/rrenumd/Makefile#3 integrate .. //depot/projects/opentoe/usr.sbin/traceroute6/Makefile#3 integrate Differences ... ==== //depot/projects/opentoe/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.102 2007/07/03 13:06:45 mlaier Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070705: I4B headers repo-copied to include/i4b/ +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/i4b_cause.h +OLD_FILES+=usr/include/machine/i4b_debug.h +OLD_FILES+=usr/include/machine/i4b_ioctl.h +OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h +OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h +OLD_FILES+=usr/include/machine/i4b_trace.h +.endif +# 20070704: I4B 'modules' temporary disconnected +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i4bing.4.gz +OLD_FILES+=usr/share/man/man4/i4bipr.4.gz +OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz +.endif # 20070703: pf 4.1 import OLD_FILES+=usr/libexec/ftp-proxy # 20070701: KAME IPSec removal ==== //depot/projects/opentoe/UPDATING#11 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20070704: + The new IPsec code is now compiled in using the IPSEC option. The + IPSEC option now requires "device crypto" be defined in your kernel + configuration. The FAST_IPSEC kernel option is now deprecated. + 20070702: The packet filter (pf) code has been updated to OpenBSD 4.1 Please note the changed syntax - keep state is now on by default. Also @@ -41,6 +46,11 @@ cards should be configured using ifconfig(8), see the man page for more information. +20060612: + The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver + instead of the nve(4) driver. Please update your configuration + accordingly. + 20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If @@ -877,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.500 2007/07/03 13:06:44 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.502 2007/07/06 06:35:50 yongari Exp $ ==== //depot/projects/opentoe/bin/sh/var.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $"); #include #include @@ -278,6 +278,30 @@ return 0; } + +/* + * Sets/unsets an environment variable from a pointer that may actually be a + * pointer into environ where the string should not be manipulated. + */ +static void +change_env(char *s, int set) +{ + char *eqp; + char *ss; + + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + if (set && eqp != NULL) + (void) setenv(ss, eqp + 1, 1); + else + (void) unsetenv(ss); + ckfree(ss); + + return; +} + + /* * Same as setvar except that the variable and value are passed in * the first argument as name=value. Since the first argument will @@ -289,7 +313,6 @@ setvareq(char *s, int flags) { struct var *vp, **vpp; - char *p; int len; if (aflag) @@ -320,10 +343,7 @@ if (vp == &vmpath || (vp == &vmail && ! mpathset())) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -339,10 +359,7 @@ INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -603,10 +620,7 @@ vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - p = strchr(vp->text, '='); - *p = '\0'; - (void) setenv(vp->text, p + 1, 1); - *p = '='; + change_env(vp->text, 1); (void) setlocale(LC_ALL, ""); } goto found; @@ -798,7 +812,7 @@ if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + change_env(s, 0); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; ==== //depot/projects/opentoe/etc/inetd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.72 2006/08/31 17:15:10 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.73 2007/07/05 09:46:53 delphij Exp $ # # Internet server configuration database # @@ -118,9 +118,3 @@ #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd #swat stream tcp nowait/400 root /usr/local/sbin/swat swat -# -# Enable the following entry to enable ftp-proxy to NAT ftp sessions with pf -# N.B.: inetd binds to * in the default installation so you should add -# an appropriate block rule to your pf.conf -# -#ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy ==== //depot/projects/opentoe/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.116 2007/07/01 12:08:05 gnn Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.117 2007/07/06 07:20:59 bz Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -183,6 +183,8 @@ .. gssapi .. + i4b + .. isofs cd9660 .. ==== //depot/projects/opentoe/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.272 2007/07/01 12:08:05 gnn Exp $ +# $FreeBSD: src/include/Makefile,v 1.273 2007/07/06 07:20:59 bz Exp $ # # Doing a "make install" builds /usr/include. @@ -26,6 +26,9 @@ ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ wctype.h wordexp.h +I4BHDRS=i4b_cause.h i4b_debug.h i4b_ioctl.h i4b_rbch_ioctl.h \ + i4b_tel_ioctl.h i4b_trace.h + MHDRS= float.h floatingpoint.h stdarg.h PHDRS= sched.h semaphore.h _semaphore.h @@ -175,6 +178,13 @@ cd ${.CURDIR}/../sys/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \ ${DESTDIR}${INCLUDEDIR}/crypto +.if ${MACHINE_ARCH} == "i386" +.if ${MK_I4B} != "no" + cd ${.CURDIR}/../sys/i4b/include; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${I4BHDRS} \ + ${DESTDIR}${INCLUDEDIR}/i4b +.endif +.endif cd ${.CURDIR}/../sys/opencrypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto @@ -256,6 +266,11 @@ ln -fs ../../../sys/crypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done + cd ${.CURDIR}/../sys/i4b/include; \ + for h in ${I4BHDRS}; do \ + ln -fs ../../../sys/i4b/include/$$h \ + ${DESTDIR}${INCLUDEDIR}/i4b; \ + done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ ln -fs ../../../sys/opencrypto/$$h \ ==== //depot/projects/opentoe/lib/libarchive/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.75 2007/07/07 16:55:42 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -13,7 +13,12 @@ ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' +ARCHIVE_API_REV!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/.*\.//' +# Can't use /usr/bin/printf to format the version stamp here, because +# that's not available during installworld. Fortunately, awk is. +ARCHIVE_VERSION_STAMP!= echo ${ARCHIVE_API_MAJOR} ${ARCHIVE_API_MINOR} ${ARCHIVE_API_REV} | awk '{printf("%d%03d%03d",$$1,$$2,$$3)}' + # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the version number above. SHLIB_MAJOR= 4 @@ -31,13 +36,14 @@ # Build archive.h from archive.h.in by substituting version information. # Note: FreeBSD has inttypes.h, so enable that include in archive.h.in archive.h: archive.h.in Makefile - cat ${.CURDIR}/archive.h.in | \ - sed 's/@ARCHIVE_VERSION@/${VERSION}/g' | \ - sed 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' | \ - sed 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' | \ - sed 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' | \ - sed 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include /* For int64_t */|g' | \ - cat > archive.h + cat ${.CURDIR}/archive.h.in | sed \ + -e 's/@ARCHIVE_VERSION@/${VERSION}/g' \ + -e 's/@SHLIB_MAJOR@/${SHLIB_MAJOR}/g' \ + -e 's/@ARCHIVE_API_MAJOR@/${ARCHIVE_API_MAJOR}/g' \ + -e 's/@ARCHIVE_API_MINOR@/${ARCHIVE_API_MINOR}/g' \ + -e 's/@ARCHIVE_VERSION_STAMP@/${ARCHIVE_VERSION_STAMP}/g' \ + -e 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include /* For int64_t */|g' \ + > archive.h # archive.h needs to be cleaned CLEANFILES+= archive.h ==== //depot/projects/opentoe/lib/libarchive/archive.h.in#7 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.46 2007/07/06 15:36:37 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -50,31 +50,68 @@ extern "C" { #endif +/* + * Each of the version identifiers comes as a macro and a function. + * The macro identifies the installed header; the function identifies + * the library version (which may not be the same if you're using a + * dynamically-linked version of the library). + */ + +/* + * Textual name/version of the library, useful for version displays. + */ +#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" +const char * archive_version(void); /* - * If ARCHIVE_API_VERSION != archive_api_version(), then the library you - * were linked with is using an incompatible API to the one you were - * compiled with. This is almost certainly a fatal problem. + * Major version number: If ARCHIVE_API_VERSION != + * archive_api_version(), then the library you were linked with is + * using an incompatible API to the one you were compiled with. This + * is almost certainly a fatal problem. + */ +#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@ +int archive_api_version(void); + +/* + * Minor version number: ARCHIVE_API_FEATURE is incremented with each + * significant feature addition, so you can test (at compile or run + * time) if a particular feature is implemented. It's no big deal if + * ARCHIVE_API_FEATURE != archive_api_feature(), as long as both are + * high enough to include the features you're relying on. Specific + * values of FEATURE are documented here: * - * ARCHIVE_API_FEATURE is incremented with each significant feature - * addition, so you can test (at compile or run time) if a particular - * feature is implemented. It's no big deal if ARCHIVE_API_FEATURE != - * archive_api_feature(), as long as both are high enough to include - * the features you're relying on. Specific values of FEATURE are - * documented here: - * * 1 - Version tests are available. * 2 - archive_{read,write}_close available separately from _finish. * 3 - open_memory, open_memory2, open_FILE, open_fd available * 5 - archive_write_disk interface available + * + * Unfortunately, this count resets whenever ARCHIVE_API_VERSION changes, + * making it awkward to use in practice. For that reason, it is deprecated + * in favor of the more-accurate version stamp below. It will eventually + * be removed. */ -#define ARCHIVE_API_VERSION @ARCHIVE_API_MAJOR@ -int archive_api_version(void); #define ARCHIVE_API_FEATURE @ARCHIVE_API_MINOR@ int archive_api_feature(void); -/* Textual name/version of the library. */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @ARCHIVE_VERSION@" -const char * archive_version(void); + +/* + * The "version stamp" is a single integer that makes it easy to check + * the exact version: for version a.b.c, the version stamp is + * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has + * version stamp 2012108. + * + * This was introduced with libarchive 1.9.0 in the libarchive 1.x family + * and libarchive 2.2.4 in the libarchive 2.x family. The following + * may be useful if you really want to do feature detection for earlier + * libarchive versions: + * + * #ifndef ARCHIVE_VERSION_STAMP + * #define ARCHIVE_VERSION_STAMP \ + * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) + * #endif + */ +#define ARCHIVE_VERSION_STAMP @ARCHIVE_VERSION_STAMP@ +int archive_version_stamp(void); + #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 ==== //depot/projects/opentoe/lib/libarchive/archive_read_open_memory.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.4 2007/04/02 00:25:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $"); #include #include @@ -134,7 +134,7 @@ struct read_memory_data *mine = (struct read_memory_data *)client_data; (void)a; /* UNUSED */ - if (skip > mine->end - mine->buffer) + if ((off_t)skip > (off_t)(mine->end - mine->buffer)) skip = mine->end - mine->buffer; /* Round down to block size. */ skip /= mine->read_size; ==== //depot/projects/opentoe/lib/libarchive/archive_util.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.14 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.15 2007/07/06 15:36:38 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -51,6 +51,12 @@ return (ARCHIVE_API_VERSION); } +int +archive_version_stamp(void) +{ + return (ARCHIVE_VERSION_STAMP); +} + const char * archive_version(void) { ==== //depot/projects/opentoe/lib/libarchive/test/main.c#5 (text+ko) ==== @@ -32,14 +32,16 @@ #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.4 2007/06/13 03:30:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.5 2007/07/06 15:43:11 kientzle Exp $"); /* Default is to crash and try to force a core dump on failure. */ static int dump_on_failure = 1; /* Default is to print some basic information about each test. */ static int quiet_flag = 0; -/* Cumulative count of failures. */ +/* Cumulative count of component failures. */ static int failures = 0; +/* Cumulative count of skipped component tests. */ +static int skips = 0; /* * My own implementation of the standard assert() macro emits the @@ -59,6 +61,19 @@ static char msg[4096]; +/* Inform user that we're skipping a test. */ +void +skipping(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, " *** SKIPPING: "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + ++skips; +} + /* Common handling of failed tests. */ static void test_failed(struct archive *a) @@ -202,7 +217,7 @@ exit(1); } (*tests[i].func)(); - return (failures - failures_before); + return (failures == failures_before ? 0 : 1); } static void usage(void) @@ -226,7 +241,7 @@ int main(int argc, char **argv) { static const int limit = sizeof(tests) / sizeof(tests[0]); - int i, tests_run = 0, tests_succeeded = 0, opt; + int i, tests_run = 0, tests_failed = 0, opt; time_t now; char tmpdir[256]; @@ -266,13 +281,16 @@ exit(1); } - printf("Running libarchive tests in: %s\n", tmpdir); + if (!quiet_flag) { + printf("Running libarchive tests in: %s\n", tmpdir); + printf("Exercising %s\n", archive_version()); + } if (argc == 0) { /* Default: Run all tests. */ for (i = 0; i < limit; i++) { - if (test_run(i, tmpdir) == 0) - tests_succeeded++; + if (test_run(i, tmpdir)) + tests_failed++; tests_run++; } } else { @@ -282,13 +300,16 @@ printf("*** INVALID Test %s\n", *argv); usage(); } else { - if (test_run(i, tmpdir) == 0) - tests_succeeded++; + if (test_run(i, tmpdir)) + tests_failed++; tests_run++; } } } - - printf("%d of %d tests succeeded.\n", tests_succeeded, tests_run); - return (tests_succeeded == tests_run ? 0 : 1); + printf("\n"); + printf("%d of %d test groups reported failures\n", + tests_failed, tests_run); + printf(" Total of %d individual tests failed.\n", failures); + printf(" Total of %d individual tests were skipped.\n", skips); + return (tests_failed); } ==== //depot/projects/opentoe/lib/libarchive/test/test.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/test/test.h,v 1.3 2007/05/29 01:00:20 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/test/test.h,v 1.4 2007/07/06 15:43:11 kientzle Exp $ */ /* Every test program should #include "test.h" as the first thing. */ @@ -69,6 +69,18 @@ #endif /* + * ARCHIVE_VERSION_STAMP first appeared in 1.9 and libarchive 2.2.4. + * We can approximate it for earlier versions, though. + * This is used to disable tests of features not present in the current + * version. + */ +#ifndef ARCHIVE_VERSION_STAMP +#define ARCHIVE_VERSION_STAMP \ + (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) +#endif + + +/* * "list.h" is simply created by "grep DEFINE_TEST"; it has * a line like * DEFINE_TEST(test_function) @@ -106,6 +118,7 @@ /* Function declarations. These are defined in test_utility.c. */ void failure(const char *fmt, ...); +void skipping(const char *fmt, ...); void test_assert(const char *, int, int, const char *, struct archive *); void test_assert_equal_int(const char *, int, int, const char *, int, const char *, struct archive *); void test_assert_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, struct archive *); ==== //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -165,7 +165,12 @@ assert(matched == 1); } } +#if ARCHIVE_VERSION_STAMP < 1009000 + /* Known broken before 1.9.0. */ + skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); +#else assertEqualInt(ARCHIVE_EOF, r); +#endif assert((mode & 0777) == (archive_entry_mode(ae) & 0777)); failure("Could not find match for ACL " "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')", ==== //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.3 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. @@ -390,7 +390,12 @@ assert(matched == 1); } } +#if ARCHIVE_VERSION_STAMP < 1009000 + /* Known broken before 1.9.0. */ + skipping("archive_entry_acl_next() exits with ARCHIVE_EOF"); +#else assertEqualInt(ARCHIVE_EOF, r); +#endif assert((mode & 0777) == (archive_entry_mode(ae) & 0777)); failure("Could not find match for ACL " "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')", ==== //depot/projects/opentoe/lib/libarchive/test/test_archive_api_feature.c#3 (text+ko) ==== @@ -23,11 +23,29 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.2 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $"); DEFINE_TEST(test_archive_api_feature) { assertEqualInt(ARCHIVE_API_FEATURE, archive_api_feature()); assertEqualInt(ARCHIVE_API_VERSION, archive_api_version()); + /* + * Even though ARCHIVE_VERSION_STAMP only appears in + * archive.h after 1.9.0 and 2.2.3, the macro is synthesized + * in test.h, so this test is always valid. + */ + assertEqualInt(ARCHIVE_VERSION_STAMP / 1000, ARCHIVE_API_VERSION * 1000 + ARCHIVE_API_FEATURE); + /* + * The function, however, isn't always available. It appeared + * sometime in the middle of 2.2.3, but the synthesized value + * never has a release version, so the following conditional + * exactly determines whether the current library has the + * function. + */ +#if ARCHIVE_VERSION_STAMP / 1000 == 1009 || ARCHIVE_VERSION_STAMP > 2002000 + assertEqualInt(ARCHIVE_VERSION_STAMP, archive_version_stamp()); +#else + skipping("archive_version_stamp()"); +#endif assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version()); } ==== //depot/projects/opentoe/lib/libarchive/test/test_entry.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.1 2007/05/29 01:00:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.2 2007/07/06 15:43:11 kientzle Exp $"); /* * Most of these tests are system-independent, though a few depend on @@ -49,6 +49,7 @@ const char *xname; /* For xattr tests. */ const void *xval; /* For xattr tests. */ size_t xsize; /* For xattr tests. */ + int c; assert((e = archive_entry_new()) != NULL); @@ -72,13 +73,21 @@ archive_entry_set_ctime(e, 13580, 24681); assertEqualInt(archive_entry_ctime(e), 13580); assertEqualInt(archive_entry_ctime_nsec(e), 24681); +#if ARCHIVE_VERSION_STAMP >= 1009000 /* dev */ archive_entry_set_dev(e, 235); assertEqualInt(archive_entry_dev(e), 235); +#else + skipping("archive_entry_dev()"); +#endif /* devmajor/devminor are tested specially below. */ +#if ARCHIVE_VERSION_STAMP >= 1009000 /* filetype */ archive_entry_set_filetype(e, AE_IFREG); assertEqualInt(archive_entry_filetype(e), AE_IFREG); +#else + skipping("archive_entry_filetype()"); +#endif /* fflags are tested specially below */ /* gid */ archive_entry_set_gid(e, 204); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 9 01:35:00 2007 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 2235B16A46C; Mon, 9 Jul 2007 01:35:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D61E916A469 for ; Mon, 9 Jul 2007 01:34:59 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C5C8113C45B for ; Mon, 9 Jul 2007 01:34:59 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l691YxXm006409 for ; Mon, 9 Jul 2007 01:34:59 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l691Yx5x006406 for perforce@freebsd.org; Mon, 9 Jul 2007 01:34:59 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 9 Jul 2007 01:34:59 GMT Message-Id: <200707090134.l691Yx5x006406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 123164 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, 09 Jul 2007 01:35:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=123164 Change 123164 by thompsa@thompsa_heff on 2007/07/09 01:34:18 Use the same method as iwi for avoiding command interleaving where the current state is tracked. Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#21 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#21 (text+ko) ==== @@ -133,12 +133,12 @@ static int ipw_config(struct ipw_softc *); static void ipw_restart(void *, int); static int ipw_scan(struct ipw_softc *); -static void ipw_scanstart(void *, int); static void ipw_assoc_lost(void *, int); -static void ipw_assoc(void *, int); +static void ipw_assoc(struct ieee80211com *); +static void ipw_disassoc(struct ieee80211com *); static int ipw_auth_and_assoc(struct ipw_softc *); static int ipw_disassociate(struct ipw_softc *); -static void ipw_down(void *, int); +static void ipw_ops(void *, int); static void ipw_init(void *); static void ipw_init_locked(struct ipw_softc *, int); static void ipw_stop_locked(struct ipw_softc *); @@ -200,21 +200,6 @@ DRIVER_MODULE(ipw, pci, ipw_driver, ipw_devclass, 0, 0); DRIVER_MODULE(ipw, cardbus, ipw_driver, ipw_devclass, 0, 0); -/* - * NB.: This models the only instance of async locking in ipw_init_locked - * and must be kept in sync. - */ -#define IPW_LOCK_DECL int __waslocked = 0 -#define IPW_LOCK(sc) do { \ - if (!(__waslocked = mtx_owned(&(sc)->sc_mtx))) \ - mtx_lock(&sc->sc_mtx); \ -} while (0) -#define IPW_UNLOCK(sc) do { \ - if (!__waslocked) \ - mtx_unlock(&sc->sc_mtx); \ -} while (0) -#define IPW_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) - static int ipw_probe(device_t dev) { @@ -247,6 +232,7 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); + IPW_CMD_LOCK_INIT(sc); #if __FreeBSD_version >= 700000 sc->sc_tq = taskqueue_create("ipw_taskq", M_NOWAIT, @@ -261,11 +247,9 @@ #endif TASK_INIT(&sc->sc_radiontask, 0, ipw_radio_on, sc); TASK_INIT(&sc->sc_radiofftask, 0, ipw_radio_off, sc); - TASK_INIT(&sc->sc_scanstarttask,0, ipw_scanstart, sc); TASK_INIT(&sc->sc_assoclosttask,0, ipw_assoc_lost, sc); - TASK_INIT(&sc->sc_assoctask, 0, ipw_assoc, sc); - TASK_INIT(&sc->sc_downtask, 0, ipw_down, sc); TASK_INIT(&sc->sc_restarttask, 0, ipw_restart, sc); + TASK_INIT(&sc->sc_opstask, 0, ipw_ops, sc); callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { @@ -351,9 +335,11 @@ /* set supported .11b channels (read from EEPROM) */ if ((val = ipw_read_prom_word(sc, IPW_EEPROM_CHANNEL_LIST)) == 0) val = 0x7ff; /* default to channels 1-11 */ + sc->chanmask = val; val <<= 1; for (i = 1; i < 16; i++) { if (val & (1 << i)) { + printf("adding channel %d\n",i); c = &ic->ic_channels[ic->ic_nchans++]; c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); c->ic_flags = IEEE80211_CHAN_B; @@ -442,6 +428,7 @@ taskqueue_free(sc->sc_tq); mtx_destroy(&sc->sc_mtx); + IPW_CMD_LOCK_DESTROY(sc); return 0; } @@ -846,7 +833,7 @@ switch (nstate) { case IEEE80211_S_AUTH: - taskqueue_enqueue(sc->sc_tq, &sc->sc_assoctask); + ipw_assoc(ic); break; case IEEE80211_S_RUN: @@ -860,7 +847,7 @@ * This is all totally bogus and needs to be redone. */ if (ic->ic_state == IEEE80211_S_SCAN) - taskqueue_enqueue(sc->sc_tq, &sc->sc_assoctask); + ipw_assoc(ic); } /* XXX way wrong */ return sc->sc_newstate(ic, nstate, @@ -877,7 +864,7 @@ */ if (ic->ic_state == IEEE80211_S_RUN && (sc->flags & IPW_FLAG_FW_INITED)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_downtask); + ipw_disassoc(ic); break; default: @@ -923,6 +910,7 @@ DPRINTFN(2, ("Association succeeded (%s flags 0x%x)\n", IEEESTATE(ic), sc->flags)); sc->flags |= IPW_FLAG_ASSOCIATED; + IPW_STATE_END(sc, IPW_FW_ASSOCIATING); /* XXX suppress state change in case the fw auto-associates */ if (ic->ic_state != IEEE80211_S_ASSOC) { DPRINTF(("Unexpected association (state %u)\n", @@ -955,14 +943,19 @@ * the first scan complete event. This works ok * because the adapter scans only 2.4G channels so * doing an extra pass doesn't take long. - */ if (sc->flags & IPW_FLAG_HACK) { sc->flags &= ~IPW_FLAG_HACK; break; } - sc->sc_scan_timer = 0; - sc->flags &= ~IPW_FLAG_SCANNING; - ieee80211_scan_done(ic); + */ + + /* Only update the scan module if we were actaully scanning */ + if (sc->fw_state == IPW_FW_SCANNING) { + sc->sc_scan_timer = 0; + sc->flags &= ~IPW_FLAG_SCANNING; + IPW_STATE_END(sc, IPW_FW_SCANNING); + ieee80211_scan_done(ic); + } break; case IPW_STATE_ASSOCIATION_LOST: @@ -2172,25 +2165,16 @@ static int ipw_scan(struct ipw_softc *sc) { - struct ieee80211com *ic = &sc->sc_ic; - const struct ieee80211_channel *c; - uint32_t chanmask, params; - int i, error; + uint32_t params; + int error; DPRINTF(("%s: flags 0x%x\n", __func__, sc->flags)); + IPW_STATE_BEGIN(sc, IPW_FW_SCANNING); - chanmask = 0; - /* XXX just copy ic_chan_scan */ - for (i = 0; i <= IEEE80211_CHAN_MAX; i++) { - c = &ic->ic_channels[i]; - if (!(isset(ic->ic_chan_scan,i) || c == ic->ic_curchan)) - continue; - chanmask |= 1<<(i-1); - } /* NB: IPW_SCAN_DO_NOT_ASSOCIATE does not work (we set it anyway) */ - error = ipw_setscanopts(sc, chanmask, IPW_SCAN_DO_NOT_ASSOCIATE); + error = ipw_setscanopts(sc, sc->chanmask, IPW_SCAN_DO_NOT_ASSOCIATE); if (error != 0) - return error; + goto done; /* * Setup null/bogus ssid so firmware doesn't use any previous @@ -2199,7 +2183,7 @@ */ error = ipw_setssid(sc, NULL, 0); if (error != 0) - return error; + goto done; /* * With 100ms/channel dwell time and a max of 14 channels @@ -2218,34 +2202,16 @@ ¶ms, sizeof(params)); } else error = ipw_enable(sc); +done: if (error != 0) { sc->sc_scan_timer = 0; sc->flags &= ~(IPW_FLAG_SCANNING | IPW_FLAG_HACK); + IPW_STATE_BEGIN(sc, IPW_FW_SCANNING); } - return error; + return (error); } static void -ipw_scanstart(void *arg, int npending) -{ - struct ipw_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - IPW_LOCK_DECL; - - DPRINTF(("%s: flags 0x%x\n", __func__, sc->flags)); - - IPW_LOCK(sc); - if (sc->flags & IPW_FLAG_SCANNING) { - if (ipw_scan(sc) != 0) { - /* XXX should not happen */ - sc->flags &= ~IPW_FLAG_SCANNING; - ieee80211_new_state(ic, IEEE80211_S_INIT, 0); - } - } - IPW_UNLOCK(sc); -} - -static void ipw_assoc_lost(void *arg, int npending) { struct ipw_softc *sc = arg; @@ -2260,17 +2226,6 @@ IPW_UNLOCK(sc); } -static void -ipw_assoc(void *arg, int npending) -{ - struct ipw_softc *sc = arg; - IPW_LOCK_DECL; - - IPW_LOCK(sc); - ipw_auth_and_assoc(sc); - IPW_UNLOCK(sc); -} - static int ipw_auth_and_assoc(struct ipw_softc *sc) { @@ -2280,9 +2235,12 @@ uint32_t data; int error; + IPW_LOCK_ASSERT(sc); + IPW_STATE_BEGIN(sc, IPW_FW_ASSOCIATING); + error = ipw_disable(sc); if (error != 0) - return error; + goto done; memset(&security, 0, sizeof security); security.authmode = (ni->ni_authmode == IEEE80211_AUTH_SHARED) ? @@ -2292,12 +2250,12 @@ error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security, sizeof security); if (error != 0) - return error; + goto done; if (ic->ic_flags & IEEE80211_F_PRIVACY) { error = ipw_setwepkeys(sc); if (error != 0) - return error; + goto done; if (ic->ic_crypto.cs_def_txkey != IEEE80211_KEYIX_NONE) { data = htole32(ic->ic_crypto.cs_def_txkey); @@ -2306,41 +2264,44 @@ error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data, sizeof data); if (error != 0) - return error; + goto done; } } error = ipw_setssid(sc, ni->ni_essid, ni->ni_esslen); if (error != 0) - return error; + goto done; error = ipw_setbssid(sc, ni->ni_bssid); if (error != 0) - return error; + goto done; data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data); if (error != 0) - return error; + goto done; if (ic->ic_opt_ie != NULL) { error = ipw_setwpaie(sc, ic->ic_opt_ie, ic->ic_opt_ie_len); if (error != 0) - return error; + goto done; } if (ic->ic_opmode == IEEE80211_M_IBSS) { error = ipw_setchannel(sc, ni->ni_chan); if (error != 0) - return error; + goto done; } /* lock scan to ap's channel and enable associate */ error = ipw_setscanopts(sc, 1<<(ieee80211_chan2ieee(ic, ni->ni_chan)-1), 0); - if (error != 0) - return error; +done: + if (error != 0) { + IPW_STATE_END(sc, IPW_FW_ASSOCIATING); + return (error); + } return ipw_enable(sc); /* finally, enable adapter */ } @@ -2361,18 +2322,6 @@ } static void -ipw_down(void *arg, int npending) -{ - struct ipw_softc *sc = arg; - IPW_LOCK_DECL; - - IPW_LOCK(sc); - ipw_disassociate(sc); - /* XXX disable? */ - IPW_UNLOCK(sc); -} - -static void ipw_init(void *priv) { struct ipw_softc *sc = priv; @@ -2393,7 +2342,7 @@ DPRINTF(("%s: state %s flags 0x%x\n", __func__, ieee80211_state_name[ic->ic_state], sc->flags)); - if (sc->flags & IPW_FLAG_FW_LOADING) + if (sc->fw_state == IPW_FW_LOADING) return; ipw_stop_locked(sc); @@ -2403,7 +2352,7 @@ goto fail; } - sc->flags |= IPW_FLAG_FW_LOADING; + IPW_STATE_BEGIN(sc, IPW_FW_LOADING); IPW_UNLOCK(sc); /* NB: cannot hold lock while loading firmware */ @@ -2473,12 +2422,12 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - sc->flags &= ~IPW_FLAG_FW_LOADING; + IPW_STATE_END(sc, IPW_FW_LOADING); return; fail: ifp->if_flags &= ~IFF_UP; /* XXX */ - sc->flags &= ~IPW_FLAG_FW_LOADING; + IPW_STATE_END(sc, IPW_FW_LOADING); ipw_stop_locked(sc); ipw_put_firmware(sc); } @@ -2795,14 +2744,80 @@ } static void +ipw_ops(void *arg, int npending) +{ + struct ipw_softc *sc = arg; + struct ieee80211com *ic = &sc->sc_ic; + IPW_LOCK_DECL; + int cmd; + +again: + IPW_CMD_LOCK(sc); + cmd = sc->sc_cmd[sc->sc_cmd_cur]; + if (cmd == 0) { + /* No more commands to process */ + IPW_CMD_UNLOCK(sc); + return; + } + sc->sc_cmd[sc->sc_cmd_cur] = 0; /* free the slot */ + sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IPW_CMD_MAXOPS; + IPW_CMD_UNLOCK(sc); + + IPW_LOCK(sc); + while (sc->fw_state != IPW_FW_IDLE || (sc->flags & IPW_FLAG_BUSY)) { + msleep(sc, &sc->sc_mtx, 0, "ipwcmd", hz/10); + } + + if (!(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING)) { + IPW_UNLOCK(sc); + return; + } + + switch (cmd) { + case IPW_ASSOC: + ipw_auth_and_assoc(sc); + break; + case IPW_DISASSOC: + ipw_disassociate(sc); + break; + case IPW_SCAN_START: + if (ipw_scan(sc) != 0) { + /* XXX should not happen */ + ieee80211_new_state(ic, IEEE80211_S_INIT, 0); + } + break; + } + IPW_UNLOCK(sc); + + /* Take another pass */ + goto again; +} + +static int +ipw_queue_cmd(struct ipw_softc *sc, int cmd) +{ + IPW_CMD_LOCK(sc); + if (sc->sc_cmd[sc->sc_cmd_next] != 0) { + IPW_CMD_UNLOCK(sc); + DPRINTF(("%s: command %d dropped\n", __func__, cmd)); + return (EBUSY); + } + + sc->sc_cmd[sc->sc_cmd_next] = cmd; + sc->sc_cmd_next = (sc->sc_cmd_next + 1) % IPW_CMD_MAXOPS; + taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + IPW_CMD_UNLOCK(sc); + return (0); +} + +static void ipw_scan_start(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; struct ipw_softc *sc = ifp->if_softc; device_printf(sc->sc_dev, "%s\n", __func__); - sc->flags |= IPW_FLAG_SCANNING; - taskqueue_enqueue(sc->sc_tq, &sc->sc_scanstarttask); + ipw_queue_cmd(sc, IPW_SCAN_START); } static void @@ -2838,6 +2853,28 @@ device_printf(sc->sc_dev, "%s\n", __func__); } +static void +ipw_assoc(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct ipw_softc *sc = ifp->if_softc; + + /* The firmware will fail if we are already associated */ + if (sc->flags & IPW_FLAG_ASSOCIATED) + ipw_disassoc(ic); + + ipw_queue_cmd(sc, IPW_ASSOC); +} + +static void +ipw_disassoc(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct ipw_softc *sc = ifp->if_softc; + + ipw_queue_cmd(sc, IPW_DISASSOC); +} + /* * Read 16 bits at address 'addr' from the serial EEPROM. */ From owner-p4-projects@FreeBSD.ORG Mon Jul 9 01:39:05 2007 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 AB36216A468; Mon, 9 Jul 2007 01:39:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 81F5816A41F for ; Mon, 9 Jul 2007 01:39:05 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72B0913C468 for ; Mon, 9 Jul 2007 01:39:05 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l691d5QJ007075 for ; Mon, 9 Jul 2007 01:39:05 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l691d5KA007072 for perforce@freebsd.org; Mon, 9 Jul 2007 01:39:05 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 9 Jul 2007 01:39:05 GMT Message-Id: <200707090139.l691d5KA007072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 123165 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, 09 Jul 2007 01:39:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123165 Change 123165 by thompsa@thompsa_heff on 2007/07/09 01:38:17 - mised the *.h files in the last submit - remove debug printf Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#22 edit .. //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#4 edit .. //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#22 (text+ko) ==== @@ -339,7 +339,6 @@ val <<= 1; for (i = 1; i < 16; i++) { if (val & (1 << i)) { - printf("adding channel %d\n",i); c = &ic->ic_channels[ic->ic_nchans++]; c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); c->ic_flags = IEEE80211_CHAN_B; ==== //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#4 (text+ko) ==== ==== //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#6 (text+ko) ==== @@ -90,21 +90,20 @@ device_t sc_dev; struct mtx sc_mtx; + struct mtx sc_cmdlock; + char sc_cmdname[12]; /* e.g. "ipw0_cmd" */ struct taskqueue *sc_tq; /* private task queue */ #if __FreeBSD_version < 700000 struct proc *sc_tqproc; #endif + struct task sc_opstask; struct task sc_radiontask; /* radio on processing */ struct task sc_radiofftask; /* radio off processing */ - struct task sc_scanstarttask;/* scan start processing */ struct task sc_assoclosttask;/* assoc lost processing */ - struct task sc_assoctask; /* assoc lost processing */ - struct task sc_downtask; /* disassociate processing */ struct task sc_restarttask; /* restart adapter processing */ struct callout sc_wdtimer; /* watchdog timer */ uint32_t flags; -#define IPW_FLAG_FW_LOADING 0x00000001 /* firmware being setup */ #define IPW_FLAG_FW_INITED 0x00000002 /* firmware initialized */ #define IPW_FLAG_SCANNING 0x00000004 /* busy scanning */ #define IPW_FLAG_BUSY 0x00000008 /* busy sending a command */ @@ -112,6 +111,12 @@ #define IPW_FLAG_ENABLED 0x00000020 /* adapter enabled */ #define IPW_FLAG_HAS_RFSWITCH 0x00010000 /* rfkill switch present */ #define IPW_FLAG_HACK 0x00020000 + uint32_t fw_state; +#define IPW_FW_IDLE 0 +#define IPW_FW_LOADING 1 +#define IPW_FW_ASSOCIATING 2 +#define IPW_FW_DISASSOCIATING 3 +#define IPW_FW_SCANNING 4 int irq_rid; int mem_rid; @@ -164,13 +169,22 @@ uint32_t rxcur; int txfree; - int curchan; /* current h/w channel # */ + int chanmask; /* supported channels */ int dwelltime; int sc_tx_timer; int sc_rfkill_timer;/* poll for rfkill change */ int sc_scan_timer; /* scan request timeout */ + int sc_state_timer; +#define IPW_SCAN_START (1 << 0) +#define IPW_SET_CHANNEL (1 << 1) +#define IPW_ASSOC (1 << 2) +#define IPW_DISASSOC (1 << 3) +#define IPW_CMD_MAXOPS 10 + int sc_cmd[IPW_CMD_MAXOPS]; + int sc_cmd_cur; /* current queued scan task */ + int sc_cmd_next; /* last queued scan task */ struct bpf_if *sc_drvbpf; union { @@ -187,3 +201,46 @@ #define sc_txtap sc_txtapu.th int sc_txtap_len; }; + +#define IPW_STATE_BEGIN(_sc, _state) do { \ + KASSERT(_sc->fw_state == IPW_FW_IDLE, \ + ("ipw firmware not idle")); \ + _sc->fw_state = _state; \ + _sc->sc_state_timer = 5; \ + DPRINTF(("enter FW state %d\n", _state)); \ +} while (0) + +#define IPW_STATE_END(_sc, _state) do { \ + if (_sc->fw_state == _state) \ + DPRINTF(("exit FW state %d\n", _state)); \ + else \ + DPRINTF(("expected FW state %d, got %d\n", \ + _state, _sc->fw_state)); \ + _sc->fw_state = IPW_FW_IDLE; \ + wakeup(_sc); \ + _sc->sc_state_timer = 0; \ +} while (0) + +/* + * NB.: This models the only instance of async locking in ipw_init_locked + * and must be kept in sync. + */ +#define IPW_LOCK_DECL int __waslocked = 0 +#define IPW_LOCK(sc) do { \ + if (!(__waslocked = mtx_owned(&(sc)->sc_mtx))) \ + mtx_lock(&sc->sc_mtx); \ +} while (0) +#define IPW_UNLOCK(sc) do { \ + if (!__waslocked) \ + mtx_unlock(&sc->sc_mtx); \ +} while (0) +#define IPW_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) +#define IPW_CMD_LOCK_INIT(sc) do { \ + snprintf((sc)->sc_cmdname, sizeof((sc)->sc_cmdname), "%s_cmd", \ + device_get_nameunit((sc)->sc_dev)); \ + mtx_init(&(sc)->sc_cmdlock, (sc)->sc_cmdname, NULL, MTX_DEF); \ +} while (0) +#define IPW_CMD_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_cmdlock) +#define IPW_CMD_LOCK(sc) mtx_lock(&(sc)->sc_cmdlock) +#define IPW_CMD_UNLOCK(sc) mtx_unlock(&(sc)->sc_cmdlock) + From owner-p4-projects@FreeBSD.ORG Mon Jul 9 02:07:41 2007 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 B148016A421; Mon, 9 Jul 2007 02:07:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8454D16A400 for ; Mon, 9 Jul 2007 02:07:41 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6905C13C459 for ; Mon, 9 Jul 2007 02:07:41 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6927fJ0010829 for ; Mon, 9 Jul 2007 02:07:41 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6927fOp010826 for perforce@freebsd.org; Mon, 9 Jul 2007 02:07:41 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 02:07:41 GMT Message-Id: <200707090207.l6927fOp010826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123167 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, 09 Jul 2007 02:07:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123167 Change 123167 by rpaulo@rpaulo_epsilon on 2007/07/09 02:06:43 Style cleanup. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#8 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 $ * */ @@ -113,7 +113,7 @@ if (pci_get_class(dev) != PCIC_DISPLAY || pci_get_subclass(dev) != PCIS_DISPLAY_VGA) - return NULL; + return (NULL); vendor = pci_get_vendor(dev); devid = pci_get_device(dev); @@ -125,13 +125,13 @@ !strncmp(model, backlight_models[i].bm_model, strlen(model))) { freeenv(model); - return &backlight_models[i]; + return (&backlight_models[i]); } } freeenv(model); - return NULL; + return (NULL); } static void @@ -150,16 +150,16 @@ struct backlight_model *model; if (resource_disabled("backlight", 0)) - return ENXIO; + return (ENXIO); model = backlight_match(dev); if (!model) - return ENXIO; + return (ENXIO); device_set_desc(dev, model->bm_desc); - return BUS_PROBE_GENERIC; + return (BUS_PROBE_GENERIC); } static int @@ -173,7 +173,7 @@ error = model->bm_attach(dev); if (error) - return error; + return (error); sysctl_ctx_init(&sc->sc_sysctl_ctx); sc->sc_sysctl_tree = SYSCTL_ADD_NODE(&sc->sc_sysctl_ctx, @@ -194,7 +194,7 @@ sc, 0, model->bm_level, "I", "Brightness level of the backlight"); - return 0; + return (0); } static int @@ -204,7 +204,7 @@ sysctl_ctx_free(&sc->sc_sysctl_ctx); - return 0; + return (0); } /* @@ -237,7 +237,7 @@ max = bus_read_4(sc->sc_res, BACKLIGHT_MB_OFFSET); max = max >> BACKLIGHT_MB_MAX_SHIFT; - return max; + return (max); } static uint32_t @@ -248,7 +248,7 @@ level = bus_read_4(sc->sc_res, BACKLIGHT_MB_OFFSET); level = level >> BACKLIGHT_MB_CUR_SHIFT & BACKLIGHT_MB_CUR_MASK; - return level; + return (level); } static void @@ -275,19 +275,19 @@ sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->sc_res == NULL) - return ENOMEM; + return (ENOMEM); max = macbook_get_max(sc); if (max > BACKLIGHT_MB_MAX) { device_printf(dev, "maximum brightness level out of range" "(0x%x) - please send-pr\n", max); - return EINVAL; + return (EINVAL); } sc->sc_enable = macbook_get_current(sc) >= BACKLIGHT_MB_MIN ? 1 : 0; sc->sc_level = macbook_get_current(sc); - return 0; + return (0); } static int @@ -315,14 +315,14 @@ macbook_set_current(sc, sc->sc_level); break; default: - return EINVAL; + return (EINVAL); } *(unsigned int *)oidp->oid_arg1 = enable; } - return error; + return (error); } static int @@ -344,7 +344,7 @@ level = *(unsigned int *)req->newptr; if (level > 100) - return EINVAL; + return (EINVAL); curlevel = (level * (BACKLIGHT_MB_MAX - BACKLIGHT_MB_MIN) / 100) + BACKLIGHT_MB_MIN; @@ -355,5 +355,5 @@ } - return error; + return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jul 9 02:12:48 2007 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 890CE16A46D; Mon, 9 Jul 2007 02:12:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4879E16A400 for ; Mon, 9 Jul 2007 02:12:48 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 38A9713C458 for ; Mon, 9 Jul 2007 02:12:48 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l692Cm93011345 for ; Mon, 9 Jul 2007 02:12:48 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l692ClZQ011342 for perforce@freebsd.org; Mon, 9 Jul 2007 02:12:47 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 02:12:47 GMT Message-Id: <200707090212.l692ClZQ011342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123168 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, 09 Jul 2007 02:12:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=123168 Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 Add support for keyboard backlight control (found on MacBook Pros). dev.asmc.N.light.{left,right} sysctl tree is now created. Setting a value on the "right" or "left" nodes sets the keyboard backlight level. Reading those sysctl nodes, gives the each sensor raw data. While there fix the first parameter of DRIVER_MODULE() and change a label so that asmc_sms_calibrate() is not called on Mac Minis. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#24 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#11 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#24 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#23 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#24 $ * */ @@ -100,6 +100,8 @@ static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS); +static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS); +static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS); static struct asmc_model *asmc_match(device_t dev); @@ -110,53 +112,55 @@ asmc_mb_sysctl_fanminspeed, \ asmc_mb_sysctl_fanmaxspeed, \ asmc_mb_sysctl_fantargetspeed +#define ASMC_LIGHT_FUNCS asmc_mbp_sysctl_light_left, \ + asmc_mbp_sysctl_light_right struct asmc_model asmc_models[] = { { "MacBook1,1", "Apple SMC MacBook Core Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBook2,1", "Apple SMC MacBook Core 2 Duo", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL, ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS }, { "MacBookPro1,1", "Apple SMC MacBook Pro Core Duo (15-inch)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, { "MacBookPro1,2", "Apple SMC MacBook Pro Core Duo (17-inch)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, { "MacBookPro2,1", "Apple SMC MacBook Pro Core 2 Duo (17-inch)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, { "MacBookPro2,2", "Apple SMC MacBook Pro Core 2 Duo (15-inch)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, { "MacBookPro3,1", "Apple SMC MacBook Pro Core 2 Duo (15-inch LED)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, { "MacBookPro3,2", "Apple SMC MacBook Pro Core 2 Duo (17-inch HD)", - ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, + ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS }, @@ -164,6 +168,7 @@ { "Macmini1,1", "Apple SMC Mac Mini", NULL, NULL, NULL, + NULL, NULL, ASMC_FAN_FUNCS, ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, @@ -173,6 +178,7 @@ #undef ASMC_SMS_FUNCS #undef ASMC_FAN_FUNCS +#undef ASMC_LIGHT_FUNCS /* * Driver methods. @@ -195,7 +201,7 @@ static devclass_t asmc_devclass; -DRIVER_MODULE(ascm, isa, asmc_driver, asmc_devclass, NULL, NULL); +DRIVER_MODULE(asmc, isa, asmc_driver, asmc_devclass, NULL, NULL); static void @@ -367,6 +373,27 @@ "Sudden Motion Sensor Z value"); /* + * dev.asmc.n.light + */ + if (model->smc_light_left) { + sc->sc_light_tree = SYSCTL_ADD_NODE(sysctlctx, + SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "light", + CTLFLAG_RD, 0, "Keyboard backlight sensors"); + + SYSCTL_ADD_PROC(sysctlctx, + SYSCTL_CHILDREN(sc->sc_light_tree), + OID_AUTO, "left", CTLTYPE_INT | CTLFLAG_RD, + dev, 0, model->smc_light_left, "I", + "Keyboard backlight left sensor"); + + SYSCTL_ADD_PROC(sysctlctx, + SYSCTL_CHILDREN(sc->sc_light_tree), + OID_AUTO, "right", CTLTYPE_INT | CTLFLAG_RD, + dev, 0, model->smc_light_right, "I", + "Keyboard backlight right sensor"); + } + + /* * Need a taskqueue to send devctl_notify() events * when the SMS interrupt us. * @@ -500,9 +527,9 @@ DELAY(50); } + + asmc_sms_calibrate(dev); out: - asmc_sms_calibrate(dev); - sc->sc_nfan = asmc_fan_count(dev); if (sc->sc_nfan > ASMC_MAXFANS) { device_printf(dev, "more than %d fans were detected. Please " @@ -912,3 +939,59 @@ return (error); } + +static int +asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) +{ + device_t dev = (device_t) arg1; + uint8_t buf[6]; + int error; + unsigned int level; + int32_t v; + + asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, 6); + + v = buf[2]; + error = sysctl_handle_int(oidp, &v, sizeof(v), req); + if (error == 0 && req->newptr != NULL) { + level = *(unsigned int *)req->newptr; + + if (level > 255) + return (EINVAL); + + buf[0] = level; + buf[1] = 0x00; + + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, 2); + } + + return (error); +} + +static int +asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) +{ + device_t dev = (device_t) arg1; + uint8_t buf[6]; + int error; + unsigned int level; + int32_t v; + + asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, 6); + + v = buf[2]; + error = sysctl_handle_int(oidp, &v, sizeof(v), req); + if (error == 0 && req->newptr != NULL) { + level = *(unsigned int *)req->newptr; + + if (level > 255) + return (EINVAL); + + buf[0] = level; + buf[1] = 0x00; + + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, 2); + } + + return (error); +} ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#10 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#11 $ * */ @@ -39,6 +39,7 @@ struct sysctl_oid *sc_fan_tree[ASMC_MAXFANS+1]; struct sysctl_oid *sc_temp_tree; struct sysctl_oid *sc_sms_tree; + struct sysctl_oid *sc_light_tree; struct asmc_model *sc_model; int sc_rid; struct resource *sc_res; @@ -61,6 +62,8 @@ int (*smc_fan_minspeed)(SYSCTL_HANDLER_ARGS); int (*smc_fan_maxspeed)(SYSCTL_HANDLER_ARGS); int (*smc_fan_targetspeed)(SYSCTL_HANDLER_ARGS); + int (*smc_light_left)(SYSCTL_HANDLER_ARGS); + int (*smc_light_right)(SYSCTL_HANDLER_ARGS); const char *smc_temps[8]; const char *smc_tempnames[8]; @@ -130,7 +133,8 @@ * Keyboard backlight. */ #define ASMC_KEY_LIGHTLEFT "ALV0" /* RO; 6 bytes */ -#define ASMC_KEY_RIGHTLEFT "ALV1" /* RO; 6 bytes */ +#define ASMC_KEY_LIGHTRIGHT "ALV1" /* RO; 6 bytes */ +#define ASMC_KEY_LIGHTVALUE "LKSB" /* WO; 2 bytes */ /* * Clamshell. From owner-p4-projects@FreeBSD.ORG Mon Jul 9 02:15:05 2007 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 68A4B16A46B; Mon, 9 Jul 2007 02:15:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2CF3316A468 for ; Mon, 9 Jul 2007 02:15:05 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id DEC9013C447 for ; Mon, 9 Jul 2007 02:15:04 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id DF34F690A8C for ; Mon, 9 Jul 2007 03:09:56 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id AB60B690D38; Mon, 9 Jul 2007 03:09:56 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=AWL, BAYES_00, FORGED_RCVD_HELO, RCVD_IN_DSBL,RCVD_IN_SORBS_DUL autolearn=no version=3.1.7 Received: from epsilon.local (87-196-16-145.net.novis.pt [87.196.16.145]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 2F04E690A8C for ; Mon, 9 Jul 2007 03:09:56 +0100 (WEST) Message-ID: <46919A1B.8050909@fnop.net> Date: Mon, 09 Jul 2007 03:14:51 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Perforce Change Reviews References: <200707090212.l692ClZQ011342@repoman.freebsd.org> In-Reply-To: <200707090212.l692ClZQ011342@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Subject: Re: PERFORCE change 123168 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, 09 Jul 2007 02:15:05 -0000 Rui Paulo wrote: > http://perforce.freebsd.org/chv.cgi?CH=123168 > > Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 > > Add support for keyboard backlight control (found on MacBook > Pros). > dev.asmc.N.light.{left,right} sysctl tree is now created. > Setting a value on the "right" or "left" nodes sets the > keyboard backlight level. Reading those sysctl nodes, gives > the each sensor raw I did not test this as I don't own a MacBook Pro, but it should work. If anyone has a MacBook Pro and is willing to test, it would be much appreciated. Regards. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Mon Jul 9 02:56:43 2007 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 36C4416A46B; Mon, 9 Jul 2007 02:56:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C110016A468 for ; Mon, 9 Jul 2007 02:56:42 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B183D13C489 for ; Mon, 9 Jul 2007 02:56:42 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l692ugen015371 for ; Mon, 9 Jul 2007 02:56:42 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l692ugQW015368 for perforce@freebsd.org; Mon, 9 Jul 2007 02:56:42 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 9 Jul 2007 02:56:42 GMT Message-Id: <200707090256.l692ugQW015368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123170 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, 09 Jul 2007 02:56:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=123170 Change 123170 by gcooper@optimus-revised_pkgtools on 2007/07/09 02:56:39 Forgot to #if .. #endif protect a few extra "simple profile" lines in add/perform.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#4 (text+ko) ==== @@ -137,24 +137,30 @@ } Home = make_playpen(playpen, sb.st_size * 4); +#if SIMPLE_PROF_TRY static struct timespec before, after, time_diff; +#endif if (!Home) errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); where_to = Home; +#if SIMPLE_PROF_TRY clock_gettime(CLOCK_REALTIME, &before); +#endif /* Since we can call ourselves recursively, keep notes on where we came from */ if (!getenv("_TOP")) setenv("_TOP", Home, 1); +#if SIMPLE_PROF_TRY clock_gettime(CLOCK_REALTIME, &after); time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; time_diff.tv_sec = after.tv_sec - before.tv_sec; printf( "(%s) Difference: %3.20lf secs\n", "_TOP setenv", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); +#endif if (unpack(pkg_fullname, extract)) { warnx( @@ -163,7 +169,9 @@ goto bomb; } +#if SIMPLE_PROF_TRY clock_gettime(CLOCK_REALTIME, &before); +#endif cfile = fopen(CONTENTS_FNAME, "r"); if (!cfile) { @@ -173,12 +181,14 @@ goto bomb; } +#if SIMPLE_PROF_TRY clock_gettime(CLOCK_REALTIME, &after); time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; time_diff.tv_sec = after.tv_sec - before.tv_sec; printf( "(%s) Difference: %3.20lf secs\n", "+CONTENTS fopen", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); +#endif read_plist(&Plist, cfile); fclose(cfile); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 04:05:07 2007 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 B032E16A46C; Mon, 9 Jul 2007 04:05:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 596B516A41F for ; Mon, 9 Jul 2007 04:05:07 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4981A13C455 for ; Mon, 9 Jul 2007 04:05:07 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l694568o026343 for ; Mon, 9 Jul 2007 04:05:06 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69456Mw026331 for perforce@freebsd.org; Mon, 9 Jul 2007 04:05:06 GMT (envelope-from cnst@FreeBSD.org) Date: Mon, 9 Jul 2007 04:05:06 GMT Message-Id: <200707090405.l69456Mw026331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 123172 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, 09 Jul 2007 04:05:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=123172 Change 123172 by cnst@dale on 2007/07/09 04:04:33 print nameunit before chip name, which wasn't printed because on OpenBSD lm produced only one line in dmesg On OpenBSD: lm0 at isa0 port 0x290/8: W83627DHG Now on FreeBSD: lm0 at port 0x290 on isa0 lm0: W83627DHG Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#2 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#1 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#2 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78.c,v 1.18 2007/05/26 22:47:39 cnst Exp $ */ @@ -393,6 +393,7 @@ { u_int i, config; + printf("%s", device_get_nameunit(sc->sc_dev)); for (i = 0; i < sizeof(lm_chips) / sizeof(lm_chips[0]); i++) if (lm_chips[i].chip_match(sc)) break; From owner-p4-projects@FreeBSD.ORG Mon Jul 9 05:49:28 2007 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 9B17416A46B; Mon, 9 Jul 2007 05:49:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CED216A421 for ; Mon, 9 Jul 2007 05:49:28 +0000 (UTC) (envelope-from karma@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C28613C4B0 for ; Mon, 9 Jul 2007 05:49:28 +0000 (UTC) (envelope-from karma@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l695nSMf049666 for ; Mon, 9 Jul 2007 05:49:28 GMT (envelope-from karma@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l695nS43049639 for perforce@freebsd.org; Mon, 9 Jul 2007 05:49:28 GMT (envelope-from karma@FreeBSD.org) Date: Mon, 9 Jul 2007 05:49:28 GMT Message-Id: <200707090549.l695nS43049639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to karma@FreeBSD.org using -f From: Alexey Mikhailov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123175 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, 09 Jul 2007 05:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=123175 Change 123175 by karma@karma_ez on 2007/07/09 05:49:23 * Add search function to T-Tree implementation * Add remote credentials checking * write() -> sendmsg() migration in library Affected files ... .. //depot/projects/soc2007/karma_audit/dlog/config.h#4 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/client.c#3 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/config.c#3 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/config.h#3 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/server.c#3 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/ttree.c#2 edit .. //depot/projects/soc2007/karma_audit/dlog/daemon/ttree.h#2 edit .. //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.c#3 edit .. //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.h#3 edit Differences ... ==== //depot/projects/soc2007/karma_audit/dlog/config.h#4 (text+ko) ==== @@ -14,4 +14,6 @@ #define SERVER_PORT "9991" +#define QLEN 10 + #endif ==== //depot/projects/soc2007/karma_audit/dlog/daemon/client.c#3 (text+ko) ==== @@ -12,28 +12,96 @@ void client_main() { - int s, opt = 1; + int s, cs, opt = 1; + size_t nr = 0; struct sockaddr_un n; + char buf[KEYWORD_MAX+PATH_MAX+1]; + char keyword[KEYWORD_MAX]; + char pathname[PATH_MAX]; + struct msghdr msg; + struct iovec iov[2]; + union { + struct cmsghdr cm; + char control[CMSG_SPACE(sizeof(struct cmsgcred))]; + } c; + struct cmsghdr *cm; + union + { + struct sockcred uc; + char b[sizeof (struct sockcred) + NGROUPS * sizeof (int)]; + } cr; + + cm = &c.cm; + + msg.msg_control = c.control; + msg.msg_controllen = sizeof(c.control); + msg.msg_name = NULL; + msg.msg_namelen = 0; + + bzero(keyword, KEYWORD_MAX); + bzero(pathname, PATH_MAX); + bzero(buf, KEYWORD_MAX + PATH_MAX + 1); + + iov[0].iov_base = buf; + iov[0].iov_len = PATH_MAX + KEYWORD_MAX + 1; + + msg.msg_iov = iov; + msg.msg_iovlen = 1; + s = socket(PF_LOCAL, SOCK_STREAM, 0); - if (s < 0) - { + if (s < 0) { err_fatal("can't create PF_LOCAL socket"); } - - if ((setsockopt(s, 0, LOCAL_CREDS, &opt, sizeof(opt))) < 0) - { + + unlink(DL_SOCKET); + + if ((setsockopt(s, 0, LOCAL_CREDS, &opt, sizeof(opt))) < 0) { err_fatal("can't receive credentials from PF_LOCAL socket"); } - + bzero(&n, sizeof(n)); n.sun_family = PF_LOCAL; - strncpy(n.sun_path, DL_SOCKET, sizeof(DL_SOCKET)); + strcpy(n.sun_path, DL_SOCKET); + + if ((bind(s, (struct sockaddr *) &n, SUN_LEN (&n))) < 0) { + err_fatal("can't bind PF_LOCAL socket. Another instance is running?"); + } + + if (listen(s, QLEN) < 0) { + err_fatal("cat't listen() on PF_LOCAL socket."); + } - if ((bind(s, (struct sockaddr *) &n, SUN_LEN (&n))) < 0) - { - err_fatal("can't bind PF_LOCAL socket"); + while ((cs = accept(s, (struct sockaddr *) NULL, NULL)) >= 0) { + + nr = recvmsg (cs, &msg, 0); + + /* TODO: could go bad here.. fix later.. */ + if ((sscanf(buf, "%s\n%s", pathname, keyword)) < 2) { + printf("ouch!"); + /* TODO: wrong query */ + } + +#ifdef DEBUG + printf("RECEIVED: %s %s\n", pathname, keyword); +#endif + + if (cm -> cmsg_type == SCM_CREDS) { + memcpy(&cr, ((struct sockcred *) CMSG_DATA(cm)), + cm -> cmsg_len - sizeof(struct cmsghdr)); +#ifdef DEBUG + printf("UID %d, GID %d\n", cr.uc.sc_uid, cr.uc.sc_gid); +#endif + if ((verify_client_access(cr.uc.sc_uid, cr.uc.sc_gid)) == 0) + { + /* TODO: add logfile to spool here */ + } + + } else { + /* TODO: can't check permissions. wrong query */ + printf("can't check permissions"); + } + close(cs); } - } ==== //depot/projects/soc2007/karma_audit/dlog/daemon/config.c#3 (text+ko) ==== @@ -104,13 +104,13 @@ if (strcmp(id, "uid") == 0) { pcka -> id = 1; - pcka -> ut = (uid_t)strtol(val, (char **)NULL, 10); - if (pcka -> ut == 0) + pcka -> uid = (uid_t)strtol(val, (char **)NULL, 10); + if (pcka -> uid == 0) { err_fatal("wrong UID."); } - struct passwd * psw = getpwuid(pcka -> ut); + struct passwd * psw = getpwuid(pcka -> uid); if (psw == NULL) { @@ -122,13 +122,13 @@ if (strcmp(id, "gid") == 0) { pcka -> id = 2; - pcka -> gt = (gid_t)strtol(val, (char **)NULL, 10); - if (pcka -> gt == 0) + pcka -> gid = (gid_t)strtol(val, (char **)NULL, 10); + if (pcka -> gid == 0) { err_fatal("wrong gid"); } - struct group * grp = getgrgid (pcka -> gt); + struct group * grp = getgrgid (pcka -> gid); if (grp = NULL) { @@ -148,7 +148,7 @@ err_fatal("getpwnam() failed. Probably wrong username."); } - pcka -> ut = psw -> pw_uid; + pcka -> uid = psw -> pw_uid; return 0; } @@ -161,7 +161,7 @@ err_fatal("getgrnam() failed. Probably wrong groupname."); } - pcka -> gt = grp -> gr_gid; + pcka -> gid = grp -> gr_gid; return 0; } @@ -245,3 +245,48 @@ { return 0; } + +/* Verify client access (with specified uid and gid) to specified keyword + + If success: 0 returned + If failed: -1, bad keyword + -2, access denied +*/ + +int +verify_client_access (const char * keyword, uid_t uid, gid_t gid) +{ + cl_kw_data * ck; + cl_kw_access * ca; + + ck = (cl_kw_data *)search_tree(client_kw_tree, keyword); + + if (ck == NULL) + { + return (-1); /* bad keyword */ + } + + ca = ck -> access; + + while (ca != NULL) + { + if (ca -> id == 1) + { + if (uid == ca -> uid) + { + return 0; + } + } + if (ca -> id == 2) + { + if (gid == ca -> gid) + { + return 0; + } + } + } + + /* TODO: check for supplementary groups for UID as well */ + + return (-2); /* access denied */ +} ==== //depot/projects/soc2007/karma_audit/dlog/daemon/config.h#3 (text+ko) ==== @@ -5,8 +5,8 @@ typedef struct client_kw_access { int id; - uid_t ut; - gid_t gt; + uid_t uid; + gid_t gid; struct client_kw_access * next; } cl_kw_access; @@ -46,4 +46,6 @@ void parse_client_config(); void parse_server_config(); +int verify_client_access (const char * keyword, uid_t uid, gid_t gid); + #endif ==== //depot/projects/soc2007/karma_audit/dlog/daemon/server.c#3 (text+ko) ==== @@ -4,8 +4,6 @@ #include #include -#define QLEN 10 - void server_serve (int s) { ==== //depot/projects/soc2007/karma_audit/dlog/daemon/ttree.c#2 (text+ko) ==== @@ -12,6 +12,7 @@ #define MAX(x,y) ((x > y) ? x : y) #define LT(x, y) ((strcmp(x,y)) < (0)) #define GT(x, y) ((strcmp(x,y)) > (0)) +#define EQ(x, y) ((strcmp(x,y)) == (0)) #if 0 inline void @@ -336,3 +337,49 @@ } } +/* Search tree for key. + + If success: pointer to value is returned. + If failed: NULL returned +*/ + +void * +search_tree (TTree * d, const char * key) +{ + TData *tn; + + if (d -> l == NULL) + return NULL; + + if (LT(key, d -> l -> key)) + { + if (d -> tl == NULL) + return NULL; + else + return (search_tree(d -> tl, key)); + } + + if (GT(key, d -> r -> key)) + { + if (d -> tr == NULL) + return NULL; + else + return (search_tree(d -> tr, key)); + } + + tn = d -> l; + + while (tn != NULL) + { + if (EQ(key, tn->key)) + { + return tn -> content; + } + else + { + tn = tn -> next; + } + } + + return NULL; +} ==== //depot/projects/soc2007/karma_audit/dlog/daemon/ttree.h#2 (text+ko) ==== @@ -22,6 +22,6 @@ TTree * allocate_ttree(); int insert_tree (TTree **, char *, void *); -void traverse_tree (TTree *,int); +void * search_tree (TTree *, const char * key); #endif ==== //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.c#3 (text+ko) ==== @@ -5,18 +5,15 @@ #include #include #include +#include #include #include #include #include #include #include - -#define BUF_SIZE PATH_MAX+KEYWORD_MAX+2 - -static int timeout = 1000; +#include -static int dlogd_send (int fd, const char * buf, size_t len); static int dlogd_connect (); /* Submit log file @@ -29,7 +26,14 @@ { int fd, rc; size_t len; - char buf[BUF_SIZE]; + char buf[KEYWORD_MAX + PATH_MAX + 1]; + struct msghdr msg; + struct cmsghdr *cmsg; + struct iovec iov[1]; + union { + struct cmsghdr cm; + char control[CMSG_SPACE(sizeof(struct cmsgcred))]; + } c; if (strlen(pathname) > PATH_MAX) { @@ -45,69 +49,42 @@ return fd; } - snprintf(buf, BUF_SIZE, "%s\n%s\n", keyword, pathname); - len = strlen(buf); + snprintf(buf, strlen(pathname)+strlen(keyword)+2, "%s\n%s", pathname, keyword); + + /* Construct message */ - rc = dlogd_send(fd, buf, len); + iov[0].iov_base = buf; + iov[0].iov_len = strlen(pathname)+strlen(keyword)+2; - if (rc < 0) - return rc; + bzero(&msg, sizeof(msg)); + msg.msg_control = c.control; + msg.msg_controllen = sizeof(c.control); - /* TODO: write dlogd_receive and wait for server's reply */ - - return 0; -} + cmsg = CMSG_FIRSTHDR(&msg); + cmsg -> cmsg_len = CMSG_LEN(sizeof(struct cmsgcred)); + cmsg -> cmsg_level = SOL_SOCKET; + cmsg -> cmsg_type = SCM_CREDS; -/* Send buf through fd descriptor + msg.msg_name = NULL; + msg.msg_namelen = 0; - On success: 0 returned - - On failure: -1 returned -*/ - -static int -dlogd_send (int fd, const char * buf, size_t len) -{ - struct pollfd fds; - int rc, bytes; + msg.msg_iov = iov; + msg.msg_iovlen = 1; - fds.fd = fd; - fds.events = POLLOUT; + if (sendmsg (fd, &msg, 0) < 0) + { + close(fd); + return (-5); /* can't sendmsg */ + } - while (len) - { - fds.revents = 0; - rc = poll(&fds, 1, timeout * 1000); - if (rc == 0) - return (-1); /* timeout */ - else if (rc < 0) - { - if (errno == EINTR || errno == EAGAIN) - continue; - else - return (-1); - } - - if (!fds.revents) - return (-1); - - bytes = write(fd,buf,len); - - if (bytes < 0) - { - if (errno == EINTR) - continue; - else - return (-1); - } + rc = close(fd); - len -= bytes; - buf += bytes; - } + printf("close returned %d\n", rc); return 0; } + /* Connect to local daemon through PF_LOCAL socket. On success: descriptor returned ==== //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jul 9 05:54:36 2007 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 2AF3416A46F; Mon, 9 Jul 2007 05:54:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08DEB16A46C for ; Mon, 9 Jul 2007 05:54:36 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ED29513C457 for ; Mon, 9 Jul 2007 05:54:35 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l695sZ9d054568 for ; Mon, 9 Jul 2007 05:54:35 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l695sZnE054564 for perforce@freebsd.org; Mon, 9 Jul 2007 05:54:35 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 9 Jul 2007 05:54:35 GMT Message-Id: <200707090554.l695sZnE054564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 123177 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, 09 Jul 2007 05:54:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=123177 Change 123177 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/09 05:53:59 Correct the memory leakage mistake Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#2 (text+ko) ==== @@ -64,6 +64,7 @@ *(buffer1 + strleng + 1) = 0; \ strcpy(charpoint, buffer1); \ mac_test_log_submit(buffer, strlen(buffer)); \ + free(buffer1, M_MAC_TEST_LOG); \ exit: \ free(elements1, M_MAC_TEST_LOG); \ exit1: \ From owner-p4-projects@FreeBSD.ORG Mon Jul 9 08:34:54 2007 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 1BCB416A469; Mon, 9 Jul 2007 08:34:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E70CB16A400 for ; Mon, 9 Jul 2007 08:34:53 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BF63113C465 for ; Mon, 9 Jul 2007 08:34:53 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l698Yrqb091556 for ; Mon, 9 Jul 2007 08:34:53 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l698YrYJ091540 for perforce@freebsd.org; Mon, 9 Jul 2007 08:34:53 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 08:34:53 GMT Message-Id: <200707090834.l698YrYJ091540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123180 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, 09 Jul 2007 08:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=123180 Change 123180 by jbr@jbr_bob on 2007/07/09 08:34:12 Initial import Affected files ... .. //depot/projects/soc2007/jbr-syscall/sys/kern/kern_exec.c#1 add .. //depot/projects/soc2007/jbr-syscall/sys/sys/sysent.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 9 08:54:18 2007 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 264D316A46B; Mon, 9 Jul 2007 08:54:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC56C16A468 for ; Mon, 9 Jul 2007 08:54:17 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DD6DF13C45A for ; Mon, 9 Jul 2007 08:54:17 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l698sH1A002226 for ; Mon, 9 Jul 2007 08:54:17 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l698sHNN002223 for perforce@freebsd.org; Mon, 9 Jul 2007 08:54:17 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 08:54:17 GMT Message-Id: <200707090854.l698sHNN002223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123181 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, 09 Jul 2007 08:54:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=123181 Change 123181 by jbr@jbr_bob on 2007/07/09 08:53:35 Added new vm_offset for sharememory. Added call to allocate sysshm. Affected files ... .. //depot/projects/soc2007/jbr-syscall/sys/kern/kern_exec.c#2 edit .. //depot/projects/soc2007/jbr-syscall/sys/sys/sysent.h#2 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -918,6 +918,11 @@ map = &vmspace->vm_map; } + /* Allocate memory shared between process and kernel */ + error = vm_map_sysshm(map, sv->sv_minuser); + if (error) + return (error); + /* Allocate a new stack */ stack_addr = sv->sv_usrstack - maxssiz; error = vm_map_stack(map, stack_addr, (vm_size_t)maxssiz, ==== //depot/projects/soc2007/jbr-syscall/sys/sys/sysent.h#2 (text+ko) ==== @@ -95,6 +95,8 @@ vm_offset_t sv_maxuser; /* VM_MAXUSER_ADDRESS */ vm_offset_t sv_usrstack; /* USRSTACK */ vm_offset_t sv_psstrings; /* PS_STRINGS */ + vm_offset_t sv_sysshm; /* memory shared between proccess and + kernel */ int sv_stackprot; /* vm protection for stack */ register_t *(*sv_copyout_strings)(struct image_params *); void (*sv_setregs)(struct thread *, u_long, u_long, u_long); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 08:55:20 2007 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 D477216A468; Mon, 9 Jul 2007 08:55:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B28F016A41F for ; Mon, 9 Jul 2007 08:55:19 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B81A13C458 for ; Mon, 9 Jul 2007 08:55:19 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l698tJ8d002324 for ; Mon, 9 Jul 2007 08:55:19 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l698tJpS002321 for perforce@freebsd.org; Mon, 9 Jul 2007 08:55:19 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 08:55:19 GMT Message-Id: <200707090855.l698tJpS002321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123182 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, 09 Jul 2007 08:55:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=123182 Change 123182 by jbr@jbr_bob on 2007/07/09 08:55:18 Initial import. Affected files ... .. //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.c#1 add .. //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 9 09:20:53 2007 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 514E716A46C; Mon, 9 Jul 2007 09:20:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2420916A421 for ; Mon, 9 Jul 2007 09:20:53 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1436C13C4B7 for ; Mon, 9 Jul 2007 09:20:53 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l699KqM5005936 for ; Mon, 9 Jul 2007 09:20:52 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l699Kqr9005933 for perforce@freebsd.org; Mon, 9 Jul 2007 09:20:52 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 09:20:52 GMT Message-Id: <200707090920.l699Kqr9005933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123186 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, 09 Jul 2007 09:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=123186 Change 123186 by jbr@jbr_bob on 2007/07/09 09:20:50 Added dummy process for page allocation Affected files ... .. //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.c#2 edit .. //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.h#2 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.c#2 (text+ko) ==== @@ -2983,6 +2983,16 @@ } /* + * Allocate a page which holds data shared between the kernel and user + * process. +*/ +int +vm_map_sysshm(vm_map_t) +{ + return (KERN_SUCCESS); +} + +/* * Unshare the specified VM space for exec. If other processes are * mapped to it, then create a new one. The new vmspace is null. */ ==== //depot/projects/soc2007/jbr-syscall/sys/vm/vm_map.h#2 (text+ko) ==== @@ -354,6 +354,7 @@ void vm_map_simplify_entry (vm_map_t, vm_map_entry_t); void vm_init2 (void); int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int); +int vm_map_sysshm(vm_map_t); int vm_map_growstack (struct proc *p, vm_offset_t addr); int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 10:23:19 2007 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 5CEDD16A46C; Mon, 9 Jul 2007 10:23:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1624216A468 for ; Mon, 9 Jul 2007 10:23:19 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0454E13C45B for ; Mon, 9 Jul 2007 10:23:19 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69ANIfS011480 for ; Mon, 9 Jul 2007 10:23:18 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69ANIws011442 for perforce@freebsd.org; Mon, 9 Jul 2007 10:23:18 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 10:23:18 GMT Message-Id: <200707091023.l69ANIws011442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123188 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, 09 Jul 2007 10:23:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123188 Change 123188 by jbr@jbr_bob on 2007/07/09 10:19:06 Move things into a current branch. Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/float.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/param.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/console.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/help.common#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/module.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/README.quirks#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/00READ#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/TODO#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/cnode.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/opensolaris/sys/vnode.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 9 11:46:06 2007 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 62CAD16A46C; Mon, 9 Jul 2007 11:46:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0415816A46D for ; Mon, 9 Jul 2007 11:46:06 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E86A513C4CA for ; Mon, 9 Jul 2007 11:46:05 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69Bk5gX029553 for ; Mon, 9 Jul 2007 11:46:05 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69Bk5FR029550 for perforce@freebsd.org; Mon, 9 Jul 2007 11:46:05 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 9 Jul 2007 11:46:05 GMT Message-Id: <200707091146.l69Bk5FR029550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123196 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, 09 Jul 2007 11:46:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123196 Change 123196 by lulf@lulf_carrot on 2007/07/09 11:45:22 - Finish testplan. Affected files ... .. //depot/projects/soc2007/lulf/TESTPLAN#2 edit Differences ... ==== //depot/projects/soc2007/lulf/TESTPLAN#2 (text+ko) ==== @@ -1,35 +1,68 @@ * Test #1: Test of rebuild and RAID-5 operation in degraded mode. - 1. Create test-data. - 2. Create a RAID-5 volume. - 3. Set one of the subdisks stale. - 4. Write test-data to volume. - 5. Read test-data from volume, compare to original data. - 6. Rebuild the volume. - 7. Read test-data from volume, compare to original data. - 8. Set one of the other subdisks stale. - 9. Read test-data from volume, compare to original data. + 1) Data initalization + * Create a RAID-5 volume. + * Initialize volume. + * Check that parity is correct. + 2) Data concistency + * Create a RAID-5 volume. + * Initialize the volume. + * Set one of the subdisks stale. + * Write test-data to volume. + * Read test-data from volume, compare to original data. + * Rebuild the volume. + * Read test-data from volume, compare to original data. + * Set one of the other subdisks stale. + * Read test-data from volume, compare to original data. + + 3) Online RAID-5 rebuild. + * Create test-data. + * Create a RAID-5 volume. + * Create a filesystem on the volume. + * Degrade one of the subdisks. + * Mount the volume. + * Do I/O on the filesystem and sync. + * Initiate rebuild. + * Do more I/O. + * Check that all changes were made to the volume. + +* Test 2: Test of mirrored plexes + 1) Online syncronization + * Create test-data + * Create a mirrored volume. + * Degrade one plex of the mirror. + * Write data to the mirror. + * Synchronize data. + * Degrade another plex of the mirror. + * Read data from the mirror. + * Make sure data is the same. + + 2) Size correctness. + * Create a volume with plexes of different size. + * Check that the volume gets the correct size (the smallest of the + plexes) + -* Test #2: Test of online RAID-5 rebuild. - 1. Create test-data. - 2. Create a RAID-5 volume. - 3. Create a filesystem on the volume. - 4. Degrade one of the subdisks. - 5. Mount the volume. - 6. Do I/O on the filesystem and sync. - 7. Initiate rebuild. - 8. Do more I/O. +* Test #3: Test of attach/detach correctness: + 1) Detach + * Create a vinum config with 3 drives and a volume that uses 2 drives. + * Detach one of the subdisks. Make sure all bindings are removed + * When creating a new subdisk, make sure it's attached, and not added if + the plex misses a subdisk. + 2) Attach + * Use the previous config, but also create a new subdisk and tell it to + attach to the old plex. + * Make sure all bindings are up, and that the volume functions as normal. + * Make sure it's renamed correctly if parameter specified. + * Make sure it's put at the correct offset, and it's not possible to put + it on a conflicting offset. -* Test #3: Test of volume online synchronization - 1. Create test-data - 2. Create a mirrored volume. - 3. Degrade one plex of the mirror. - 4. Write data to the mirror. - 5. Synchronize data. - 6. Degrade another plex of the mirror. - 7. Read data from the mirror. - 8. Make sure data is the same. +* Test #4: Test of rename/move and that they work as before. + 1) Rename + * Rename is partially tested with the attach routine. + 2) Move + * Make sure it behaves exactly like adding a new subdisk to a drive. -* Test #4: Test of concat/stripe/mirror routine. +* Test #5: Test of concat/stripe/mirror routine. 1.1 Create a concat volume over one ++ disks. or 1.2 Create a stripe volume over two or more disks. From owner-p4-projects@FreeBSD.ORG Mon Jul 9 12:39:13 2007 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 AD13616A469; Mon, 9 Jul 2007 12:39:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6593716A468 for ; Mon, 9 Jul 2007 12:39:13 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 56C3213C4AE for ; Mon, 9 Jul 2007 12:39:13 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69CdD66034380 for ; Mon, 9 Jul 2007 12:39:13 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69CdC5n034377 for perforce@freebsd.org; Mon, 9 Jul 2007 12:39:12 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 12:39:12 GMT Message-Id: <200707091239.l69CdC5n034377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123198 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, 09 Jul 2007 12:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=123198 Change 123198 by rpaulo@rpaulo_epsilon on 2007/07/09 12:38:40 asmc_mbp_sysctl_light_left() use the correct SMC key for the left light sensor. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#25 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#25 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#24 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#25 $ * */ @@ -949,7 +949,7 @@ unsigned int level; int32_t v; - asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, 6); + asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, 6); v = buf[2]; error = sysctl_handle_int(oidp, &v, sizeof(v), req); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 13:17:00 2007 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 9042316A4D1; Mon, 9 Jul 2007 13:17:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 30D3316A46C for ; Mon, 9 Jul 2007 13:17:00 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 21B4A13C458 for ; Mon, 9 Jul 2007 13:17:00 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69DH0Kd046832 for ; Mon, 9 Jul 2007 13:17:00 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69DGx5A046829 for perforce@freebsd.org; Mon, 9 Jul 2007 13:16:59 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 13:16:59 GMT Message-Id: <200707091316.l69DGx5A046829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123199 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, 09 Jul 2007 13:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=123199 Change 123199 by jbr@jbr_bob on 2007/07/09 13:15:59 Fixes, so it compiles on i386. Brokken every where else. Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.h#2 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#2 (text+ko) ==== @@ -69,6 +69,7 @@ USRSTACK, PS_STRINGS, VM_PROT_ALL, + 0, exec_copyout_strings, exec_setregs, NULL ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#2 (text+ko) ==== @@ -342,6 +342,7 @@ USRSTACK, PS_STRINGS, VM_PROT_ALL, + 0, NULL, NULL, NULL ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#2 (text+ko) ==== @@ -2987,7 +2987,7 @@ * process. */ int -vm_map_sysshm(vm_map_t) +vm_map_sysshm(vm_map_t map, vm_offset_t addr) { return (KERN_SUCCESS); } ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.h#2 (text+ko) ==== @@ -354,7 +354,7 @@ void vm_map_simplify_entry (vm_map_t, vm_map_entry_t); void vm_init2 (void); int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int); -int vm_map_sysshm(vm_map_t); +int vm_map_sysshm(vm_map_t, vm_offset_t); int vm_map_growstack (struct proc *p, vm_offset_t addr); int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 13:17:03 2007 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 8A26B16A57F; Mon, 9 Jul 2007 13:17:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E08416A57C for ; Mon, 9 Jul 2007 13:17:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3CEF913C46A for ; Mon, 9 Jul 2007 13:17:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69DH3QP046843 for ; Mon, 9 Jul 2007 13:17:03 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69DH0YQ046835 for perforce@freebsd.org; Mon, 9 Jul 2007 13:17:00 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 13:17:00 GMT Message-Id: <200707091317.l69DH0YQ046835@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123200 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, 09 Jul 2007 13:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=123200 Change 123200 by rpaulo@rpaulo_epsilon on 2007/07/09 13:16:03 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/Makefile#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#17 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/kern.pre.mk#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/re/if_re.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/rp/rp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/snp/snp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ubser.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/udbp.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umass.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_port.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uvisor.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uvscom.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_cause.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_debug.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/i4b_trace.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/i386/include/pc/vesa.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_cause.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_debug.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/include/i4b_trace.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/init_sysent.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_conf.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_unit.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sys_generic.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/syscalls.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/syscalls.master#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/systrace_args.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/tty_pts.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/in_mcast.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/dest6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/frag6.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/icmp6.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_cksum.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_pcb.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_proto.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_forward.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_id.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_output.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_var.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/mld6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/raw_ip6.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/route6.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/scope6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_var.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_output.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/opencrypto/cast.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_cause.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_debug.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pc98/include/i4b_trace.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_policy.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sx.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/syscall.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/syscall.mk#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sysproto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/systm.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#5 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.43 2007/07/01 11:38:26 gnn Exp $ +# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $ .include @@ -10,7 +10,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ - netgraph netinet netinet6 netipx netnatm netncp \ + netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} @@ -24,12 +24,14 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +# You need the devel/cscope port for this. cscope: ${.CURDIR}/cscopenamefile cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile ${.CURDIR}/cscopenamefile: cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} +# You need the devel/global and one of editor/emacs* ports for that. TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.44 2007/06/05 00:00:50 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $"); #include #include @@ -927,7 +927,6 @@ bsd_args.len = linux_args->len; } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; - bsd_args.pad = 0; #ifdef DEBUG if (ldebug(mmap)) @@ -1153,7 +1152,6 @@ #endif sa.fd = args->fd; - sa.pad = 0; sa.length = args->length; return ftruncate(td, &sa); } ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.65 2007/06/17 04:37:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $"); #include "opt_compat.h" @@ -475,6 +475,24 @@ return (mmap(td, &ap)); } +#ifdef COMPAT_FREEBSD6 +int +freebsd6_freebsd32_mmap(struct thread *td, struct freebsd6_freebsd32_mmap_args *uap) +{ + struct freebsd32_mmap_args ap; + + ap.addr = uap->addr; + ap.len = uap->len; + ap.prot = uap->prot; + ap.flags = uap->flags; + ap.fd = uap->fd; + ap.poslo = uap->poslo; + ap.poshi = uap->poshi; + + return (freebsd32_mmap(td, &ap)); +} +#endif + struct itimerval32 { struct timeval32 it_interval; struct timeval32 it_value; @@ -1616,6 +1634,71 @@ return (ftruncate(td, &ap)); } +#ifdef COMPAT_FREEBSD6 +/* versions with the 'int pad' argument */ +int +freebsd6_freebsd32_pread(struct thread *td, struct freebsd6_freebsd32_pread_args *uap) +{ + struct pread_args ap; + + ap.fd = uap->fd; + ap.buf = uap->buf; + ap.nbyte = uap->nbyte; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + return (pread(td, &ap)); +} + +int +freebsd6_freebsd32_pwrite(struct thread *td, struct freebsd6_freebsd32_pwrite_args *uap) +{ + struct pwrite_args ap; + + ap.fd = uap->fd; + ap.buf = uap->buf; + ap.nbyte = uap->nbyte; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + return (pwrite(td, &ap)); +} + +int +freebsd6_freebsd32_lseek(struct thread *td, struct freebsd6_freebsd32_lseek_args *uap) +{ + int error; + struct lseek_args ap; + off_t pos; + + ap.fd = uap->fd; + ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); + ap.whence = uap->whence; + error = lseek(td, &ap); + /* Expand the quad return into two parts for eax and edx */ + pos = *(off_t *)(td->td_retval); + td->td_retval[0] = pos & 0xffffffff; /* %eax */ + td->td_retval[1] = pos >> 32; /* %edx */ + return error; +} + +int +freebsd6_freebsd32_truncate(struct thread *td, struct freebsd6_freebsd32_truncate_args *uap) +{ + struct truncate_args ap; + + ap.path = uap->path; + ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32)); + return (truncate(td, &ap)); +} + +int +freebsd6_freebsd32_ftruncate(struct thread *td, struct freebsd6_freebsd32_ftruncate_args *uap) +{ + struct ftruncate_args ap; + + ap.fd = uap->fd; + ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32)); + return (ftruncate(td, &ap)); +} +#endif /* COMPAT_FREEBSD6 */ + struct sf_hdtr32 { uint32_t headers; int hdr_cnt; ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.76 2006/12/20 19:39:10 jkim Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.77 2007/07/04 23:03:50 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -134,22 +134,6 @@ char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)]; char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)]; }; -struct freebsd32_pread_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; - char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; -}; -struct freebsd32_pwrite_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; - char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; -}; struct freebsd32_stat_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; @@ -162,35 +146,6 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; -struct freebsd32_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; - char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; -}; -struct freebsd32_lseek_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; - char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; - char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; -}; -struct freebsd32_truncate_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; - char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; -}; -struct freebsd32_ftruncate_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; - char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; -}; struct freebsd32_sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; @@ -322,6 +277,45 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct freebsd32_pread_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_pwrite_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_mmap_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; + char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct freebsd32_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; +struct freebsd32_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -341,15 +335,9 @@ int freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *); int freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *); int freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *); -int freebsd32_pread(struct thread *, struct freebsd32_pread_args *); -int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *); int freebsd32_stat(struct thread *, struct freebsd32_stat_args *); int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *); int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *); -int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); -int freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *); -int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *); -int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *); int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *); int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *); @@ -377,6 +365,12 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); +int freebsd32_pread(struct thread *, struct freebsd32_pread_args *); +int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *); +int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); +int freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *); +int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *); +int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *); #ifdef COMPAT_43 @@ -466,6 +460,63 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +struct freebsd6_freebsd32_pread_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd6_freebsd32_pwrite_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; + char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; +}; +struct freebsd6_freebsd32_mmap_args { + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; + char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; +}; +struct freebsd6_freebsd32_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct freebsd6_freebsd32_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; +struct freebsd6_freebsd32_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; +int freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *); +int freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *); +int freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *); +int freebsd6_freebsd32_lseek(struct thread *, struct freebsd6_freebsd32_lseek_args *); +int freebsd6_freebsd32_truncate(struct thread *, struct freebsd6_freebsd32_truncate_args *); +int freebsd6_freebsd32_ftruncate(struct thread *, struct freebsd6_freebsd32_ftruncate_args *); + +#endif /* COMPAT_FREEBSD6 */ + #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG @@ -485,15 +536,9 @@ #define FREEBSD32_SYS_AUE_freebsd32_semsys AUE_SEMSYS #define FREEBSD32_SYS_AUE_freebsd32_msgsys AUE_MSGSYS #define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS -#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD -#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE #define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT #define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT #define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT -#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP -#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK -#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE -#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE #define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES #define FREEBSD32_SYS_AUE_freebsd32_msgsnd AUE_MSGSND @@ -521,6 +566,12 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD +#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE +#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP +#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK +#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE #undef PAD_ #undef PADL_ ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.74 2006/12/20 19:39:10 jkim Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.75 2007/07/04 23:03:50 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ #define FREEBSD32_SYS_syscall 0 @@ -24,7 +24,7 @@ #define FREEBSD32_SYS_chmod 15 #define FREEBSD32_SYS_chown 16 #define FREEBSD32_SYS_break 17 - /* 18 is old freebsd32_getfsstat */ +#define FREEBSD32_SYS_freebsd4_freebsd32_getfsstat 18 /* 19 is obsolete olseek */ #define FREEBSD32_SYS_getpid 20 #define FREEBSD32_SYS_mount 21 @@ -153,8 +153,8 @@ /* 149 is obsolete oquota */ /* 150 is obsolete ogetsockname */ /* 156 is obsolete ogetdirentries */ - /* 157 is old freebsd32_statfs */ - /* 158 is old freebsd32_fstatfs */ +#define FREEBSD32_SYS_freebsd4_freebsd32_statfs 157 +#define FREEBSD32_SYS_freebsd4_freebsd32_fstatfs 158 #define FREEBSD32_SYS_getfh 161 #define FREEBSD32_SYS_getdomainname 162 #define FREEBSD32_SYS_setdomainname 163 @@ -164,8 +164,8 @@ #define FREEBSD32_SYS_freebsd32_semsys 169 #define FREEBSD32_SYS_freebsd32_msgsys 170 #define FREEBSD32_SYS_freebsd32_shmsys 171 -#define FREEBSD32_SYS_freebsd32_pread 173 -#define FREEBSD32_SYS_freebsd32_pwrite 174 +#define FREEBSD32_SYS_freebsd6_freebsd32_pread 173 +#define FREEBSD32_SYS_freebsd6_freebsd32_pwrite 174 #define FREEBSD32_SYS_ntp_adjtime 176 #define FREEBSD32_SYS_setgid 181 #define FREEBSD32_SYS_setegid 182 @@ -178,11 +178,11 @@ #define FREEBSD32_SYS_getrlimit 194 #define FREEBSD32_SYS_setrlimit 195 #define FREEBSD32_SYS_getdirentries 196 -#define FREEBSD32_SYS_freebsd32_mmap 197 +#define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197 #define FREEBSD32_SYS___syscall 198 -#define FREEBSD32_SYS_freebsd32_lseek 199 -#define FREEBSD32_SYS_freebsd32_truncate 200 -#define FREEBSD32_SYS_freebsd32_ftruncate 201 +#define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199 +#define FREEBSD32_SYS_freebsd6_freebsd32_truncate 200 +#define FREEBSD32_SYS_freebsd6_freebsd32_ftruncate 201 #define FREEBSD32_SYS_freebsd32_sysctl 202 #define FREEBSD32_SYS_mlock 203 #define FREEBSD32_SYS_munlock 204 @@ -220,7 +220,7 @@ #define FREEBSD32_SYS_nlstat 280 #define FREEBSD32_SYS_freebsd32_preadv 289 #define FREEBSD32_SYS_freebsd32_pwritev 290 - /* 297 is old freebsd32_fhstatfs */ +#define FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs 297 #define FREEBSD32_SYS_fhopen 298 #define FREEBSD32_SYS_fhstat 299 #define FREEBSD32_SYS_modnext 300 @@ -252,14 +252,14 @@ #define FREEBSD32_SYS_sched_get_priority_min 333 #define FREEBSD32_SYS_sched_rr_get_interval 334 #define FREEBSD32_SYS_utrace 335 - /* 336 is old freebsd32_sendfile */ +#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336 #define FREEBSD32_SYS_kldsym 337 #define FREEBSD32_SYS_jail 338 #define FREEBSD32_SYS_sigprocmask 340 #define FREEBSD32_SYS_sigsuspend 341 - /* 342 is old freebsd32_sigaction */ +#define FREEBSD32_SYS_freebsd4_freebsd32_sigaction 342 #define FREEBSD32_SYS_sigpending 343 - /* 344 is old freebsd32_sigreturn */ +#define FREEBSD32_SYS_freebsd4_freebsd32_sigreturn 344 #define FREEBSD32_SYS_freebsd32_sigtimedwait 345 #define FREEBSD32_SYS_freebsd32_sigwaitinfo 346 #define FREEBSD32_SYS___acl_get_file 347 @@ -331,4 +331,10 @@ #define FREEBSD32_SYS_sctp_generic_sendmsg 472 #define FREEBSD32_SYS_sctp_generic_sendmsg_iov 473 #define FREEBSD32_SYS_sctp_generic_recvmsg 474 -#define FREEBSD32_SYS_MAXSYSCALL 475 +#define FREEBSD32_SYS_freebsd32_pread 475 +#define FREEBSD32_SYS_freebsd32_pwrite 476 +#define FREEBSD32_SYS_freebsd32_mmap 477 +#define FREEBSD32_SYS_freebsd32_lseek 478 +#define FREEBSD32_SYS_freebsd32_truncate 479 +#define FREEBSD32_SYS_freebsd32_ftruncate 480 +#define FREEBSD32_SYS_MAXSYSCALL 481 ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_syscalls.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.65 2006/12/20 19:39:10 jkim Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.66 2007/07/04 23:03:50 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ const char *freebsd32_syscallnames[] = { @@ -25,7 +25,7 @@ "chmod", /* 15 = chmod */ "chown", /* 16 = chown */ "break", /* 17 = break */ - "old.freebsd32_getfsstat", /* 18 = old freebsd32_getfsstat */ + "compat4.freebsd32_getfsstat", /* 18 = old freebsd32_getfsstat */ "obs_olseek", /* 19 = obsolete olseek */ "getpid", /* 20 = getpid */ "mount", /* 21 = mount */ @@ -53,13 +53,13 @@ "getegid", /* 43 = getegid */ "profil", /* 44 = profil */ "ktrace", /* 45 = ktrace */ - "old.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */ + "compat.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */ "getgid", /* 47 = getgid */ - "old.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */ + "compat.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */ "getlogin", /* 49 = getlogin */ "setlogin", /* 50 = setlogin */ "acct", /* 51 = acct */ - "old.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ + "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */ "freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */ "ioctl", /* 54 = ioctl */ "reboot", /* 55 = reboot */ @@ -115,11 +115,11 @@ "setsockopt", /* 105 = setsockopt */ "listen", /* 106 = listen */ "obs_vtimes", /* 107 = obsolete vtimes */ - "old.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */ - "old.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */ - "old.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */ - "old.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */ - "old.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */ + "compat.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */ + "compat.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */ + "compat.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */ + "compat.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */ + "compat.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */ "obs_orecvmsg", /* 113 = obsolete orecvmsg */ "obs_osendmsg", /* 114 = obsolete osendmsg */ "obs_vtrace", /* 115 = obsolete vtrace */ @@ -164,8 +164,8 @@ "#154", /* 154 = nosys */ "#155", /* 155 = nfssvc */ "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */ - "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */ - "old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */ + "compat4.freebsd32_statfs", /* 157 = old freebsd32_statfs */ + "compat4.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */ "#159", /* 159 = nosys */ "#160", /* 160 = lgetfh */ "getfh", /* 161 = getfh */ @@ -180,8 +180,8 @@ "freebsd32_msgsys", /* 170 = freebsd32_msgsys */ "freebsd32_shmsys", /* 171 = freebsd32_shmsys */ "#172", /* 172 = nosys */ - "freebsd32_pread", /* 173 = freebsd32_pread */ - "freebsd32_pwrite", /* 174 = freebsd32_pwrite */ + "compat6.freebsd32_pread", /* 173 = old freebsd32_pread */ + "compat6.freebsd32_pwrite", /* 174 = old freebsd32_pwrite */ "#175", /* 175 = nosys */ "ntp_adjtime", /* 176 = ntp_adjtime */ "#177", /* 177 = sfork */ @@ -204,11 +204,11 @@ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ "getdirentries", /* 196 = getdirentries */ - "freebsd32_mmap", /* 197 = freebsd32_mmap */ + "compat6.freebsd32_mmap", /* 197 = old freebsd32_mmap */ "__syscall", /* 198 = __syscall */ - "freebsd32_lseek", /* 199 = freebsd32_lseek */ - "freebsd32_truncate", /* 200 = freebsd32_truncate */ - "freebsd32_ftruncate", /* 201 = freebsd32_ftruncate */ + "compat6.freebsd32_lseek", /* 199 = old freebsd32_lseek */ + "compat6.freebsd32_truncate", /* 200 = old freebsd32_truncate */ + "compat6.freebsd32_ftruncate", /* 201 = old freebsd32_ftruncate */ "freebsd32_sysctl", /* 202 = freebsd32_sysctl */ "mlock", /* 203 = mlock */ "munlock", /* 204 = munlock */ @@ -304,7 +304,7 @@ "#294", /* 294 = nosys */ "#295", /* 295 = nosys */ "#296", /* 296 = nosys */ - "old.freebsd32_fhstatfs", /* 297 = old freebsd32_fhstatfs */ + "compat4.freebsd32_fhstatfs", /* 297 = old freebsd32_fhstatfs */ "fhopen", /* 298 = fhopen */ "fhstat", /* 299 = fhstat */ "modnext", /* 300 = modnext */ @@ -343,15 +343,15 @@ "sched_get_priority_min", /* 333 = sched_get_priority_min */ "sched_rr_get_interval", /* 334 = sched_rr_get_interval */ "utrace", /* 335 = utrace */ - "old.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */ + "compat4.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */ "kldsym", /* 337 = kldsym */ "jail", /* 338 = jail */ "#339", /* 339 = pioctl */ "sigprocmask", /* 340 = sigprocmask */ "sigsuspend", /* 341 = sigsuspend */ - "old.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */ + "compat4.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */ "sigpending", /* 343 = sigpending */ - "old.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */ + "compat4.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */ "freebsd32_sigtimedwait", /* 345 = freebsd32_sigtimedwait */ "freebsd32_sigwaitinfo", /* 346 = freebsd32_sigwaitinfo */ "__acl_get_file", /* 347 = __acl_get_file */ @@ -482,4 +482,10 @@ "sctp_generic_sendmsg", /* 472 = sctp_generic_sendmsg */ "sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */ "sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */ + "freebsd32_pread", /* 475 = freebsd32_pread */ + "freebsd32_pwrite", /* 476 = freebsd32_pwrite */ + "freebsd32_mmap", /* 477 = freebsd32_mmap */ + "freebsd32_lseek", /* 478 = freebsd32_lseek */ + "freebsd32_truncate", /* 479 = freebsd32_truncate */ + "freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */ }; ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.75 2006/12/20 19:39:10 jkim Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.76 2007/07/04 23:03:50 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp */ #include "opt_compat.h" @@ -30,6 +30,12 @@ #define compat4(n, name) 0, (sy_call_t *)nosys #endif +#ifdef COMPAT_FREEBSD6 +#define compat6(n, name) n, (sy_call_t *)__CONCAT(freebsd6_,name) +#else +#define compat6(n, name) 0, (sy_call_t *)nosys +#endif + /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ @@ -205,8 +211,8 @@ { AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys, AUE_MSGSYS, NULL, 0, 0 }, /* 170 = freebsd32_msgsys */ { AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys, AUE_SHMSYS, NULL, 0, 0 }, /* 171 = freebsd32_shmsys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 172 = nosys */ - { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd32_pread */ - { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd32_pwrite */ + { compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0 }, /* 173 = old freebsd32_pread */ + { compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0 }, /* 174 = old freebsd32_pwrite */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */ { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */ @@ -229,11 +235,11 @@ { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */ { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */ { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */ - { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0 }, /* 197 = freebsd32_mmap */ + { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0 }, /* 197 = old freebsd32_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */ - { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 199 = freebsd32_lseek */ - { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = freebsd32_truncate */ - { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = freebsd32_ftruncate */ + { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0 }, /* 199 = old freebsd32_lseek */ + { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = old freebsd32_truncate */ + { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = old freebsd32_ftruncate */ { AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 202 = freebsd32_sysctl */ { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 203 = mlock */ { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 204 = munlock */ @@ -507,4 +513,10 @@ { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0 }, /* 472 = sctp_generic_sendmsg */ { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */ + { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = freebsd32_pread */ + { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = freebsd32_pwrite */ + { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = freebsd32_mmap */ + { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = freebsd32_lseek */ + { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ + { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ }; ==== //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.89 2007/06/15 21:54:26 emaste Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -303,11 +303,11 @@ 171 AUE_SHMSYS STD { int freebsd32_shmsys(uint32_t which, uint32_t a2, \ uint32_t a3, uint32_t a4); } 172 AUE_NULL UNIMPL nosys -173 AUE_PREAD STD { ssize_t freebsd32_pread(int fd, void *buf, \ +173 AUE_PREAD COMPAT6 { ssize_t freebsd32_pread(int fd, void *buf, \ size_t nbyte, int pad, \ u_int32_t offsetlo, u_int32_t offsethi); } ; XXX note - bigendian is different -174 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \ +174 AUE_PWRITE COMPAT6 { ssize_t freebsd32_pwrite(int fd, \ const void *buf, size_t nbyte, int pad, \ u_int32_t offsetlo, u_int32_t offsethi); } ; XXX note - bigendian is different @@ -343,22 +343,22 @@ __setrlimit_args int 196 AUE_GETDIRENTRIES NOPROTO { int getdirentries(int fd, char *buf, \ u_int count, long *basep); } -197 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \ +197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(caddr_t addr, \ size_t len, int prot, int flags, int fd, \ int pad, u_int32_t poslo, \ u_int32_t poshi); } 198 AUE_NULL NOPROTO { int nosys(void); } __syscall \ __syscall_args int ; XXX note - bigendian is different -199 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, int pad, \ +199 AUE_LSEEK COMPAT6 { off_t freebsd32_lseek(int fd, int pad, \ u_int32_t offsetlo, u_int32_t offsethi, \ int whence); } ; XXX note - bigendian is different -200 AUE_TRUNCATE STD { int freebsd32_truncate(char *path, \ +200 AUE_TRUNCATE COMPAT6 { int freebsd32_truncate(char *path, \ int pad, u_int32_t lengthlo, \ u_int32_t lengthhi); } ; XXX note - bigendian is different -201 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, int pad, \ +201 AUE_FTRUNCATE COMPAT6 { int freebsd32_ftruncate(int fd, int pad, \ u_int32_t lengthlo, u_int32_t lengthhi); } 202 AUE_SYSCTL STD { int freebsd32_sysctl(int *name, \ u_int namelen, void *old, \ @@ -778,3 +778,19 @@ 474 AUE_NULL NOPROTO { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_PREAD STD { ssize_t freebsd32_pread(int fd, \ + void *buf,size_t nbyte, \ + u_int32_t offsetlo, u_int32_t offsethi); } +476 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \ + const void *buf, size_t nbyte, \ + u_int32_t offsetlo, u_int32_t offsethi); } +477 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \ + size_t len, int prot, int flags, int fd, \ + u_int32_t poslo, u_int32_t poshi); } +478 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, \ + u_int32_t offsetlo, u_int32_t offsethi, \ + int whence); } +479 AUE_TRUNCATE STD { int freebsd32_truncate(char *path, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 9 13:18:05 2007 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 3689316A46C; Mon, 9 Jul 2007 13:18:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 145D116A41F for ; Mon, 9 Jul 2007 13:18:05 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 05C1313C455 for ; Mon, 9 Jul 2007 13:18:05 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69DI4mL047042 for ; Mon, 9 Jul 2007 13:18:04 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69DI4qb047034 for perforce@freebsd.org; Mon, 9 Jul 2007 13:18:04 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 13:18:04 GMT Message-Id: <200707091318.l69DI4qb047034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123201 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, 09 Jul 2007 13:18:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123201 Change 123201 by rpaulo@rpaulo_epsilon on 2007/07/09 13:18:00 dev.asmc.N.light.{left,right} sysctls are read-write, not read-only. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#26 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#26 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#25 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#26 $ * */ @@ -382,13 +382,13 @@ SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), - OID_AUTO, "left", CTLTYPE_INT | CTLFLAG_RD, + OID_AUTO, "left", CTLTYPE_INT | CTLFLAG_RW, dev, 0, model->smc_light_left, "I", "Keyboard backlight left sensor"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), - OID_AUTO, "right", CTLTYPE_INT | CTLFLAG_RD, + OID_AUTO, "right", CTLTYPE_INT | CTLFLAG_RW, dev, 0, model->smc_light_right, "I", "Keyboard backlight right sensor"); } From owner-p4-projects@FreeBSD.ORG Mon Jul 9 13:42:17 2007 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 7AB2716A46B; Mon, 9 Jul 2007 13:42:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 351C916A421 for ; Mon, 9 Jul 2007 13:42:17 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 908CB13C45B for ; Mon, 9 Jul 2007 13:42:16 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 404AC690A8C; Mon, 9 Jul 2007 14:37:06 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 0C467690D59; Mon, 9 Jul 2007 14:37:06 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO autolearn=ham version=3.1.7 Received: from epsilon.local (87-196-81-230.net.novis.pt [87.196.81.230]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 87E37690A8C; Mon, 9 Jul 2007 14:37:05 +0100 (WEST) Message-ID: <46923B2B.9050204@fnop.net> Date: Mon, 09 Jul 2007 14:42:03 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Eric Anderson References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> In-Reply-To: <46923893.5090404@freebsd.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 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, 09 Jul 2007 13:42:17 -0000 Eric Anderson wrote: > Rui Paulo wrote: >> Rui Paulo wrote: >>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>> >>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>> >>> Add support for keyboard backlight control (found on MacBook >>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now created. >>> Setting a value on the "right" or "left" nodes sets the >>> keyboard backlight level. Reading those sysctl nodes, gives >>> the each sensor raw >> >> I did not test this as I don't own a MacBook Pro, but it should work. >> If anyone has a MacBook Pro and is willing to test, it would be much >> appreciated. >> >> Regards. > > > I have one of the newer MacBook Pros - with the LED backlight, etc. I've > been thinking of using bootcamp to also run FreeBSD on this laptop. > > Do you have a wiki, or some info on how to best integrate your P4 tree > on an -CURRENT system? http://wiki.freebsd.org/AppleMacbook To grab my p4 branch just setup your p4 view so that //depot/projects/soc2007/rpaulo-macbook/... matches to something locally. I'm interested in knowing what works and what doesn't on the new MBPs. Regards. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Mon Jul 9 13:47:52 2007 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 2813816A474; Mon, 9 Jul 2007 13:47:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA9F816A46E for ; Mon, 9 Jul 2007 13:47:51 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from ns.trinitel.com (186.161.36.72.static.reverse.layeredtech.com [72.36.161.186]) by mx1.freebsd.org (Postfix) with ESMTP id C086A13C455 for ; Mon, 9 Jul 2007 13:47:49 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from proton.local (209-163-168-124.static.twtelecom.net [209.163.168.124]) (authenticated bits=0) by ns.trinitel.com (8.14.1/8.14.1) with ESMTP id l69DUwmn021237; Mon, 9 Jul 2007 08:30:59 -0500 (CDT) (envelope-from anderson@freebsd.org) Message-ID: <46923893.5090404@freebsd.org> Date: Mon, 09 Jul 2007 08:30:59 -0500 From: Eric Anderson User-Agent: Thunderbird 2.0.0.4 (Macintosh/20070604) MIME-Version: 1.0 To: Rui Paulo References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> In-Reply-To: <46919A1B.8050909@fnop.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on ns.trinitel.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 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, 09 Jul 2007 13:47:52 -0000 Rui Paulo wrote: > Rui Paulo wrote: >> http://perforce.freebsd.org/chv.cgi?CH=123168 >> >> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >> >> Add support for keyboard backlight control (found on MacBook >> Pros). >> dev.asmc.N.light.{left,right} sysctl tree is now created. >> Setting a value on the "right" or "left" nodes sets the >> keyboard backlight level. Reading those sysctl nodes, gives >> the each sensor raw > > I did not test this as I don't own a MacBook Pro, but it should work. > If anyone has a MacBook Pro and is willing to test, it would be much > appreciated. > > Regards. I have one of the newer MacBook Pros - with the LED backlight, etc. I've been thinking of using bootcamp to also run FreeBSD on this laptop. Do you have a wiki, or some info on how to best integrate your P4 tree on an -CURRENT system? Eric From owner-p4-projects@FreeBSD.ORG Mon Jul 9 15:23:40 2007 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 9CA0216A46B; Mon, 9 Jul 2007 15:23:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74B6316A400 for ; Mon, 9 Jul 2007 15:23:40 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 65B6013C447 for ; Mon, 9 Jul 2007 15:23:40 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69FNeJV060155 for ; Mon, 9 Jul 2007 15:23:40 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69FNe4k060152 for perforce@freebsd.org; Mon, 9 Jul 2007 15:23:40 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 15:23:40 GMT Message-Id: <200707091523.l69FNe4k060152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123206 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, 09 Jul 2007 15:23:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123206 Change 123206 by jbr@jbr_bob on 2007/07/09 15:23:25 Fix intial ordering in sysentvec, so the machine will boot. Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#3 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#3 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#2 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#3 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/elf_machdep.c#3 (text+ko) ==== @@ -68,8 +68,8 @@ VM_MAXUSER_ADDRESS, USRSTACK, PS_STRINGS, + 0, VM_PROT_ALL, - 0, exec_copyout_strings, exec_setregs, NULL ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/init_main.c#3 (text+ko) ==== @@ -341,8 +341,8 @@ VM_MAXUSER_ADDRESS, USRSTACK, PS_STRINGS, + 0, VM_PROT_ALL, - 0, NULL, NULL, NULL ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -919,9 +919,9 @@ } /* Allocate memory shared between process and kernel */ - error = vm_map_sysshm(map, sv->sv_minuser); - if (error) - return (error); + error = vm_map_sysshm(map, sv->sv_minuser); + if (error) + return (error); /* Allocate a new stack */ stack_addr = sv->sv_usrstack - maxssiz; ==== //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#2 (text+ko) ==== ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jul 9 16:25:04 2007 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 B714016A46F; Mon, 9 Jul 2007 16:25:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 58CE616A421 for ; Mon, 9 Jul 2007 16:25:04 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 459B013C489 for ; Mon, 9 Jul 2007 16:25:04 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GP4A2067558 for ; Mon, 9 Jul 2007 16:25:04 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GP3Aq067547 for perforce@freebsd.org; Mon, 9 Jul 2007 16:25:03 GMT (envelope-from smilicic@FreeBSD.org) Date: Mon, 9 Jul 2007 16:25:03 GMT Message-Id: <200707091625.l69GP3Aq067547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 123208 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, 09 Jul 2007 16:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123208 Change 123208 by smilicic@tanarri_marilith on 2007/07/09 16:24:02 fixed a bug with putting worker thread to sleep Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#5 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#5 (text+ko) ==== @@ -66,6 +66,7 @@ static int g_log_access(struct g_provider *pp, int dr, int dw, int de); static int g_log_event_sink_init(struct g_log_softc *sc, struct g_log_event_sink *es, void (*func)(void*), char* name); +static void g_log_event_sink_destroy(struct g_log_event_sink *es); static void g_log_worker(void *args); static int g_log_post_event(struct g_log_event_sink *es, u_int type, u_int flags, void* data1, int data2); @@ -167,7 +168,7 @@ /*create geom for log*/ gp = g_new_geomf(mp, "%s.log", prov); - G_LOG_DEBUG(0, "Creating geom %s", gp->name); + G_LOG_DEBUG(0, "Creating geom %s", gp->name); gp->start = g_log_start; gp->spoiled = g_log_orphan; @@ -196,16 +197,19 @@ g_error_provider(pp_log, 0); sc->sc_prov_log = pp_log; - if (g_log_event_sink_init(sc, &sc->sc_events, g_log_worker, "events") !=0) + if (g_log_event_sink_init(sc, &sc->sc_events, g_log_worker, "events") !=0){ *err=4; + g_log_event_sink_destroy(&sc->sc_events); + } /*open file*/ sc->sc_vn = glog_open_file(file, FWRITE | O_TRUNC | O_CREAT); sc->sc_geom_log = gp; - gp->softc = sc; + gp->softc = sc; return gp; } +/*initialize sink thread*/ static int g_log_event_sink_init(struct g_log_softc *sc, struct g_log_event_sink *es, void (*func)(void*), char* name) @@ -222,6 +226,18 @@ return 0; } +/* destroy sink thread */ +static void +g_log_event_sink_destroy(struct g_log_event_sink *es) +{ + g_log_post_event(es, GLOG_EVSTOP, GLOG_FLAG_WAKEUP_SC, NULL, 0); + while (es->worker_thread != NULL) /* wait for the worker thread to die */ + tsleep(&es->worker_thread, PRIBIO, "wrkoff", hz/5); + mtx_destroy(&es->eventq_mtx); + bzero(es, sizeof(*es)); +} + +/*process ctl requests*/ static void g_log_ctlreq(struct gctl_req *req, struct g_class *mp, const char *verb) { @@ -310,32 +326,35 @@ g_log_stop(struct g_geom *gp, int force) { struct g_log_softc *sc; - struct g_provider *pp_disk, *pp_log; + struct g_provider *pp_disk, *pp_log; struct g_consumer *cp_disk; sc=gp->softc; - + g_topology_assert(); if (sc==NULL) - return (ENXIO); - - pp_log = sc->sc_prov_log; + return (ENXIO); + + pp_log = sc->sc_prov_log; pp_disk = sc->sc_prov_disk; cp_disk = sc->sc_cons_disk; - if (pp_log != NULL && (pp_log->acr != 0 || pp_log->acw !=0 || pp_log->ace != 0)){ - if (force) - G_LOG_DEBUG(0, "Device %s is still open.", pp_log->name); - else { - G_LOG_DEBUG(1, "Device %s is still open(r%d, w%d, e%d)", - pp_log->name,pp_log->acr,pp_log->acw,pp_log->ace); - return (EBUSY); - } - } + if (pp_log != NULL && (pp_log->acr != 0 || pp_log->acw !=0 || pp_log->ace != 0)){ + if (force) + G_LOG_DEBUG(0, "Device %s is still open.", pp_log->name); + else { + G_LOG_DEBUG(1, "Device %s is still open(r%d, w%d, e%d)", + pp_log->name,pp_log->acr,pp_log->acw,pp_log->ace); + return (EBUSY); + } + } /*close log file*/ - G_LOG_DEBUG(0, "Closing log file."); + G_LOG_DEBUG(0, "Closing log file."); glog_close_file(sc->sc_vn, FWRITE); + /*destory worker thread*/ + g_log_event_sink_destroy(&sc->sc_events); + /*clean up memory*/ G_LOG_DEBUG(0,"cleaning up mem."); g_orphan_provider(pp_log, ENXIO); @@ -349,12 +368,12 @@ /*destroy geom*/ if (pp_log == NULL || (pp_log->acr == 0 && pp_log->acw == 0 && pp_log->ace == 0)) - G_LOG_DEBUG(0, "Device %s destroyed.", gp->name); - + G_LOG_DEBUG(0, "Device %s destroyed.", gp->name); + g_wither_geom(gp, ENXIO); - G_LOG_DEBUG(0, "Really destroyed %s.", gp->name); - return 0; + G_LOG_DEBUG(0, "Really destroyed %s.", gp->name); + return 0; } static int @@ -387,46 +406,36 @@ err = g_access(cp, dr ,dw, de); if (err == 0) continue; - G_LOG_DEBUG(0, "loop access"); + G_LOG_DEBUG(0, "loop access"); } return err; } -/*puts worker thread to sleep if there's nothing for it to do*/ -static void -g_log_worker_sleep(struct g_log_softc *sc) -{ - if (g_log_no_events(&sc->sc_events)){ - G_LOG_DEBUG(0, "putting worker to sleep"); - tsleep(sc, PRIBIO, "glogidle", hz); - } -} - /*worker thread*/ static void g_log_worker(void *args) { struct g_log_event_sink *es; struct g_log_softc *sc; - struct g_log_event *ev; + struct g_log_event *ev = NULL; struct bio *bp; + es = args; - - if (es == NULL) - panic("No event sink!"); + KASSERT(es != NULL, ("%s: event_sink is null", __func__)); sc = es->sc; - if (sc == NULL) - panic("No softc!"); + KASSERT(sc != NULL, ("%s: softc is null", __func__)); while (1){ - G_LOG_DEBUG(0,"working..."); - ev = g_log_get_event(&sc->sc_events); - while (ev == NULL) - g_log_worker_sleep(sc); + G_LOG_DEBUG(0, "working..."); + if (!g_log_no_events(es)) + ev = g_log_get_event(es); + else + goto sleep; + G_LOG_DEBUG(0, "event: %d", ev->type); bp = ev->data1; switch (ev->type) { case GLOG_EVCOMMIT: - break; + break; case GLOG_EVROLLBACK: break; case GLOG_EVREAD: @@ -437,9 +446,14 @@ break; case GLOG_EVSTOP: break; + default: + G_LOG_DEBUG(0, "unhandled event %d", ev->type); } free(ev,M_GLOG); } +sleep: G_LOG_DEBUG(0, "putting worker to sleep"); + tsleep(es, PRIBIO, "glogidle", hz); + } /* adds event to event queue */ static int @@ -465,7 +479,7 @@ mtx_lock(&es->eventq_mtx); TAILQ_INSERT_TAIL(&es->eventq, ev, linkage); mtx_unlock(&es->eventq_mtx); - + G_LOG_DEBUG (0, "posted event %d", ev->type); if ( (flags & GLOG_FLAG_WAKEUP_SC) != 0){ G_LOG_DEBUG(0, "waking worker"); wakeup(es); @@ -475,30 +489,32 @@ } /*gets next event from event queue*/ -static struct g_log_event* +/*BUG - causes a panic when there are no events*/ +static struct g_log_event * g_log_get_event(struct g_log_event_sink *es) { - struct g_log_softc *sc; - struct g_log_event *ev; + struct g_log_softc *sc; + struct g_log_event *ev; - KASSERT(es != NULL, ("%s: event_sink is null", __func__)); - sc = es->sc; - KASSERT(sc != NULL, ("%s: softc is null", __func__)); - - mtx_lock(&es->eventq_mtx); - ev = TAILQ_FIRST(&es->eventq); - if (ev != NULL) - TAILQ_REMOVE(&es->eventq, ev, linkage); - mtx_unlock(&es->eventq_mtx); - - return ev; + KASSERT(es != NULL, ("%s: event_sink is null", __func__)); + sc = es->sc; + KASSERT(sc != NULL, ("%s: softc is null", __func__)); + if (g_log_no_events(es)) + G_LOG_DEBUG(0, "no events"); + mtx_lock(&es->eventq_mtx); + ev = TAILQ_FIRST(&es->eventq); + if (ev != NULL) + TAILQ_REMOVE(&es->eventq, ev, linkage); + mtx_unlock(&es->eventq_mtx); + + return ev; } /*is the event queue empty?*/ static int g_log_no_events(struct g_log_event_sink *es) { - return TAILQ_EMPTY(&es->eventq); + return TAILQ_EMPTY(&es->eventq); } /*writes data to log file*/ @@ -508,21 +524,19 @@ struct g_log_softc *sc; void *data; int err; - G_LOG_DEBUG(0, "write request"); + G_LOG_DEBUG(0, "write request"); sc = bp->bio_to->geom->softc; data = bp->bio_data; err = glog_write_file(sc->sc_vn, data, sizeof(data), 0); if (err != 0) - G_LOG_DEBUG(0, "write error"); - - + G_LOG_DEBUG(0, "write error"); } -/*reads data*/ +/*reads data from log file and/or disk*/ static void g_log_read(struct bio *bp) { - uprintf("Got a read request."); + G_LOG_DEBUG(0,"Got a read request."); } @@ -551,16 +565,14 @@ static struct g_log_softc * g_log_find(struct g_class *mp, const char *name) { - struct g_geom *gp; + struct g_geom *gp; - G_LOG_DEBUG(DBG_DEBUG, "%s: %s", __func__, name); - LIST_FOREACH(gp, &mp->geom, geom) { - if (strcmp(gp->name, name) == 0) - return (gp->softc); - G_LOG_DEBUG(0, "loop log_find"); - - } - return (NULL); + G_LOG_DEBUG(DBG_DEBUG, "%s: %s", __func__, name); + LIST_FOREACH(gp, &mp->geom, geom) { + if (strcmp(gp->name, name) == 0) + return (gp->softc); + } + return (NULL); } static void @@ -580,11 +592,10 @@ force = gctl_get_paraml(req, "force", sizeof(int)); - sc = g_log_find(mp, prov); - if (sc != NULL) - g_log_stop(sc->sc_geom_log, *force); - else - panic("Softc is null in ctl_destroy!"); + sc = g_log_find(mp, prov); + KASSERT (sc != NULL, ("Softc is null in %s!", __func__)); + g_log_stop(sc->sc_geom_log, *force); + } /*XML*/ static void @@ -612,8 +623,8 @@ G_LOG_DEBUG(0, "error=%d", sc->sc_prov_log->error); sbuf_printf(sb, "\n"); } - - G_LOG_DEBUG(0, "xmldump"); + + G_LOG_DEBUG(0, "xmldump"); } /* Convert verb to number */ @@ -633,3 +644,4 @@ }; DECLARE_GEOM_CLASS(g_log_class, g_log); + From owner-p4-projects@FreeBSD.ORG Mon Jul 9 16:26:06 2007 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 6BD0B16A421; Mon, 9 Jul 2007 16:26:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3091416A400 for ; Mon, 9 Jul 2007 16:26:06 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 203E113C45E for ; Mon, 9 Jul 2007 16:26:06 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GQ6Yc067637 for ; Mon, 9 Jul 2007 16:26:06 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GQ5JR067632 for perforce@freebsd.org; Mon, 9 Jul 2007 16:26:05 GMT (envelope-from taleks@FreeBSD.org) Date: Mon, 9 Jul 2007 16:26:05 GMT Message-Id: <200707091626.l69GQ5JR067632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123209 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, 09 Jul 2007 16:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123209 Change 123209 by taleks@taleks_th on 2007/07/09 16:25:29 all: changed pxe_protocol_call definition (removed unused data parameter), removed PXE_CORE_CHECK, small fixes of text formatting. pxe_buffer: fixed error caused corruption of data pxe_connection: changes in awaiting function in order to handle LAST_ACK state and speedup connection refused detect in handshaking. pxe_dhcp: added definition for www-server option. May be will be used to get address of web-server to work with. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#19 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#15 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#13 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#7 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#10 (text+ko) ==== @@ -116,23 +116,21 @@ /* * pxe_arp_protocol() - process received arp packet, this function is called in style - * of pxe_protocol_call function type, but last two parameters are unused + * of pxe_protocol_call function type, but last parameter is unused * in: * pack - rceived packet data * function - protocal function (will be always PXE_CORE_FRAG) - * data - always NULL * out: * always 0 - we are not interested in storing this packet in pxe_core queue */ int -pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data) +pxe_arp_protocol(PXE_PACKET *pack, uint8_t function) { #ifdef PXE_DEBUG_HELL printf("pxe_arp_protocol() started.\n"); #endif PXE_ARP_PACK_DATA *arp_reply = (PXE_ARP_PACK_DATA *)pack->raw_data; - if (arp_reply->hdr.operation == le2be16(PXE_ARPOP_REQUEST) ) { uint8_t *mac_src = arp_reply->body.src_hwaddr; @@ -208,7 +206,6 @@ if (NULL != kmac) { #ifdef PXE_DEBUG uint8_t *octet = (uint8_t *)&arp_reply->body.src_paddr; -/* uint8_t *mac = arp_reply->body.src_hwaddr; */ printf("MAC of %d.%d.%d.%d already known: %x:%x:%x:%x:%x:%x\n", octet[0], octet[1], octet[2], octet[3], (*kmac)[0], (*kmac)[1], (*kmac)[2], (*kmac)[3], (*kmac)[4], (*kmac)[5] @@ -324,7 +321,6 @@ const MAC_ADDR * pxe_arp_ip4mac(uint32_t ip) { - const MAC_ADDR *res = pxe_arp_table_search(ip); if (res != NULL) ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#7 (text+ko) ==== @@ -37,7 +37,7 @@ const MAC_ADDR *pxe_arp_ip4mac(uint32_t ip); /* protocol handler for received packets */ -int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data); +int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function); /* ARP table statistics */ void pxe_arp_stats(); @@ -49,7 +49,6 @@ /* protocol types */ #define PXE_PTYPE_IP 0x0800 /* IP4 protocol, used in ARP request */ - /* NOTE: here will be realised ARP for Ethernet and IP4 */ typedef struct pxe_arp_packet { uint16_t hwtype; /* hardware type */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#5 (text+ko) ==== @@ -23,7 +23,6 @@ return (0); /* check if possible to place without cycling */ - if (buf->fstart < buf->fend) { /* possible to place without cycling */ pxe_memcpy(from, buf->data + buf->fstart, to_write); @@ -37,23 +36,14 @@ uint16_t part2 = to_write - part1; if (part1) - pxe_memcpy(from, buf->data + buf->fstart, part1); + pxe_memcpy(from, buf->data + buf->fstart, (part1 < to_write) ? part1 : to_write); if (part1 >= to_write) { buf->fstart += to_write; - - if (buf->fstart > buf->bufsize) { - printf("pxe_buffer_write(): internal error! fstart = %d", buf->fstart); - } } else { pxe_memcpy(from + part1, buf->data, part2); buf->fstart = part2; } - -#ifdef PXE_DEBUG_HELL - printf("pxe_buffer_write(): fstart %d, fend %d, bufsize %d\n\tpart1 %d, part2 %d, to_write %d (%d)\n", - buf->fstart, buf->fend, buf->bufsize, part1, part2, to_write, size); -#endif } buf->bufleft -= to_write; @@ -87,13 +77,14 @@ uint16_t bufsize = buf->bufsize; if (fstart <= fend) { /* two cases handling: |*s...e**|, |***se***| */ + /* right part of buffer */ uint16_t part1 = bufsize - fend; /* left part of buffer */ uint16_t part2 = to_read - part1; if (part1 && (to != NULL) ) - pxe_memcpy(buf->data + fend, to, part1); + pxe_memcpy(buf->data + fend, to, (part1 < to_read) ? part1 : to_read); if (part1 >= to_read) { buf->fend += to_read; @@ -153,13 +144,17 @@ if (buffer->data == NULL) return (0); } - buffer->bufsize = size; buffer->bufleft = size; buffer->fstart = 0; buffer->fend = size; - + +#ifdef PXE_DEBUG_HELL + printf("pxe_buffer_memalloc(): buffer 0x%x, data 0x%x.\n", + buffer, buffer->data, buffer->bufleft + ); +#endif return (1); } @@ -176,7 +171,8 @@ if (buffer->data == NULL) { /* already released */ return; } -#ifdef PXE_DEBUG + +#ifdef PXE_DEBUG_HELL printf("pxe_buffer_memfree(): buffer 0x%x, data 0x%x, bufleft: %d.\n", buffer, buffer->data, buffer->bufleft ); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#5 (text+ko) ==== ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#6 (text+ko) ==== @@ -88,24 +88,28 @@ tcp_await(uint8_t function, uint16_t try_number, uint32_t timeout, void *data) { PXE_TCP_WAIT_DATA *wait_data = (PXE_TCP_WAIT_DATA *)data; + PXE_TCP_CONNECTION *conn = wait_data->connection; switch(function) { case PXE_AWAIT_NEWPACKETS: /* check current state with needed to wait for */ - { - PXE_TCP_CONNECTION *conn = wait_data->connection; - if (wait_data->state == conn->state) + + if (wait_data->state <= conn->state) return (PXE_AWAIT_COMPLETED); - /* CLOSED at waiting means connections was breaked */ + /* CLOSED at waiting means connection was breaked */ if (conn->state == PXE_TCP_CLOSED) return (PXE_AWAIT_BREAK); - } - break; + + break; - case PXE_AWAIT_STARTTRY: /* nothing to do */ case PXE_AWAIT_FINISHTRY: + if (conn->state == PXE_TCP_CLOSED) + return (PXE_AWAIT_BREAK); + pxe_resend_check(wait_data->connection); break; + + case PXE_AWAIT_STARTTRY: /* nothing to do */ case PXE_AWAIT_END: default: break; @@ -225,7 +229,6 @@ return (1); } - /* if connection in established state - initiate active close */ if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { printf("pxe_tcp_disconnect(): failed to send FIN.\n"); free_connection(connection); @@ -233,26 +236,32 @@ } /* update sequence number */ connection->next_send += 1; + + PXE_TCP_WAIT_DATA wait_data; + wait_data.connection = connection; - if (connection->state == PXE_TCP_ESTABLISHED) + if (connection->state == PXE_TCP_ESTABLISHED) { + /* active closing by our host */ connection->state = PXE_TCP_FIN_WAIT1; - - connection->state_out = PXE_TCP_FIN; #ifdef PXE_DEBUG printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); #endif - PXE_TCP_WAIT_DATA wait_data; - wait_data.connection = connection; + wait_data.state = PXE_TCP_TIME_WAIT; - wait_data.state = PXE_TCP_TIME_WAIT; - - /* await TIME_WITE state. - * connection will fell in this state in pxe_tcp_callback(), - * TODO: add waiting of LAST_ACK also + } else { /* if connection breaked by remote host */ + wait_data.state = PXE_TCP_LAST_ACK; + } + + connection->state_out = PXE_TCP_FIN; + + + /* awaiting expected state to close connection + * connection will fell in this state in pxe_tcp_callback() */ - if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get to TIME_WAIT state */ + if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get expected state */ + free_connection(connection); - + if (connection->state != PXE_TCP_CLOSED) return (0); } @@ -347,7 +356,6 @@ } /* if we got here, then we need to finish current segment and alloc new segment */ - pxe_memcpy(data + sent_data, segment_data + segment->size, bufleft); segment->size += bufleft; sent_data += bufleft; @@ -501,8 +509,8 @@ PXE_BUFFER *buffer = connection->recv; - /* send ACK ony if we place for one segment at least */ - if (buffer->bufleft < buffer->bufsize / 2) { + /* send ACK ony if we place enough space */ + if (buffer->bufleft < buffer->bufsize / 3) { return (0); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#19 (text+ko) ==== @@ -11,15 +11,12 @@ #include "pxe_ip.h" #include "pxe_isr.h" #include "pxe_mem.h" -#include "pxe_mutex.h" #include "pxe_udp.h" /* PXE API calls here will be made in same way as in pxeboot. * the only difference - installation of isr, that was not needed in pxe.c. */ -/* NOTE: to think about using of this buffers */ -#define PXE_BUFFER_SIZE 0x1000 static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; static uint8_t data_buffer[PXE_BUFFER_SIZE]; static uint8_t exclusive_protocol = 0; @@ -27,14 +24,9 @@ static pxe_t *pxe = NULL; /* !PXE */ static BOOTPLAYER bootplayer; /* PXE Cached information. */ -/* TODO: to think if packets queue must be in pxe_core. - * It seems, it'll be used only by TCP - */ - /* pxe core structures*/ PXE_PACKET core_packet; /* current processing packet */ pxe_protocol_call core_protocol[256]; /* protocol's callback fuctions */ -PXE_MUTEX core_mutex = {0, 0}; /* mutex used in packet allocation */ /* NIC info */ MAC_ADDR nic_mac; /* may be init it also by zero? */ @@ -113,7 +105,6 @@ #ifdef PXE_DEBUG printf("pxe_core_init(): started (pxenv_p = 0x%x, pxe_p = 0x%x).\n", pxenv_p, pxe_p); #endif - int counter = 0; uint8_t checksum = 0; uint8_t *checkptr = NULL; @@ -255,9 +246,9 @@ pxe_set_ip32(PXE_IP_MY, bootplayer.yip); /* nic ip */ pxe_set_ip32(PXE_IP_SERVER, bootplayer.sip); /* boot server ip */ -/* pxe_set_ip32(PXE_IP_NAMESERVER, 0x0100a8c0); /* nameserver ip, default to 192.168.0.1 */ -/* pxe_set_ip32(PXE_IP_GATEWAY, 0x0100a8c0); /* gateway ip, default to 192.168.0.1 */ -/* pxe_set_ip32(PXE_IP_NETMASK, 0x00ffffff); /* gateway ip, default to 255.255.255.0 */ + pxe_set_ip32(PXE_IP_NAMESERVER, 0x0100a8c0); /* nameserver ip, default to 192.168.0.1 */ + pxe_set_ip32(PXE_IP_GATEWAY, 0x0100a8c0); /* gateway ip, default to 192.168.0.1 */ + pxe_set_ip32(PXE_IP_NETMASK, 0x00ffffff); /* gateway ip, default to 255.255.255.0 */ pxe_set_ip32(PXE_IP_BROADCAST, 0xffffffff); /* broadcast address, default to 255.255.255.255 */ /* initing modules */ @@ -395,7 +386,6 @@ int pxe_core_shutdown() { - int i = 1; if (core_packet.data) pxe_free(core_packet.data); @@ -404,7 +394,6 @@ pxe_core_remove_isr(); /* 2. shutdown PXE */ - t_PXENV_UNLOAD_STACK *unload_stack_p = (t_PXENV_UNLOAD_STACK *)scratch_buffer; @@ -462,8 +451,6 @@ int pxe_core_transmit(PXE_PACKET *pack) { - /* NOTE: is all provided data must be in base memory? - */ t_PXENV_UNDI_TRANSMIT *undi_send = (t_PXENV_UNDI_TRANSMIT *)scratch_buffer; @@ -475,11 +462,6 @@ tbd.ImmedLength = pack->data_size; /* packet length */ tbd.Xmit.segment = VTOPSEG(pack->data); /* immediate transmit buffer */ tbd.Xmit.offset = VTOPOFF(pack->data); /* segment & offset */ - -/* tbd.ImmedLength = pack->raw_size; - tbd.Xmit.segment = VTOPSEG(pack->raw_data); - tbd.Xmit.offset = VTOPOFF(pack->raw_data); -*/ tbd.DataBlkCount = 0 ; /* only immediate data */ undi_send->Protocol = pack->protocol; @@ -631,9 +613,9 @@ int protocol = 0; /* protocol */ int received = 0; /* bytes received to buffer */ - int frame_size = 0; /* size of frame */ - int drop_flag = 0; - int processed_packets = 0; + int frame_size = 0; /* size of frame */ + int drop_flag = 0; /* 1 if current packet must be dropped */ + int processed_packets = 0; /* total count of processed packets during call*/ PXE_PACKET *pack=NULL; /* allocated packet */ PXE_PACKET dummy_pack; /* temporary struct, used to mimic @@ -698,9 +680,10 @@ /* sanity check */ if (frame_size < PXE_BUFFER_SIZE) { - pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, +/* pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); -/* pxe_memcpy(PTOV(undi_isr->Frame.segment * 16 + undi_isr->Frame.offset), data_buffer, frame_size); */ + */ + pxe_memcpy(PTOV(undi_isr->Frame.segment * 16 + undi_isr->Frame.offset), data_buffer, frame_size); } else { printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.\n", PXE_BUFFER_SIZE, frame_size); @@ -729,7 +712,7 @@ if (protocol == PXE_PROTOCOL_ARP) { - pxe_arp_protocol(&dummy_pack, PXE_CORE_HANDLE, NULL); + pxe_arp_protocol(&dummy_pack, PXE_CORE_HANDLE); ++processed_packets; /* aasume ARP packet always in one fragment */ @@ -739,11 +722,11 @@ goto packet_start; } - /* TODO: calc ip checksum */ + /* TODO: calc ip checksum */ if ( (!core_protocol[iphdr->protocol]) || (!core_protocol[iphdr->protocol](&dummy_pack, - (buffer_size == frame_size) ? PXE_CORE_HANDLE : PXE_CORE_FRAG, NULL)) ) { + (buffer_size == frame_size) ? PXE_CORE_HANDLE : PXE_CORE_FRAG)) ) { drop_flag = 1; } else { @@ -773,8 +756,11 @@ frame_size = undi_isr->FrameLength; if (frame_size < PXE_BUFFER_SIZE) { - pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, +/* pxe_core_copy( undi_isr->Frame.segment, undi_isr->Frame.offset, VTOPSEG(data_buffer), VTOPOFF(data_buffer), frame_size); + */ + pxe_memcpy(PTOV(undi_isr->Frame.segment * 16 + undi_isr->Frame.offset), + data_buffer, frame_size); } else { printf("pxe_core_recv_packets(): not enough buffer size (%d bytes) for frame size %d bytes.", PXE_BUFFER_SIZE, frame_size); @@ -807,7 +793,7 @@ pack->protocol = protocol; if ( (!core_protocol[iphdr->protocol]) || - (!core_protocol[iphdr->protocol](pack, PXE_CORE_HANDLE, NULL)) ) { + (!core_protocol[iphdr->protocol](pack, PXE_CORE_HANDLE)) ) { /* protocol not interested in it */ pxe_core_drop(pack); } @@ -818,10 +804,6 @@ func = PXENV_UNDI_ISR_IN_GET_NEXT; -/* if (received == buffer_size) - return processed_packets; -*/ - goto packet_start; /* never getting here */ @@ -837,7 +819,7 @@ * 0 - failed * 1 - success */ -int +static int pxe_core_recieve(PXE_PACKET *pack, void *frame_data, size_t frame_size) { @@ -860,7 +842,6 @@ PXE_PACKET * pxe_core_alloc_packet(size_t packet_size) { - int i = 1; /* packet index */ if (core_packet.state == PXE_PACKET_STATE_FREE) { /* packet structure seems to be free */ @@ -874,7 +855,6 @@ pxe_free(core_packet.data); core_packet.raw_data = data; - /* failed to allocate enough memory for packet */ if (data == NULL) { core_packet.data_size = 0; @@ -896,16 +876,6 @@ } /* TODO: think if this function is useful - * commits choosed packet, free used structures - */ -void -pxe_core_commit(PXE_PACKET *pack) -{ - - pack->state = PXE_PACKET_STATE_FREE; -} - -/* TODO: think if this function is useful * drops choosed packet */ void @@ -913,7 +883,7 @@ { ++packets_dropped; - pxe_core_commit(pack); + pack->state = PXE_PACKET_STATE_FREE; } /* pxe_core_register() - registers protocol in protocols table @@ -932,7 +902,7 @@ /* pxe_core_exclusive() - sets protocol exclusive when receiving packets * in: - * proto - IP protocol number + * proto - protocol number (PXE_PROTOCOL_...) * out: * none */ @@ -1001,5 +971,5 @@ time(&secs); - return (secs); + return (secs); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#15 (text+ko) ==== @@ -11,22 +11,18 @@ * contains wrappers for UNDI functions */ -#define PXE_MAX_PACKETS 32 +#define PXE_BUFFER_SIZE 0x1000 #define PXE_PACKET_STATE_FREE 0 #define PXE_PACKET_STATE_USING 1 -#define PXE_PACKET_STATE_RECIEVED 2 -#define PXE_PACKET_STATE_SENT 3 -#define PXE_PACKET_STATE_PENDING 4 -#define PXE_PACKET_STATE_ABORTED 5 - /* size of media header, used in allocating memmory for packet */ #define MEDIAHDR_LEN_ETH 14 +/* packet type: broadcast and directed */ #define PXE_BCAST 1 #define PXE_SINGLE 0 /* - * structure, used in queueing packets in pxe_core + * structure, used to provide information about packet in pxe_core */ typedef struct pxe_packet { @@ -62,9 +58,6 @@ /* sends packet to a network */ int pxe_core_transmit(PXE_PACKET *pack); -/* commits that packet will not be used */ -void pxe_core_commit(PXE_PACKET *pack); - /* allocates buffer for packet */ PXE_PACKET *pxe_core_alloc_packet(size_t packet_size); @@ -77,7 +70,7 @@ /* calls PXE/UNDI API, registers of processor must be filled in with * appropriate values. */ -int pxe_core_call(int func); +static int pxe_core_call(int func); /* copies in real mode from one segment to another. */ void pxe_core_copy(uint16_t seg_from, uint16_t off_from, uint16_t seg_to, uint16_t off_to, uint16_t size); @@ -89,7 +82,7 @@ void pxe_core_remove_isr(); /* stores data in packet */ -int pxe_core_recieve(PXE_PACKET *pack, void *data, size_t size); +static int pxe_core_recieve(PXE_PACKET *pack, void *data, size_t size); /* drops allocated packet, updates drop count */ void pxe_core_drop(PXE_PACKET *pack); @@ -98,10 +91,9 @@ void pxe_core_stats(); #define PXE_CORE_HANDLE 0x0 -#define PXE_CORE_CHECK 0x1 -#define PXE_CORE_FRAG 0x2 -/* protocol callback function type*/ -typedef int (*pxe_protocol_call)(PXE_PACKET *pack, uint8_t function, void *data); +#define PXE_CORE_FRAG 0x1 +/* protocol callback function type */ +typedef int (*pxe_protocol_call)(PXE_PACKET *pack, uint8_t function); /* registers protocol */ void pxe_core_register(uint8_t ip_proto, pxe_protocol_call proc); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#3 (text+ko) ==== @@ -112,7 +112,13 @@ #ifdef PXE_DEBUG printf("domain name: %s\n", (p+1)); #endif - break; + break; + + case PXE_DHCP_OPT_WWW_SERVER: +#ifdef PXE_DEBUG + printf("server ip: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); +#endif + break; default: printf("DHCP option %d is unknown (%d bytes ignored)\n", code, len); break; ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#3 (text+ko) ==== @@ -78,6 +78,7 @@ #define PXE_DHCP_OPT_ID 54 #define PXE_DHCP_OPT_RENEWAL_TIME 58 #define PXE_DHCP_OPT_REBINDING_TIME 59 +#define PXE_DHCP_OPT_WWW_SERVER 72 #define PXE_DHCP_OPT_END 255 /* used in await function */ @@ -103,4 +104,5 @@ /* prints out known DHCP options */ void pxe_dhcp_parse_options(uint8_t *opts, uint16_t max_size, PXE_DHCP_PARSE_RESULT *res); + #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#10 (text+ko) ==== @@ -17,25 +17,20 @@ * in: * pack - packet describing data * function- function, which must be performed - * data - additional data [unused] * out: * always 0 */ int -pxe_icmp_callback(PXE_PACKET *pack, uint8_t function, void *data) +pxe_icmp_callback(PXE_PACKET *pack, uint8_t function) { - /* we don't store icmp packets, so they cannot steal memory * in pxe core packet table */ - if (function == PXE_CORE_CHECK) { - return (0); + if (function == PXE_CORE_FRAG) { + return (1); } - /* PXE_CORE_HANDLE - to handle packet - */ - /* icmp header*/ PXE_IP_HDR *iphdr = (PXE_IP_HDR *)pack->data; size_t iphdr_len = (iphdr->ver_ihl & 0x0f) * 4; @@ -67,7 +62,6 @@ return (0); /* instruct pxe core to drop packet*/ }; - if (icmphdr->type == PXE_ICMP_ECHO_REPLY) { if ( (reply_number != seq_number) && (icmphdr->code != 0)) { @@ -87,12 +81,6 @@ if (pinging.ip == iphdr->src_ip) { -/* uint16_t sum_orig = icmphdr->checksum; - icmphdr->checksum = 0; - uint16_t sum = ~pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR) + data_size); - - printf("checksums: 0x%x %s 0x%x\n", sum_orig, (sum_orig == sum) ? "==" : "!=", sum ); -*/ if (echo_flags) { printf("pxe_ping(): echo reply from %d.%d.%d.%d, seq=%ld ", pinging.octet[0], pinging.octet[1], @@ -107,7 +95,6 @@ /* all we need now is echo reply */ - /* using buffer of recieved packet to avoid additional memory copy operations */ reply_iphdr = (PXE_IP_HDR *)pack->data; @@ -137,7 +124,6 @@ int pxe_icmp_init() { - /* register protocol in pxe_core protocols table. */ pxe_core_register(PXE_ICMP_PROTOCOL, pxe_icmp_callback); @@ -155,11 +141,11 @@ int pxe_ping(PXE_IPADDR *ip, int count, int flags) { + seq_number = 0; last_accepted = 0xffff; echo_flags = flags; - /* creating data storage for packet */ uint8_t data[sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + 32]; @@ -216,7 +202,6 @@ ++scount; break; } - } if ( (last_accepted != seq_number) && flags) ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#10 (text+ko) ==== @@ -134,14 +134,12 @@ gw_ip.octet[0], gw_ip.octet[1], gw_ip.octet[2], gw_ip.octet[3] ); - for ( ; route_index < all_routes; ++route_index) { if ((route_table[route_index].net == net_ip.ip) && (route_table[route_index].gw == gw) && (route_table[route_index].mask == mask)) { - --all_routes; if (route_index == all_routes) @@ -157,7 +155,6 @@ route_table[shift_index].mask == route_table[shift_index + 1].mask; } - return (1); } @@ -262,13 +259,13 @@ const uint8_t *mac = (uint8_t *)pxe_arp_ip4mac(gw); - if (mac != NULL) - printf("%2x:%2x:%2x:%2x:%2x:%2x", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] - ); - } - - printf("\n"); + if (mac != NULL) { + printf("%2x:%2x:%2x:%2x:%2x:%2x", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] + ); + } + } + printf("\n"); } } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#13 (text+ko) ==== @@ -453,18 +453,24 @@ return (-1); } - PXE_SOCKET *sock = &pxe_sockets[socket]; - PXE_FILTER_ENTRY *filter = sock->filter; + PXE_SOCKET *sock = &pxe_sockets[socket]; + PXE_FILTER_ENTRY *filter = sock->filter; + int result = -1; if (filter->protocol == PXE_UDP_PROTOCOL) { - return pxe_udp_write(sock, buf, buflen); + result = pxe_udp_write(sock, buf, buflen); } else if (filter->protocol == PXE_TCP_PROTOCOL) { - return pxe_tcp_write(sock, buf, buflen); - } - printf("pxe_send(): only TCP and UDP sockets are implemented.\n"); + result = pxe_tcp_write(sock, buf, buflen); + + } else { + printf("pxe_send(): only TCP and UDP sockets are implemented.\n"); + } + + if (result > 0) + sock->sent += result; return (-1); } @@ -516,7 +522,7 @@ if (result != 0) break; - if (timer > PXE_SOCKET_TIMEOUT * 1000) + if (timer > PXE_SOCKET_TIMEOUT) break; if (filter->protocol == PXE_TCP_PROTOCOL) { @@ -533,6 +539,9 @@ delay(10000); } + if (result > 0) + sock->recv += result; + return (result); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#11 (text+ko) ==== @@ -12,10 +12,10 @@ #define PXE_DEFAULT_SOCKETS 8 /* default count of waiting queue */ #define PXE_DEFAULT_WAITCOUNT 3 -/* socket timeout when receiving data, in seconds */ -#define PXE_SOCKET_TIMEOUT 30 +/* socket timeout when receiving data, in milliseconds */ +#define PXE_SOCKET_TIMEOUT 30000 /* timeout, after that force connection checking, in milliseconds */ -#define PXE_SOCKET_CHECK_TIMEOUT 200 +#define PXE_SOCKET_CHECK_TIMEOUT 100 /* socket states */ #define PXE_SOCKET_FREE 0x0 /* socket unused and free for allocating */ #define PXE_SOCKET_USED 0x1 /* socket structure used */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#8 (text+ko) ==== @@ -320,7 +320,7 @@ if (tcp_packet->tcphdr.flags & (PXE_TCP_SYN | PXE_TCP_FIN) ) connection->next_recv += 1; -/* printf("tcp_process_7(): ack = %d, seq = %d, seglen = %d\n", +/* printf("tcp_process_7(): seq = %d, ack = %d, seglen = %d\n", connection->next_recv - connection->irs, connection->next_send - connection->iss, seglen ); */ @@ -808,21 +808,17 @@ * in: * pack - packet description * function- function to perform - * data - additional data [unused] * out: * 1 - if packet is fragment and code is interested in it * 0 - if success or error */ int -pxe_tcp_callback(PXE_PACKET *pack, uint8_t function, void *data) +pxe_tcp_callback(PXE_PACKET *pack, uint8_t function) { PXE_TCP_PACKET *tcp_packet = pack->data; PXE_IPADDR from; PXE_IPADDR to; - if (function == PXE_CORE_CHECK) /* informm, we are not using pxe_core queue */ - return (0); - from.ip = tcp_packet->iphdr.src_ip; to.ip = tcp_packet->iphdr.dst_ip; ==== //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#7 (text+ko) ==== @@ -11,21 +11,17 @@ * in: * pack - packet description * function- function to perform - * data - additional data [unused] * out: * 1 - if packet is fragment and code is interested in it * 0 - if success or error */ int -pxe_udp_callback(PXE_PACKET *pack, uint8_t function, void *data) +pxe_udp_callback(PXE_PACKET *pack, uint8_t function) { PXE_UDP_PACKET *udp_packet = pack->data; PXE_IPADDR from; PXE_IPADDR to; - if (function == PXE_CORE_CHECK) /* informm, we are not using pxe_core queue */ - return (0); - from.ip = udp_packet->iphdr.src_ip; to.ip = udp_packet->iphdr.dst_ip; @@ -52,12 +48,8 @@ if (function == PXE_CORE_FRAG) /* informm, we are interested in whole packet*/ return (1); -/* uint16_t buf_free = sock->recv_buffer.bufleft; */ uint16_t data_size = pack->data_size - sizeof(PXE_UDP_PACKET); -/* if (buf_free < data_size) - return (0); -*/ PXE_BUFFER* recv_buffer = &sock->recv_buffer; PXE_UDP_DGRAM udp_dgram; From owner-p4-projects@FreeBSD.ORG Mon Jul 9 16:32:19 2007 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 7AC7616A46B; Mon, 9 Jul 2007 16:32:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 18FBF16A421 for ; Mon, 9 Jul 2007 16:32:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 09E9F13C483 for ; Mon, 9 Jul 2007 16:32:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GWD9v068201 for ; Mon, 9 Jul 2007 16:32:13 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GWDSS068198 for perforce@freebsd.org; Mon, 9 Jul 2007 16:32:13 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 9 Jul 2007 16:32:13 GMT Message-Id: <200707091632.l69GWDSS068198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123210 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, 09 Jul 2007 16:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123210 Change 123210 by rpaulo@rpaulo_epsilon on 2007/07/09 16:31:18 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#13 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.321 2007/07/09 06:20:07 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.322 2007/07/09 14:26:08 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -459,7 +459,7 @@ vendor ARRIS 0x09c1 Arris Interactive vendor ACTIVCARD 0x09c3 ACTIVCARD vendor ACTISYS 0x09c4 ACTiSYS -vendor NOVATEL 0x09d7 Novatel Wireless +vendor NOVATEL2 0x09d7 Novatel Wireless vendor AFOURTECH 0x09da A-FOUR TECH vendor AIMEX 0x09dc AIMEX vendor ADDONICS 0x09df Addonics Technologies @@ -633,7 +633,6 @@ vendor ACEECA 0x4766 Aceeca vendor AVERATEC 0x50c2 Averatec vendor SWEEX 0x5173 Sweex -vendor PROLIFIC2 0x5372 Prolific Technology vendor ONSPEC2 0x55aa OnSpec Electronic Inc. vendor ZINWELL 0x5a57 Zinwell vendor SITECOM 0x6189 Sitecom From owner-p4-projects@FreeBSD.ORG Mon Jul 9 16:44:30 2007 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 184EC16A46B; Mon, 9 Jul 2007 16:44:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C547716A400 for ; Mon, 9 Jul 2007 16:44:29 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B449C13C458 for ; Mon, 9 Jul 2007 16:44:29 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GiTWB069021 for ; Mon, 9 Jul 2007 16:44:29 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GiT3g069018 for perforce@freebsd.org; Mon, 9 Jul 2007 16:44:29 GMT (envelope-from thioretic@FreeBSD.org) Date: Mon, 9 Jul 2007 16:44:29 GMT Message-Id: <200707091644.l69GiT3g069018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123211 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, 09 Jul 2007 16:44:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123211 Change 123211 by thioretic@thioretic on 2007/07/09 16:43:44 TODO: softc, device_set_driver semantics, some functional drivers related (i.e. parents' manipulation (add/remove)) stuff and some cleanups. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#10 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#10 (text+ko) ==== @@ -140,7 +140,8 @@ /* * Details of this device. */ - /*driver_t*/ drv_compat_t driver; /**< current driver to be probed/attached/...*/ + /*driver_t*/ pdrv_compat *driver; /**< current driver to be probed/attached/...*/ + int driver_level; //driver_list_t drivers[DRV_LEVELS]; pdrv_compat_list_t drivers[DRV_LEVELS]; int drv_compat_flags; @@ -355,7 +356,7 @@ SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), OID_AUTO, "%driver", CTLFLAG_RD, dev, DEVICE_SYSCTL_DRIVER, device_sysctl_handler, "A", - "device driver name"); /*TODO*/ + "device drivers names"); /**TODO*/ SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), OID_AUTO, "%location", CTLFLAG_RD, dev, DEVICE_SYSCTL_LOCATION, device_sysctl_handler, "A", @@ -923,7 +924,12 @@ drvc->flags = flags; return (1); } - +/** + * @internal + * @brief Checks driver and returns corresponding driver + * + * @param flags drv_compat flags + */ static int drv_compat_flags2idx (uint32_t flags){ switch (flags & DR_ALLEVELS){ @@ -935,6 +941,15 @@ } } +drv_compat_isfilter (driver_t *driver){ + uint32_t flags; + int level; + + drv_compat_get_flags (driver, &flags); + level = drv_compat_flags2idx (flags); + return((level>DR_LOWEST & leveldrivers)[level]),link){ - if (pdrvl->pdriver->driver==driver) return(TRUE); + if (pdrvl->pdriver->driver == driver) + return(TRUE); } return(FALSE); } @@ -1153,9 +1170,9 @@ */ static devclass_t devclass_find_internal(const char *classname, const char *parentname, - int create, int filter) + int create, int filter) /**TODO*/ { - devclass_t dc; + devclass_t dc, dcp; PDEBUG(("looking for %s", classname)); if (!classname) @@ -1190,13 +1207,19 @@ * device_probe_child() if a device exists for which there is no * suitable driver. */ - if (parentname && dc && !dc->parent && - strcmp(classname, parentname) != 0) { - dc->parent = devclass_find_internal(parentname, 0, FALSE, FALSE); + if (!parentname) + return (dc); + + dcp = devclass_find_internal(parentname, 0, FALSE, FALSE) + + if (dc && !dc->parent && + strcmp(classname, parentname) != 0 && + !filter) { + dc->parent = dcp; } if (filter) { - TAILQ_INSERT_TAIL(&(dc->parent->filters), &dc, link); + TAILQ_INSERT_TAIL(&(dcp->filters), &dc, link); } return (dc); @@ -1242,11 +1265,13 @@ * @param driver the driver to register */ int -devclass_add_driver(devclass_t dc, driver_t *driver) +devclass_add_driver(devclass_t dc, driver_t *driver) /*TODO*/ { driverlink_t dl; int i; uint32_t flags; + int isfilter; + drv_compat_t drvc; PDEBUG(("%s", DRIVERNAME(driver))); @@ -1254,22 +1279,26 @@ if (!dl) return (ENOMEM); + isfilter = drv_compat_isfilter (driver); /* * Compile the driver's methods. Also increase the reference count * so that the class doesn't get freed when the last instance * goes. This means we can safely use static methods and avoids a * double-free in devclass_delete_driver. */ - kobj_class_compile((kobj_class_t) driver); + //kobj_class_compile((kobj_class_t) driver); + + drvc = drv_compat_find_driver (driver); + drvc->topology_ops = kobj_create (drvc->driver, M_BUS, M_NOWAIT|M_ZERO); /* * Make sure the devclass which the driver is implementing exists. */ - if (!drv_compat_get_flags (driver, &flags)){ - /*todo what???*/; - } - devclass_find_internal(driver->name, 0, TRUE, FALSE); + if (isfilter) + devclass_find_internal(driver->name, dc->name, TRUE, TRUE); + else + devclass_find_internal(driver->name, 0, TRUE, FALSE); dl->driver = driver; TAILQ_INSERT_TAIL(&dc->drivers, dl, link); @@ -1278,9 +1307,14 @@ /* * Call BUS_DRIVER_ADDED for any existing busses in this class. */ - for (i = 0; i < dc->maxunit; i++) - if (dc->devices[i]) - BUS_DRIVER_ADDED(dc->devices[i], driver); + if (!isfilter){ + for (i = 0; i < dc->maxunit; i++) + if (dc->devices[i]) + BUS_DRIVER_ADDED(dc->devices[i], driver); + } + else { + devclass_filter2devices(dc, driver); + } bus_data_generation_update(); return (0); @@ -1308,6 +1342,7 @@ device_t dev; int i; int error; + drv_compat_t drvc; PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); @@ -1342,8 +1377,10 @@ if (dc->devices[i]) { dev = dc->devices[i]; if (/*dev->driver == driver*/ - is_device_driver(dev, driver) && !TAILQ_EMPTY(&(dev->parents)) && + is_device_driver(dev, driver) && + !TAILQ_EMPTY(&(dev->parents)) && (TAILQ_FIRST(&(dev->parents)))->device_ptr->devclass == busclass) { + device_set_driver(dev, driver); if ((error = device_detach(dev)) != 0) return (error); device_set_driver(dev, NULL); @@ -1356,8 +1393,11 @@ /* XXX: kobj_mtx */ driver->refs--; - if (driver->refs == 0) - kobj_class_free((kobj_class_t) driver); + if (driver->refs == 0){ + drvc = drv_compat_find_driver (driver); + //kobj_class_free((kobj_class_t) driver); + kobj_delete (drvc->topology_ops, M_BUS); + } bus_data_generation_update(); return (0); @@ -1770,9 +1810,10 @@ * @retval ENOMEM memory allocation failure */ static int -devclass_add_device(devclass_t dc, device_t dev) +devclass_add_device(devclass_t dc, device_t dev) /*TODO*/ { int buflen, error; + drv_compat_t drvc; PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc))); @@ -1792,6 +1833,8 @@ dev->devclass = dc; snprintf(dev->nameunit, buflen, "%s%d", dc->name, dev->unit); + devclass_device2filters (dc, dev); + return (0); } @@ -1808,7 +1851,7 @@ * @retval 0 success */ static int -devclass_delete_device(devclass_t dc, device_t dev) +devclass_delete_device(devclass_t dc, device_t dev) /*TODO*/ { if (!dc || !dev) return (0); @@ -1827,6 +1870,46 @@ return (0); } +static int +filter_probe_and_attach (device_t dev, driver_t *driver){ + drv_compat_t drvc; + int level; + + device_set_driver (dev, dl->driver); + if (DEVICE_PROBE(dev)<=0){ + drvc = dev->driver; + level = drv_compat_flags2idx(drvc->flags); + TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); + } + device_set_driver (dev, NULL); +} + +static void +devclass_device2filters (devclass_t dc, device_t dev){ + pdevclass *pdc; + driver_t *drv; + driverlink_t dl; + + if (TAILQ_EMPTY(&(dc->filters))) return (); + TAILQ_FOREACH (pdc, &(dc->filters), link){ + if (TAILQ_EMPTY(&(pdc->driver_ptr->drivers))) + continue; + TAILQ_FOREACH(dl, &(pdc->driver_ptr->drivers), link){ + filter_probe_and_attach (dev, dl->driver); + } + } +} + +static void +devclass_filter2devices (devclass_t dc, driver_t *filter){ + int i; + + for (i=0, i<=dc->maxunit; i++){ + if ((dc->devices[i]) && + ((dc->devices[i])->state == DS_ALIVE)) + filter_probe_and_attach (dv->devices[i], filter); + } +} /** * @internal * @brief Make a new device and add it as a child of @p parent @@ -2747,13 +2830,31 @@ * @retval ENOMEM a memory allocation failure occurred */ int -device_set_driver(device_t dev, driver_t *driver) +device_set_driver(device_t dev, driver_t *driver) /*TODO*/ { - drv_compat_t drvc; + drv_compat_t drvc; + pdrv_compat *drvctmp; + uint32_t flags; + int level; if (dev->state >= DS_ATTACHED) return (EBUSY); + + drvc = drv_compat_find_driver (driver); + + TAILQ_FOREACH(drvctmp, &(dev->drivers[level]), link){ + if (drvctmp->pdriver == drvc) + break; + } + + if (!drvctmp){ + + } + dev->driver = drvctmp; + dev->driver_level = level; + + /* if (dev->driver == driver) return (0); @@ -2761,13 +2862,7 @@ free(dev->softc, M_BUS_SC); dev->softc = NULL; } - //kobj_delete((kobj_t) dev, 0); - dev->driver = drvc = drv_compat_find_driver (driver); if (driver) { - if (!(drvc->topology_ops = kobj_create (initto, M_BUS, M_NOWAIT|M_ZERO))) - /*todo what??*/; - dev->driver = drvc; - //kobj_init((kobj_t) dev, (kobj_class_t) driver); if (!(dev->flags & DF_EXTERNALSOFTC) && driver->size > 0) { dev->softc = malloc(driver->size, M_BUS_SC, M_NOWAIT | M_ZERO); @@ -2778,8 +2873,6 @@ return (ENOMEM); } } - } /*else { - kobj_init((kobj_t) dev, &null_class); }*/ bus_data_generation_update(); @@ -2889,7 +2982,7 @@ dev->devclass = devclass_find (DRIVERNAME(drvc->driver)); level = drv_compat_flags2idx(drvc->flags); TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); - driver = NULL; + dev->driver = NULL; } dev->state = DS_ATTACHED; devadded(dev); @@ -4273,8 +4366,6 @@ dmd = (struct driver_module_data *)arg; drv_intnl = dmd->dmd_driver; - if (!(drv_intnl->flags & ~(DR_LOWEST | DR_STACKAWARE | DR_TOPMOST))) - bus_devclass = devclass_find_internal(dmd->dmd_busname, 0, TRUE, FALSE); error = 0; switch (what) { @@ -4282,27 +4373,17 @@ if (dmd->dmd_chainevh) error = dmd->dmd_chainevh(mod,what,dmd->dmd_chainarg); - //driver = dmd->dmd_driver; drv_compat_add_driver(drv_intnl); driver = drv_intnl->devops; PDEBUG(("Loading module: driver %s on bus %s", DRIVERNAME(driver), dmd->dmd_busname)); if (!parse_parent_name(dmd->dmd_busname, &parents)) break; - isfilter = drv_intnl->flags & ~(DR_LOWEST | DR_STACKAWARE | DR_TOPMOST); + isfilter = drv_compat_isfilter (driver); while (parents[count]){ - if (isfilter){ - /* if is a filter driver */ - parent_devclass = devclass_find_internal (parents[count], - 0, TRUE, FALSE); - filter_devclass = devclass_find_internal (driver->name, - parent[count], TRUE, TRUE); - error &= devclass_add_driver (filter_devclass, driver); - count++; - } - else{ - error &= devclass_add_driver(parents[count], driver); - } + parent_devclass = devclass_find_internal(parents[count], 0, TRUE, FALSE); + error &= devclass_add_driver (parent_devclass, driver); + count++; } free(parents); if (error) @@ -4330,7 +4411,7 @@ dev = make_device (root_bus, DRIVERNAME(driver), -1/*, driver*/); device_set_driver(dev, driver); /*if (!hasclass)*/ - device_set_devclass(child, dl->driver->name); + device_set_devclass(dev, driver->name); /* Fetch any flags for the device before probing. resource_int_value(dl->driver->name, child->unit, From owner-p4-projects@FreeBSD.ORG Mon Jul 9 16:53:49 2007 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 13E0C16A400; Mon, 9 Jul 2007 16:53:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6B6C816A473 for ; Mon, 9 Jul 2007 16:53:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 52E8513C45B for ; Mon, 9 Jul 2007 16:53:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69GrmlX080325 for ; Mon, 9 Jul 2007 16:53:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69GrlYv080322 for perforce@freebsd.org; Mon, 9 Jul 2007 16:53:47 GMT (envelope-from marcel@freebsd.org) Date: Mon, 9 Jul 2007 16:53:47 GMT Message-Id: <200707091653.l69GrlYv080322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 123213 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, 09 Jul 2007 16:53:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=123213 Change 123213 by marcel@marcel_xcllnt on 2007/07/09 16:53:19 Add hardware watchpoint support. Rough implementation. Affected files ... .. //depot/projects/powerpc/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#2 edit .. //depot/projects/powerpc/contrib/gdb/gdb/ppcfbsd-nat.c#3 edit .. //depot/projects/powerpc/sys/powerpc/include/pcb.h#4 edit .. //depot/projects/powerpc/sys/powerpc/include/reg.h#5 edit .. //depot/projects/powerpc/sys/powerpc/include/spr.h#3 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/genassym.c#5 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#11 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/swtch.S#2 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/trap.c#7 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/vm_machdep.c#7 edit Differences ... ==== //depot/projects/powerpc/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#2 (text+ko) ==== @@ -15,4 +15,22 @@ /* Override child_pid_to_exec_file in 'inftarg.c'. */ #define CHILD_PID_TO_EXEC_FILE +/* + * Hardware watchpoint support. + */ +#define TARGET_HAS_HARDWARE_WATCHPOINTS + +#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \ + ppc_can_use_hwatch(type, cnt, ot) + +#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(addr, len) \ + ppc_region_ok_for_hwatch(addr, len) + +#define target_insert_watchpoint ppc_insert_watchpoint +#define target_remove_watchpoint ppc_remove_watchpoint + +#define HAVE_NONSTEPPABLE_WATCHPOINT 1 + +#define STOPPED_BY_WATCHPOINT(W) ppc_stopped_by_hwatch() + #endif /* NM_FBSD_H */ ==== //depot/projects/powerpc/contrib/gdb/gdb/ppcfbsd-nat.c#3 (text+ko) ==== @@ -160,6 +160,67 @@ ppcfbsd_supply_fpreg (fpregs, -1); } +/* + * hardware watchpoint support. + */ + +int +ppc_can_use_hwatch(int type, int count, int type_used) +{ + + // printf("XXX: %s(%d, %d, %d)\n", __func__, type, count, type_used); + return ((type == bp_hardware_watchpoint && count == 1) ? 1 : 0); +} + +int +ppc_region_ok_for_hwatch(CORE_ADDR addr, int len) +{ + + // printf("XXX: %s(%lld, %d)\n", __func__, addr, len); + return ((addr >> 3 == (addr + len - 1) >> 3) ? 1 : 0); +} + +int +ppc_stopped_by_hwatch(void) +{ + struct dbreg dbreg; + + // printf("XXX: %s(%d)\n", __func__, ws); + if (ptrace(PT_GETDBREGS, PIDGET(inferior_ptid), + (PTRACE_ARG3_TYPE)&dbreg, 0) == -1) + return (0); + if (dbreg.dabr == 0) + return (0); + return ((dbreg.wppc == read_pc()) ? 1 : 0); +} + +int +ppc_insert_watchpoint(CORE_ADDR addr, int len, int type) +{ + struct dbreg dbreg; + + // printf("XXX: %s(%lld, %d, %d)\n", __func__, addr, len, type); + dbreg.dabr = addr & ~7U; + dbreg.dabr |= 0x6; + if (ptrace(PT_SETDBREGS, PIDGET(inferior_ptid), + (PTRACE_ARG3_TYPE)&dbreg, 0) == -1) + return (errno); + return (0); +} + +int +ppc_remove_watchpoint(CORE_ADDR addr, int len, int type) +{ + struct dbreg dbreg; + + // printf("XXX: %s(%lld, %d, %d)\n", __func__, addr, len, type); + dbreg.dabr = 0; + if (ptrace(PT_SETDBREGS, PIDGET(inferior_ptid), + (PTRACE_ARG3_TYPE)&dbreg, 0) == -1) + return (errno); + return (0); +} + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_ppcfbsd_nat (void); ==== //depot/projects/powerpc/sys/powerpc/include/pcb.h#4 (text+ko) ==== @@ -48,7 +48,12 @@ faultbuf *pcb_onfault; /* For use during copyin/copyout */ int pcb_flags; -#define PCB_FPU 1 /* Process had FPU initialized */ +#define PCB_FPU 1 /* Process had FPU initialized */ +#define PCB_DBREGS 2 /* Process had DB registers */ + + register_t pcb_dabr; + register_t pcb_wppc; + struct fpu { double fpr[32]; double fpscr; /* FPSCR stored as double for easier access */ ==== //depot/projects/powerpc/sys/powerpc/include/reg.h#5 (text+ko) ==== @@ -21,7 +21,8 @@ }; struct dbreg { - unsigned long junk; + register_t dabr; + register_t wppc; }; #ifdef _KERNEL ==== //depot/projects/powerpc/sys/powerpc/include/spr.h#3 (text+ko) ==== @@ -404,6 +404,7 @@ #define MSSCR0_EMODE 0x00200000 /* 10: MPX bus mode (read-only) */ #define MSSCR0_ABD 0x00100000 /* 11: address bus driven (read-only) */ #define MSSCR0_MBZ 0x000fffff /* 12-31: must be zero */ +#define SPR_DABRX 0x3f7 /* .6. DABR extension */ #define SPR_DAC2 0x3f7 /* 4.. Data Address Compare 2 */ #define SPR_L2PM 0x3f8 /* .6. L2 Private Memory Control Register */ #define SPR_L2CR 0x3f9 /* .6. L2 Control Register */ ==== //depot/projects/powerpc/sys/powerpc/powerpc/genassym.c#5 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); @@ -134,8 +135,10 @@ ASSYM(PCB_LR, offsetof(struct pcb, pcb_lr)); ASSYM(PCB_USR, offsetof(struct pcb, pcb_usr)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); +ASSYM(PCB_DABR, offsetof(struct pcb, pcb_dabr)); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ASSYM(PCB_FPU, PCB_FPU); +ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); @@ -152,3 +155,5 @@ ASSYM(SF_UC, offsetof(struct sigframe, sf_uc)); ASSYM(MAXCOMLEN, MAXCOMLEN); + +ASSYM(SPR_DABR, SPR_DABR); ==== //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#11 (text+ko) ==== @@ -114,6 +114,7 @@ #include #include #include +#include #include #include @@ -791,6 +792,22 @@ tf->srr0 = entry; tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT; + + /* + * Reset the hardware debug registers if they were in use. + * They won't have any meaning for the newly exec'd process. + */ + if (td->td_pcb->pcb_flags & PCB_DBREGS) { + if (td->td_pcb == PCPU_GET(curpcb)) { + /* + * Clear the debug registers on the running + * CPU, otherwise they will end up affecting + * the next process we switch to. + */ + mtspr(SPR_DABR, 0); + } + } + td->td_pcb->pcb_flags = 0; } @@ -808,8 +825,12 @@ int fill_dbregs(struct thread *td, struct dbreg *dbregs) { - /* No debug registers on PowerPC */ - return (ENOSYS); + int has_dbregs; + + has_dbregs = (td->td_pcb->pcb_flags & PCB_DBREGS) ? 1 : 0; + dbregs->dabr = (has_dbregs) ? td->td_pcb->pcb_dabr : 0; + dbregs->wppc = (has_dbregs) ? td->td_pcb->pcb_wppc : 0; + return (0); } int @@ -841,8 +862,17 @@ int set_dbregs(struct thread *td, struct dbreg *dbregs) { - /* No debug registers on PowerPC */ - return (ENOSYS); + + td->td_pcb->pcb_dabr = dbregs->dabr; + td->td_pcb->pcb_wppc = 0; + if (dbregs->dabr != 0) + td->td_pcb->pcb_flags |= PCB_DBREGS; + else + td->td_pcb->pcb_flags &= ~PCB_DBREGS; + mtspr(SPR_DABRX, 1); + if (td == curthread) + mtspr(SPR_DABR, dbregs->dabr); + return (0); } int ==== //depot/projects/powerpc/sys/powerpc/powerpc/swtch.S#2 (text+ko) ==== @@ -90,7 +90,16 @@ mr %r14,%r3 /* Copy the old thread ptr... */ mr %r15,%r4 /* and the new thread ptr in scratch */ - lwz %r6,PCB_FLAGS(%r5) /* Save FPU context if needed */ + lwz %r6,PCB_FLAGS(%r5) + /* Save and reset the DABR if needed */ + andi. %r16, %r6, PCB_DBREGS + beq .L0 + mfspr %r16, SPR_DABR + stw %r16, PCB_DABR(%r5) + li %r16, 0 + mtspr SPR_DABR, %r16 +.L0: + /* Save FPU context if needed */ andi. %r6, %r6, PCB_FPU beq .L1 bl save_fpu @@ -107,13 +116,18 @@ stw %r17,PC_CURPCB(%r7) lwz %r6, PCB_FLAGS(%r17) /* Restore FPU context if needed */ + andi. %r16, %r6, PCB_DBREGS + beq .L2 + lwz %r16, PCB_DABR(%r17) + mtspr SPR_DABR, %r16 +.L2: andi. %r6, %r6, PCB_FPU - beq .L2 + beq .L3 mr %r3,%r15 /* Pass curthread to enable_fpu */ bl enable_fpu /* thread to restore is in r3 */ -.L2: +.L3: mr %r3,%r17 /* Recover PCB ptr */ lmw %r12,PCB_CONTEXT(%r3) /* Load the non-volatile GP regs */ mr %r2,%r12 ==== //depot/projects/powerpc/sys/powerpc/powerpc/trap.c#7 (text+ko) ==== @@ -176,6 +176,13 @@ break; case EXC_DSI: + if (frame->dsisr & DSISR_DABR) { + td->td_pcb->pcb_wppc = frame->srr0; + frame->dar = td->td_pcb->pcb_dabr & ~7; + sig = SIGTRAP; + break; + } + /* FALLTHROUGH */ case EXC_ISI: sig = trap_pfault(frame, 1); break; ==== //depot/projects/powerpc/sys/powerpc/powerpc/vm_machdep.c#7 (text+ko) ==== @@ -90,6 +90,7 @@ #include #include #include +#include #include @@ -269,6 +270,12 @@ void cpu_thread_exit(struct thread *td) { + + /* Disable any hardware breakpoints. */ + if (td->td_pcb->pcb_flags & PCB_DBREGS) { + mtspr(SPR_DABR, 0); + td->td_pcb->pcb_flags &= ~PCB_DBREGS; + } } void From owner-p4-projects@FreeBSD.ORG Mon Jul 9 17:03:01 2007 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 9727016A474; Mon, 9 Jul 2007 17:03:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7352D16A46E for ; Mon, 9 Jul 2007 17:03:01 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4BB9D13C4B7 for ; Mon, 9 Jul 2007 17:03:01 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69H30HQ081110 for ; Mon, 9 Jul 2007 17:03:00 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69H30s0081107 for perforce@freebsd.org; Mon, 9 Jul 2007 17:03:00 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 9 Jul 2007 17:03:00 GMT Message-Id: <200707091703.l69H30s0081107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123215 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, 09 Jul 2007 17:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123215 Change 123215 by lulf@lulf_carrot on 2007/07/09 17:02:45 - Import initial raid5 test script. Affected files ... .. //depot/projects/soc2007/lulf/testscripts/test_raid5.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 9 17:23:28 2007 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 E169016A46E; Mon, 9 Jul 2007 17:23:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E17716A46B for ; Mon, 9 Jul 2007 17:23:27 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BC46F13C48A for ; Mon, 9 Jul 2007 17:23:26 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69HNQb5083869 for ; Mon, 9 Jul 2007 17:23:26 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69HNQFM083866 for perforce@freebsd.org; Mon, 9 Jul 2007 17:23:26 GMT (envelope-from cnst@FreeBSD.org) Date: Mon, 9 Jul 2007 17:23:26 GMT Message-Id: <200707091723.l69HNQFM083866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 123216 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, 09 Jul 2007 17:23:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123216 Change 123216 by cnst@dale on 2007/07/09 17:23:21 use device_printf where appropriate. Suggested by sam@ and netchild@. Saves about 16 bytes on i386. text data bss dec hex filename 5247 3800 0 9047 2357 lm78.o.orig 5228 3800 0 9028 2344 lm78.o -rw-r--r-- 1 root wheel 29432 Jul 9 13:02 lm78.o.orig -rw-r--r-- 1 root wheel 29416 Jul 9 13:06 lm78.o Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#2 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#3 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78.c,v 1.18 2007/05/26 22:47:39 cnst Exp $ */ @@ -403,8 +403,7 @@ return; if (sensor_task_register(sc, lm_refresh, 8*60 /* 8 minutes */)) { - printf("%s: unable to register update task\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, "unable to register update task\n"); return; } From owner-p4-projects@FreeBSD.ORG Mon Jul 9 17:35:42 2007 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 454EA16A46F; Mon, 9 Jul 2007 17:35:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0532416A46B for ; Mon, 9 Jul 2007 17:35:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D31D613C469 for ; Mon, 9 Jul 2007 17:35:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69HZfN3084769 for ; Mon, 9 Jul 2007 17:35:41 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69HZfsh084766 for perforce@freebsd.org; Mon, 9 Jul 2007 17:35:41 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 9 Jul 2007 17:35:41 GMT Message-Id: <200707091735.l69HZfsh084766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 123217 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, 09 Jul 2007 17:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123217 Change 123217 by gonzo@gonzo_jeeves on 2007/07/09 17:35:07 o Set EXL in status register in exec_setreg to prevent early switch to user mode in cpu_throw. o Get call to exception_restore_registers back. Pointed out by: Neelkanth Natu Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#33 edit .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#13 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#33 (text+ko) ==== @@ -453,6 +453,7 @@ tf->tf_regs[TF_SP] = (register_t)stack; tf->tf_regs[TF_SR] |= MIPS_SR_KSU_USER; tf->tf_regs[TF_SR] |= MIPS_SR_COP_0_BIT; + tf->tf_regs[TF_SR] |= MIPS_SR_EXL; tf->tf_regs[TF_T9] = (register_t)entry; /* Used by PIC code */ } ==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#13 (text+ko) ==== @@ -193,67 +193,7 @@ .set noat lw t3, PC_CURTHREAD(t2) lw k1, TD_FRAME(t3) - - /* - * Load extended registers into some GPRs, and start unrolling - * the trapframe, putting back the extended registers just - * before we need to restore those GPRs. This doesn't do any - * special ordering like the save_registers routine might, - * but it keeps the flow relatively consistent. - */ - lw a1, TF_REG_EPC(k1) - lw a0, TF_REG_MULHI(k1) - lw v1, TF_REG_MULLO(k1) - - lw ra, TF_REG_RA(k1) - lw t9, TF_REG_T9(k1) - lw t8, TF_REG_T8(k1) - lw ta3, TF_REG_TA3(k1) - lw ta2, TF_REG_TA2(k1) - lw ta1, TF_REG_TA1(k1) - lw ta0, TF_REG_TA0(k1) - lw t3, TF_REG_T3(k1) - lw t2, TF_REG_T2(k1) - lw t1, TF_REG_T1(k1) - lw t0, TF_REG_T0(k1) - - lw s0, TF_REG_S0(k1) - lw s1, TF_REG_S1(k1) - lw s2, TF_REG_S2(k1) - lw s3, TF_REG_S3(k1) - lw s4, TF_REG_S4(k1) - lw s5, TF_REG_S5(k1) - lw s6, TF_REG_S6(k1) - lw s7, TF_REG_S7(k1) - lw s8, TF_REG_S8(k1) - - /* - * Brief interlude. - */ - mtc0 a1, MIPS_COP_0_EXC_PC - mthi a0 - mtlo v1 - - /* - * Now restore the registers we used for scratch, and nearby - * GPRs. - */ - lw a3, TF_REG_A3(k1) - lw a2, TF_REG_A2(k1) - lw a1, TF_REG_A1(k1) - lw a0, TF_REG_A0(k1) - lw v1, TF_REG_V1(k1) - lw v0, TF_REG_V0(k1) - lw gp, TF_REG_GP(k1) - lw sp, TF_REG_SP(k1) - - /* - * We are done with the assembler temporary, restore it, and - * return with it disabled, just in case. - */ - .set noat - lw AT, TF_REG_AST(k1) - lw k1, TF_REG_SR(k1) + jal exception_restore_registers + nop eret - mtc0 k1, MIPS_COP_0_STATUS END(fork_trampoline) From owner-p4-projects@FreeBSD.ORG Mon Jul 9 18:08:24 2007 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 16E1416A46F; Mon, 9 Jul 2007 18:08:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E910316A46D for ; Mon, 9 Jul 2007 18:08:23 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D898F13C480 for ; Mon, 9 Jul 2007 18:08:23 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69I8Nqa089874 for ; Mon, 9 Jul 2007 18:08:23 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69I8Nm2089870 for perforce@freebsd.org; Mon, 9 Jul 2007 18:08:23 GMT (envelope-from thioretic@FreeBSD.org) Date: Mon, 9 Jul 2007 18:08:23 GMT Message-Id: <200707091808.l69I8Nm2089870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123220 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, 09 Jul 2007 18:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123220 Change 123220 by thioretic@thioretic on 2007/07/09 18:08:19 TODO: softc, device_set_driver semantics and some cleanups. DONE: unified parents/children manipulation Affected files ... .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#11 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#11 (text+ko) ==== @@ -2038,7 +2038,47 @@ return (device_add_child_ordered(dev, 0, name, unit)); } +static int +device_add_to_dev_list (device_t addwhat, pdevice_list_t *addwhere){ + pdevice *pd; + TAILQ_FOREACH (pd, addwhere, link){ + if (pd->device_ptr == addwhat) + return (1); + } + + pd = malloc(sizeof(struct pdevice), M_BUS, M_NOWAIT|M_ZERO); + if (!pd) + return (0); + + pd->device_ptr = addwhat; + TAILQ_INSERT_TAIL(addwhere, pd, link); + pd->device_ptr->refs++; + + bus_data_generation_update(); + return (1); +} + /** + * @brief Add a new child, which is a device, that already exists + * + * This adds a new parent (if not yet in parents) + */ +int +device_add_existing_child (device_t dev, device_t child){ + device_add_to_dev_list (child, &(dev->children)); +} +/** + * @brief Add a new parent, which is a device, that already exists + * + * This adds a new parent (if not yet in parents) + */ +int +device_add_existing_parent (device_t dev, device_t parent){ + device_add_to_dev_list (parent, &(dev->parents)); +} + + +/** * @brief Create a new device * * This creates a new device and adds it as a child of an existing @@ -2099,72 +2139,105 @@ return (child); } -/** - * @brief Delete a device - * - * This function deletes a device along with all of its children. If - * the device currently has a driver attached to it, the device is - * detached first using device_detach(). - * - * @param dev the parent device - * @param child the device to delete - * - * @retval 0 success - * @retval non-zero a unit error code describing the error - */ -int -device_delete_child(device_t dev, device_t child) /*TODO*/ -{ +#define CHILDREN -1 +#define PARENTS 1 + +static int +destroy_recurse (device_t dev, device_t devtodel, int direction){ int error; - /*device_t*/ pdevice *grandchild; + pdevice *grand; pdevice *pd; + pdevice_list_t *list; PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev))); - child->refs--; - if (child->refs) goto deletefromparent; /* remove children first */ - while ( (grandchild = TAILQ_FIRST(&child->children)) ) { - error = device_delete_child(child, grandchild->device_ptr); + list = (direction == CHILDREN) ? &devtodel->children : &devtodel->parents; + if (--devtodel->refs) goto deleteself; + while ( (grand = TAILQ_FIRST(list)) ) { + error = destroy_recurse(devtodel, grand->device_ptr, direction); if (error) return (error); - free (grandchild); + free (grand); } - if ((error = device_detach(child)) != 0) + if ((error = device_detach(devtodel)) != 0) return (error); - if (child->devclass) - devclass_delete_device(child->devclass, child); + if (devtodel->devclass) + devclass_delete_device(devtodel->devclass, devtodel); deletefromparent: - TAILQ_FOREACH_SAFE(pd, &dev->children, link){ - if (pd->device_ptr == child){ - TAILQ_REMOVE(&dev->children, child, link); + TAILQ_FOREACH_SAFE(pd, list, link){ + if (pd->device_ptr == devtodel){ + TAILQ_REMOVE(list, devtodel, link); free (pd); break; } } - if (child->refs) + if (devtodel->refs) return (0); - TAILQ_REMOVE(&bus_data_devices, child, devlink); - kobj_delete((kobj_t) child, M_BUS); + TAILQ_REMOVE(&bus_data_devices, devtodel, devlink); + kobj_delete((kobj_t) devtodel, M_BUS); bus_data_generation_update(); return (0); } + +void +device_delete_existing_child (device_t dev, device_t child){ + destroy_recurse (dev, child, CHILDREN); +} + +void +device_add_existing_parent (device_t dev, device_t parent){ + destroy_recurse (dev, parent, PARENTS); +} + +/** + * @brief Delete a device + * + * This function deletes a device along with all of its children. If + * the device currently has a driver attached to it, the device is + * detached first using device_detach(). + * + * @param dev the parent device + * @param child the device to delete + * + * @retval 0 success + * @retval non-zero a unit error code describing the error + */ +int +device_delete_child(device_t dev, device_t child) /*TODO*/ +{ + return (destroy_recurse(dev, child, CHILDREN)); +} + static int -is_device_parent (device_t dev, device_t child){ +is_device_relation (device_t dev, device_t tocheck, int direction){ pdevice *dc; - TAILQ_FOREACH (dc, &(child->parents), link){ + pdevice_list_t list; + + list = (direction == CHILDREN) ? &tocheck->parents : &tocheck->children; + TAILQ_FOREACH (dc, list, link){ if (dc->device_ptr == dev) return (TRUE); } return (FALSE); } +static int +is_device_child (device_t dev, device_t child){ + return (is_device_relation(dev, child, CHILDREN)); +} + +static int +is_device_parent (device_t dev, device_t parent){ + return (is_device_relation(dev, parent, PARENTS)); +} + /** - * @brief Find a device given a unit number + * @brief Find a relation device given a unit number * * This is similar to devclass_get_devices() but only searches for * devices which have @p dev as a parent. @@ -2178,31 +2251,43 @@ * NULL if there is no such device */ device_t -device_find_child(device_t dev, const char *classname, int unit) +device_find_relation(device_t dev, const char *classname, int unit, int direction) { devclass_t dc; - device_t child; + device_t relation; dc = devclass_find(classname); if (!dc) return (NULL); if (unit != -1) { - child = devclass_get_device(dc, unit); - if (child && /*child->parent == dev*/ - is_device_parent(dev, child)) - return (child); + relation = devclass_get_device(dc, unit); + if (relation && + ((direction==CHILDREN) ? is_device_child(dev, relation) : + is_device_parent(dev, relation))) + return (relation); } else { for (unit = 0; unit < devclass_get_maxunit(dc); unit++) { - child = devclass_get_device(dc, unit); - if (child && /*child->parent == dev*/ - is_device_parent(dev, child)) - return (child); + relation = devclass_get_device(dc, unit); + if (relation && + ((direction==CHILDREN) ? is_device_child(dev, relation) : + is_device_parent(dev, relation))) + return (relation); } } return (NULL); } +device_t +device_find_child(device_t dev, const char* classname, int unit){ + return (device_find_relation (dev, classname, unit, CHILDREN)); +} + +device_t +device_find_parent(device_t dev, const char* classname, int unit){ + return (device_find_relation (dev, classname, unit, PARENTS)); +} + /** * @internal */ @@ -2403,14 +2488,16 @@ * @retval ENOMEM the array allocation failed */ int -device_get_children(device_t dev, device_t **devlistp, int *devcountp) +device_get_relations(device_t dev, device_t **devlistp, int *devcountp, int direction) { int count; - /*device_t*/ pdevice *child; + /*device_t*/ pdevice *relation; device_t *list; + pdevice_list_t wherelist; + wherelist = (direction == CHILDREN) : &dev->children : &dev->parents; count = 0; - TAILQ_FOREACH(child, &dev->children, link) { + TAILQ_FOREACH(relation, wherelist, link) { count++; } @@ -2419,8 +2506,8 @@ return (ENOMEM); count = 0; - TAILQ_FOREACH(child, &dev->children, link) { - list[count] = child->device_ptr; + TAILQ_FOREACH(relation, wherelist, link) { + list[count] = relation->device_ptr; count++; } @@ -2430,6 +2517,16 @@ return (0); } +int +device_get_children(device_t dev, device_t **devlistp, int *devcountp){ + return (device_get_relations(dev, devlistp, devcountp, CHILDREN)); +} + +int +device_get_all_parents(device_t dev, device_t **devlistp, int *devcountp){ + return (device_get_relations(dev, devlistp, devcountp, PARENTS)); +} + /** * @brief Return the current driver for the device or @c NULL if there * is no driver currently attached From owner-p4-projects@FreeBSD.ORG Mon Jul 9 18:59:27 2007 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 8C07D16A421; Mon, 9 Jul 2007 18:59:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6363B16A46D for ; Mon, 9 Jul 2007 18:59:27 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F7E913C4AE for ; Mon, 9 Jul 2007 18:59:27 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69IxRd5094333 for ; Mon, 9 Jul 2007 18:59:27 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69IxQTL094330 for perforce@freebsd.org; Mon, 9 Jul 2007 18:59:26 GMT (envelope-from chub@FreeBSD.org) Date: Mon, 9 Jul 2007 18:59:26 GMT Message-Id: <200707091859.l69IxQTL094330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123222 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, 09 Jul 2007 18:59:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=123222 Change 123222 by chub@chub-msdosfs on 2007/07/09 18:58:58 Fix a pointer bug in geom/label msdosfs Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#4 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#4 (text+ko) ==== @@ -84,8 +84,8 @@ /* Set the bootsector/boot parameter block to a struct. */ bsp = (union bootsector *)sector0; - pfat_bpb50 = (struct byte_bpb50 *) bsp->bs50.bsBPB; - pfat_bpb710 = (struct byte_bpb710 *) bsp->bs710.bsBPB; + pfat_bpb50 = (struct byte_bpb50 *) &bsp->bs50.bsBPB; + pfat_bpb710 = (struct byte_bpb710 *) &bsp->bs710.bsBPB; /* Check for the FAT boot sector signature. */ if (bsp->bs50.bsBootSectSig0 != BOOTSIG0 || @@ -105,7 +105,7 @@ * and another for FAT32. */ - pfat_extboot = (struct extboot *) bsp->bs50.bsExt; + pfat_extboot = (struct extboot *) &bsp->bs50.bsExt; /* * If the BPB_FATSz16/bpbFATsecs field is not zero and @@ -141,7 +141,7 @@ * and another for FAT32. */ - pfat_extboot = (struct extboot *) bsp->bs710.bsExt; + pfat_extboot = (struct extboot *) &bsp->bs710.bsExt; /* * If the BPB_FATSz32/bpbBigFATsecs field is not zero From owner-p4-projects@FreeBSD.ORG Mon Jul 9 19:22:59 2007 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 4264616A468; Mon, 9 Jul 2007 19:22:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E7FE216A41F for ; Mon, 9 Jul 2007 19:22:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C070A13C44B for ; Mon, 9 Jul 2007 19:22:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69JMwr2097473 for ; Mon, 9 Jul 2007 19:22:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69JMwIp097470 for perforce@freebsd.org; Mon, 9 Jul 2007 19:22:58 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 9 Jul 2007 19:22:58 GMT Message-Id: <200707091922.l69JMwIp097470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 123223 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, 09 Jul 2007 19:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=123223 Change 123223 by kmacy@parmacvm:opentoe_parvm on 2007/07/09 19:22:02 fix build complaint on 32-bit environments Affected files ... .. //depot/projects/opentoe/sys/vm/uma_core.c#5 edit Differences ... ==== //depot/projects/opentoe/sys/vm/uma_core.c#5 (text+ko) ==== @@ -966,7 +966,7 @@ malloc_flags = (wait ? M_WAITOK : M_NOWAIT); return (contigmalloc(bytes, M_DEVBUF, malloc_flags, 0x0ULL, - 0xffffffffffffULL, 1, 0)); + (vm_paddr_t)-1, 1, 0)); } static void From owner-p4-projects@FreeBSD.ORG Mon Jul 9 19:24:01 2007 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 D8FD816A46B; Mon, 9 Jul 2007 19:24:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EF5116A421 for ; Mon, 9 Jul 2007 19:24:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8FB6513C483 for ; Mon, 9 Jul 2007 19:24:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69JO0k5097540 for ; Mon, 9 Jul 2007 19:24:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69JO0YJ097537 for perforce@freebsd.org; Mon, 9 Jul 2007 19:24:00 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 9 Jul 2007 19:24:00 GMT Message-Id: <200707091924.l69JO0YJ097537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 123224 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, 09 Jul 2007 19:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123224 Change 123224 by kmacy@parmacvm:opentoe_parvm on 2007/07/09 19:23:09 add ed to modules build so that networking works under parallels Affected files ... .. //depot/projects/opentoe/sys/i386/conf/GENERIC#8 edit Differences ... ==== //depot/projects/opentoe/sys/i386/conf/GENERIC#8 (text+ko) ==== @@ -25,7 +25,7 @@ #hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="cxgb if_vlan" +makeoptions MODULES_OVERRIDE="cxgb if_vlan linux ed" options SCHED_ULE # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption @@ -149,6 +149,7 @@ # line to enable it (connects to sio, uart and/or ppc drivers): #device puc + # PCI Ethernet NICs. device em # Intel PRO/1000 adapter Gigabit Ethernet Card From owner-p4-projects@FreeBSD.ORG Mon Jul 9 19:39:26 2007 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 B566E16A485; Mon, 9 Jul 2007 19:39:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 898E416A481; Mon, 9 Jul 2007 19:39:26 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 6AB3C13C457; Mon, 9 Jul 2007 19:39:26 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 4D7E61A4D87; Mon, 9 Jul 2007 12:39:26 -0700 (PDT) Date: Mon, 9 Jul 2007 12:39:26 -0700 From: Alfred Perlstein To: Peter Wemm Message-ID: <20070709193926.GF45894@elvis.mu.org> References: <200706302226.l5UMQXfP002249@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706302226.l5UMQXfP002249@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122592 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, 09 Jul 2007 19:39:27 -0000 Peter, why not have libc obtain this at startup and cache it? Otherwise these syscalls will incur an additional sysctl per call, right? -Alfred * Peter Wemm [070630 15:26] wrote: > http://perforce.freebsd.org/chv.cgi?CH=122592 > > Change 122592 by peter@peter_overcee on 2007/06/30 22:25:38 > > Use getosreldate() to test for __new_* syscalls. > > Affected files ... > > .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 edit > .. //depot/projects/hammer/lib/libc/sys/lseek.c#3 edit > .. //depot/projects/hammer/lib/libc/sys/mmap.c#4 edit > .. //depot/projects/hammer/lib/libc/sys/pread.c#3 edit > .. //depot/projects/hammer/lib/libc/sys/pwrite.c#3 edit > .. //depot/projects/hammer/lib/libc/sys/truncate.c#3 edit > > Differences ... > > ==== //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 (text+ko) ==== > > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -47,5 +48,8 @@ > off_t length; > { > > - return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); > + if (getosreldate() >= 700049) > + return(__new_ftruncate(fd, length)); > + else > + return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); > } > > ==== //depot/projects/hammer/lib/libc/sys/lseek.c#3 (text+ko) ==== > > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -47,5 +48,9 @@ > off_t offset; > int whence; > { > - return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); > + > + if (getosreldate() >= 700049) > + return(__new_lseek(fd, offset, whence)); > + else > + return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); > } > > ==== //depot/projects/hammer/lib/libc/sys/mmap.c#4 (text+ko) ==== > > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -52,6 +53,10 @@ > off_t offset; > { > > - return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, > - flags, fd, 0, offset)); > + if (getosreldate() >= 700049) > + return (__new_mmap(addr, len, prot, flags, fd, offset)); > + else > + > + return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, > + flags, fd, 0, offset)); > } > > ==== //depot/projects/hammer/lib/libc/sys/pread.c#3 (text+ko) ==== > > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -48,5 +49,9 @@ > size_t nbyte; > off_t offset; > { > - return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); > + > + if (getosreldate() >= 700049) > + return (__new_pread(fd, buf, nbyte, offset)); > + else > + return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); > } > > ==== //depot/projects/hammer/lib/libc/sys/pwrite.c#3 (text+ko) ==== > > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -48,5 +49,8 @@ > size_t nbyte; > off_t offset; > { > - return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); > + if (getosreldate() >= 700049) > + return (__new_pwrite(fd, buf, nbyte, offset)); > + else > + return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); > } > > ==== //depot/projects/hammer/lib/libc/sys/truncate.c#3 (text+ko) ==== > > @@ -35,8 +35,8 @@ > > #include > #include > - > #include > +#include > > /* > * This function provides 64-bit offset padding that > @@ -48,5 +48,8 @@ > off_t length; > { > > - return(__syscall((quad_t)SYS_truncate, path, 0, length)); > + if (getosreldate() >= 700049) > + return(__new_truncate(path, length)); > + else > + return(__syscall((quad_t)SYS_truncate, path, 0, length)); > } -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Mon Jul 9 20:44:40 2007 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 4947316A46D; Mon, 9 Jul 2007 20:44:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C87316A46B for ; Mon, 9 Jul 2007 20:44:40 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0B69213C4BF for ; Mon, 9 Jul 2007 20:44:40 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69Kidt9006382 for ; Mon, 9 Jul 2007 20:44:39 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69Kida3006379 for perforce@freebsd.org; Mon, 9 Jul 2007 20:44:39 GMT (envelope-from thioretic@FreeBSD.org) Date: Mon, 9 Jul 2007 20:44:39 GMT Message-Id: <200707092044.l69Kida3006379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123226 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, 09 Jul 2007 20:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123226 Change 123226 by thioretic@thioretic on 2007/07/09 20:43:41 TODO: device_set_driver semantics, resource_* and bus_generic_* stuff, some cleanups. DONE: softc semantics. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#11 edit .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#12 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#11 (text+ko) ==== @@ -123,4 +123,13 @@ # } # # here driver_handler & DEVICE_PROBE reside in subr_bus - # driver_probe resides in driver+ # driver_probe resides in driver + a.1.4 Softc + SOLUTION: add softc per driver to device structure + FILE(S) AFFECTED: kern/subr_bus.c + # Added devclass_get_driver_softc(), + # device_get_driver_softc(), + # device_set_driver_softc(). + # All these return softc of a specified driver for a device. Old functions + # (those without '_driver_') return softc of DRV_LOWEST driver (as expected). + ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#12 (text+ko) ==== @@ -83,6 +83,10 @@ struct pdrv_compat { drv_compat_t pdriver; + void *ivars; + void *softc; +#define DF_EXTERNALSOFTC 1 /* softc not allocated by us */ + int flags; TAILQ_ENTRY(pdrv_compat) link; }; @@ -159,7 +163,6 @@ #define DF_DESCMALLOCED 8 /* description was malloced */ #define DF_QUIET 16 /* don't print verbose attach message */ #define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH again */ -#define DF_EXTERNALSOFTC 64 /* softc not allocated by us */ #define DF_REBID 128 /* Can rebid after attach */ u_char order; /**< order from device_add_child_ordered() */ u_char pad; @@ -1557,6 +1560,17 @@ return (device_get_softc(dev)); } +void * +devclass_get_driver_softc (devclass_t dc, int unit, driver_t *driver){ + device_t dev; + + dev = devclass_get_device(dc, unit); + if (!dev) + return (NULL); + + return (device_get_driver_softc(dev, driver)); +} + /** * @brief Get a list of devices in the devclass * @@ -1990,7 +2004,7 @@ } } dev->ivars = NULL; - dev->softc = NULL; +// dev->softc = NULL; TAILQ_INSERT_TAIL(&bus_data_devices, dev, devlink); @@ -2719,9 +2733,29 @@ void * device_get_softc(device_t dev) { - return (dev->softc); + if(!TAILQ_EMPTY(&(dev->drivers[DRV_LOWEST]))) + return (TAILQ_FIRST(&(dev->drivers[DRV_LOWEST]))->softc); + return (NULL); +} + +void * +device_get_driver_softc(device_t dev, driver_t *driver){ + int level; + uint32_t flags; + pdrv_compat *pdrvc; + + if (!drv_compat_get_flags (driver, &flags)) + return (NULL); + level = drv_compat_flags2idx (flags); + + TAILQ_FOREACH (pdrvc, &(dev->drivers[level]), link){ + if (pdrvc->pdriver->driver == driver) + return (pdrvc->softc); + } + return (NULL); } + /** * @brief Set the device's softc field * @@ -2731,13 +2765,43 @@ void device_set_softc(device_t dev, void *softc) { - if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) - free(dev->softc, M_BUS_SC); - dev->softc = softc; - if (dev->softc) - dev->flags |= DF_EXTERNALSOFTC; + void *psoftc; + pdrv_compat *pdrvc; + + if(!TAILQ_EMPTY(&(dev->drivers[DRV_LOWEST]))) + pdrvc = TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])); + if (pdrvc && !(pdrvc->flags & DF_EXTERNALSOFTC)) + free(pdrvc->softc, M_BUS_SC); + pdrvc->softc = softc; + if (pdrvc->softc) + pdrvc->flags |= DF_EXTERNALSOFTC; + else + pdrvc->flags &= ~DF_EXTERNALSOFTC; +} + +void +device_set_driver_softc(device_t dev, driver_t *driver, void* softc){ + int level; + uint32_t flags; + pdrv_compat *pdrvc; + + if (!drv_compat_get_flags (driver, &flags)) + return(); + level = drv_compat_flags2idx (flags); + + TAILQ_FOREACH (pdrvc, &(dev->drivers[level]), link){ + if (pdrvc->pdriver->driver == driver) + break; + } + if (!pdrvc) return(); + + if (!(pdrv->flags & DF_EXTERNALSOFTC)) + free(pdrvc->softc, M_BUS_SC); + pdrvc->softc = softc; + if (pdrvc->softc) + pdrvc->flags |= DF_EXTERNALSOFTC; else - dev->flags &= ~DF_EXTERNALSOFTC; + pdrvc->flags &= ~DF_EXTERNALSOFTC; } /** @@ -4610,7 +4674,7 @@ (dev->flags&DF_DESCMALLOCED? "descmalloced,":""), (dev->flags&DF_REBID? "rebiddable,":""), (dev->ivars? "":"no "), - (dev->softc? "":"no "), + ((TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])))->softc? "":"no "), dev->busy)); } From owner-p4-projects@FreeBSD.ORG Mon Jul 9 20:45:45 2007 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 4218F16A4C2; Mon, 9 Jul 2007 20:45:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F1E116A49A for ; Mon, 9 Jul 2007 20:45:45 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2C8EA13C4C8 for ; Mon, 9 Jul 2007 20:45:43 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69Kjf0u006465 for ; Mon, 9 Jul 2007 20:45:41 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69Kjfnh006462 for perforce@freebsd.org; Mon, 9 Jul 2007 20:45:41 GMT (envelope-from smilicic@FreeBSD.org) Date: Mon, 9 Jul 2007 20:45:41 GMT Message-Id: <200707092045.l69Kjfnh006462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 123227 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, 09 Jul 2007 20:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123227 Change 123227 by smilicic@tanarri_marilith on 2007/07/09 20:45:26 repaired and tested worker thread. also added a function to empty event queue before the geom is stopped. Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#6 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#6 (text+ko) ==== @@ -71,7 +71,6 @@ static int g_log_post_event(struct g_log_event_sink *es, u_int type, u_int flags, void* data1, int data2); static struct g_log_event* g_log_get_event(struct g_log_event_sink *es); -static int g_log_no_events(struct g_log_event_sink *es); static void g_log_write(struct bio *bp); static void g_log_read(struct bio *bp); static void g_log_dumpconf(struct sbuf *sb, const char *indent, @@ -168,7 +167,6 @@ /*create geom for log*/ gp = g_new_geomf(mp, "%s.log", prov); - G_LOG_DEBUG(0, "Creating geom %s", gp->name); gp->start = g_log_start; gp->spoiled = g_log_orphan; @@ -205,7 +203,8 @@ sc->sc_vn = glog_open_file(file, FWRITE | O_TRUNC | O_CREAT); sc->sc_geom_log = gp; gp->softc = sc; - + G_LOG_DEBUG(0, "Created geom %s", gp->name); + return gp; } @@ -255,6 +254,7 @@ prov = gctl_get_asciiparam(req, "arg0"); file = gctl_get_asciiparam(req, "arg1"); gp = g_log_create_geom(prov, file, mp, &err); + if (err != 0){ switch (err){ case 1: @@ -278,7 +278,7 @@ case GCTL_COMMIT: if (*num_arg == 1) { prov = gctl_get_asciiparam(req, "arg0"); - g_log_stop(gp,0); + } else gctl_error(req, "Wrong number of parameters."); @@ -294,6 +294,7 @@ default: panic("Unknown verb!"); } + G_LOG_DEBUG(0, "ctlreq done"); } /*start geom*/ @@ -307,7 +308,8 @@ bp->bio_to->error, bp->bio_to->name)); G_LOG_LOGREQ(DBG_NOTICE, bp, "Request received."); - + g_io_deliver(bp, ENXIO); + return; switch(bp->bio_cmd) { case BIO_WRITE: g_log_post_event(&sc->sc_events, GLOG_EVWRITE, GLOG_FLAG_WAKEUP_SC, bp, 0); @@ -411,6 +413,26 @@ return err; } +/* Empty the worker queue */ +static void +g_log_empty_event_queue(struct g_log_event_sink *es) { + struct g_log_softc *sc; + struct g_log_event *ev; + + KASSERT(es != NULL, ("%s: event_sink is null", __func__)); + sc = es->sc; + KASSERT(sc != NULL, ("%s: softc is null", __func__)); + + mtx_lock(&es->eventq_mtx); + while (!TAILQ_EMPTY(&es->eventq)) { + ev = TAILQ_FIRST(&es->eventq); + TAILQ_REMOVE(&es->eventq, ev, linkage); + free(ev, M_GLOG); + } + mtx_unlock(&es->eventq_mtx); + +} + /*worker thread*/ static void g_log_worker(void *args) @@ -426,8 +448,7 @@ KASSERT(sc != NULL, ("%s: softc is null", __func__)); while (1){ - G_LOG_DEBUG(0, "working..."); - if (!g_log_no_events(es)) + if (!TAILQ_EMPTY(&es->eventq)) ev = g_log_get_event(es); else goto sleep; @@ -445,15 +466,18 @@ g_log_write(bp); break; case GLOG_EVSTOP: + G_LOG_DEBUG(DBG_DEBUG, "Worker thread exiting"); + g_log_empty_event_queue(es); + es->worker_thread = NULL; + kthread_exit(0); break; default: G_LOG_DEBUG(0, "unhandled event %d", ev->type); } free(ev,M_GLOG); +sleep: tsleep(es, PRIBIO, "glogidle", 1000); } -sleep: G_LOG_DEBUG(0, "putting worker to sleep"); - tsleep(es, PRIBIO, "glogidle", hz); - + } /* adds event to event queue */ static int @@ -480,11 +504,8 @@ TAILQ_INSERT_TAIL(&es->eventq, ev, linkage); mtx_unlock(&es->eventq_mtx); G_LOG_DEBUG (0, "posted event %d", ev->type); - if ( (flags & GLOG_FLAG_WAKEUP_SC) != 0){ - G_LOG_DEBUG(0, "waking worker"); + if ( (flags & GLOG_FLAG_WAKEUP_SC) != 0) wakeup(es); - } - return 0; } @@ -499,8 +520,7 @@ KASSERT(es != NULL, ("%s: event_sink is null", __func__)); sc = es->sc; KASSERT(sc != NULL, ("%s: softc is null", __func__)); - if (g_log_no_events(es)) - G_LOG_DEBUG(0, "no events"); + mtx_lock(&es->eventq_mtx); ev = TAILQ_FIRST(&es->eventq); if (ev != NULL) @@ -510,13 +530,6 @@ return ev; } -/*is the event queue empty?*/ -static int -g_log_no_events(struct g_log_event_sink *es) -{ - return TAILQ_EMPTY(&es->eventq); -} - /*writes data to log file*/ static void g_log_write(struct bio *bp) @@ -581,15 +594,15 @@ struct g_log_softc *sc; int *num_args, *force; const char *prov; + g_topology_assert(); - num_args = gctl_get_paraml(req, "nargs", sizeof(int)); if (*num_args != 1){ gctl_error(req, "Wrong number of arguments."); return; } prov = gctl_get_asciiparam(req, "arg0"); - + force = gctl_get_paraml(req, "force", sizeof(int)); sc = g_log_find(mp, prov); @@ -624,7 +637,6 @@ sbuf_printf(sb, "\n"); } - G_LOG_DEBUG(0, "xmldump"); } /* Convert verb to number */ From owner-p4-projects@FreeBSD.ORG Mon Jul 9 20:47:07 2007 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 E0D7116A473; Mon, 9 Jul 2007 20:47:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A547116A400; Mon, 9 Jul 2007 20:47:06 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 1F5D413C4DE; Mon, 9 Jul 2007 20:47:05 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 97332690D5A; Mon, 9 Jul 2007 21:41:54 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 57257690D5D; Mon, 9 Jul 2007 21:41:54 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,FORGED_RCVD_HELO autolearn=ham version=3.1.7 Received: from epsilon.local (62.169.81.27.rev.optimus.pt [62.169.81.27]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 3BC99690D5A; Mon, 9 Jul 2007 21:41:53 +0100 (WEST) Message-ID: <46929EB9.9080804@fnop.net> Date: Mon, 09 Jul 2007 21:46:49 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Eric Anderson References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> In-Reply-To: <46923B2B.9050204@fnop.net> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 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, 09 Jul 2007 20:47:07 -0000 Rui Paulo wrote: > Eric Anderson wrote: >> Rui Paulo wrote: >>> Rui Paulo wrote: >>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>> >>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>> >>>> Add support for keyboard backlight control (found on MacBook >>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now created. >>>> Setting a value on the "right" or "left" nodes sets the >>>> keyboard backlight level. Reading those sysctl nodes, gives >>>> the each sensor raw >>> I did not test this as I don't own a MacBook Pro, but it should work. >>> If anyone has a MacBook Pro and is willing to test, it would be much >>> appreciated. >>> >>> Regards. >> >> I have one of the newer MacBook Pros - with the LED backlight, etc. I've >> been thinking of using bootcamp to also run FreeBSD on this laptop. >> >> Do you have a wiki, or some info on how to best integrate your P4 tree >> on an -CURRENT system? > > http://wiki.freebsd.org/AppleMacbook > > To grab my p4 branch just setup your p4 view so that > //depot/projects/soc2007/rpaulo-macbook/... matches to something locally. > > I'm interested in knowing what works and what doesn't on the new MBPs. Also, the new drivers that you might want include on your kernel config are: msrtemp, backlight (doesn't work on MBPs) and asmc. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Mon Jul 9 20:48:36 2007 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 9F8AC16A46D; Mon, 9 Jul 2007 20:48:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4063A16A421; Mon, 9 Jul 2007 20:48:36 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 2C94713C458; Mon, 9 Jul 2007 20:48:36 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id A3EB51A4D86; Mon, 9 Jul 2007 13:48:35 -0700 (PDT) Date: Mon, 9 Jul 2007 13:48:35 -0700 From: Alfred Perlstein To: Peter Wemm Message-ID: <20070709204835.GG45894@elvis.mu.org> References: <200706302226.l5UMQXfP002249@repoman.freebsd.org> <20070709193926.GF45894@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070709193926.GF45894@elvis.mu.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122592 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, 09 Jul 2007 20:48:37 -0000 * Alfred Perlstein [070709 12:39] wrote: > Peter, why not have libc obtain this at startup and cache it? > > Otherwise these syscalls will incur an additional sysctl per > call, right? duh, saw your later changes... I'm assuming those pretty much address that concern. thanks, -Alfred > > -Alfred > > * Peter Wemm [070630 15:26] wrote: > > http://perforce.freebsd.org/chv.cgi?CH=122592 > > > > Change 122592 by peter@peter_overcee on 2007/06/30 22:25:38 > > > > Use getosreldate() to test for __new_* syscalls. > > > > Affected files ... > > > > .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 edit > > .. //depot/projects/hammer/lib/libc/sys/lseek.c#3 edit > > .. //depot/projects/hammer/lib/libc/sys/mmap.c#4 edit > > .. //depot/projects/hammer/lib/libc/sys/pread.c#3 edit > > .. //depot/projects/hammer/lib/libc/sys/pwrite.c#3 edit > > .. //depot/projects/hammer/lib/libc/sys/truncate.c#3 edit > > > > Differences ... > > > > ==== //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 (text+ko) ==== > > > > @@ -36,6 +36,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -47,5 +48,8 @@ > > off_t length; > > { > > > > - return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); > > + if (getosreldate() >= 700049) > > + return(__new_ftruncate(fd, length)); > > + else > > + return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); > > } > > > > ==== //depot/projects/hammer/lib/libc/sys/lseek.c#3 (text+ko) ==== > > > > @@ -36,6 +36,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -47,5 +48,9 @@ > > off_t offset; > > int whence; > > { > > - return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); > > + > > + if (getosreldate() >= 700049) > > + return(__new_lseek(fd, offset, whence)); > > + else > > + return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); > > } > > > > ==== //depot/projects/hammer/lib/libc/sys/mmap.c#4 (text+ko) ==== > > > > @@ -37,6 +37,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -52,6 +53,10 @@ > > off_t offset; > > { > > > > - return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, > > - flags, fd, 0, offset)); > > + if (getosreldate() >= 700049) > > + return (__new_mmap(addr, len, prot, flags, fd, offset)); > > + else > > + > > + return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, > > + flags, fd, 0, offset)); > > } > > > > ==== //depot/projects/hammer/lib/libc/sys/pread.c#3 (text+ko) ==== > > > > @@ -36,6 +36,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -48,5 +49,9 @@ > > size_t nbyte; > > off_t offset; > > { > > - return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); > > + > > + if (getosreldate() >= 700049) > > + return (__new_pread(fd, buf, nbyte, offset)); > > + else > > + return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); > > } > > > > ==== //depot/projects/hammer/lib/libc/sys/pwrite.c#3 (text+ko) ==== > > > > @@ -36,6 +36,7 @@ > > #include > > #include > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -48,5 +49,8 @@ > > size_t nbyte; > > off_t offset; > > { > > - return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); > > + if (getosreldate() >= 700049) > > + return (__new_pwrite(fd, buf, nbyte, offset)); > > + else > > + return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); > > } > > > > ==== //depot/projects/hammer/lib/libc/sys/truncate.c#3 (text+ko) ==== > > > > @@ -35,8 +35,8 @@ > > > > #include > > #include > > - > > #include > > +#include > > > > /* > > * This function provides 64-bit offset padding that > > @@ -48,5 +48,8 @@ > > off_t length; > > { > > > > - return(__syscall((quad_t)SYS_truncate, path, 0, length)); > > + if (getosreldate() >= 700049) > > + return(__new_truncate(path, length)); > > + else > > + return(__syscall((quad_t)SYS_truncate, path, 0, length)); > > } > > -- > - Alfred Perlstein -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Mon Jul 9 23:09:44 2007 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 81F4016A468; Mon, 9 Jul 2007 23:09:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6024816A400 for ; Mon, 9 Jul 2007 23:09:44 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 513F113C447 for ; Mon, 9 Jul 2007 23:09:44 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69N9i5q029960 for ; Mon, 9 Jul 2007 23:09:44 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69N9hUX029957 for perforce@freebsd.org; Mon, 9 Jul 2007 23:09:43 GMT (envelope-from jbr@FreeBSD.org) Date: Mon, 9 Jul 2007 23:09:43 GMT Message-Id: <200707092309.l69N9hUX029957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123238 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, 09 Jul 2007 23:09:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=123238 Change 123238 by jbr@jbr_bob on 2007/07/09 23:09:37 added sanity checking to vm_mapsysshm, mostly borrowed from vm_map_stack Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#3 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#4 edit .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.h#3 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#3 (text+ko) ==== @@ -919,7 +919,7 @@ } /* Allocate memory shared between process and kernel */ - error = vm_map_sysshm(map, sv->sv_minuser); + error = vm_map_sysshm(map, sv->sv_minuser, 8); if (error) return (error); ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.c#4 (text+ko) ==== @@ -2987,9 +2987,50 @@ * process. */ int -vm_map_sysshm(vm_map_t map, vm_offset_t addr) +vm_map_sysshm(vm_map_t map, vm_offset_t addr, vm_size_t size) { - return (KERN_SUCCESS); + int error = 0; + vm_offset_t osize; + vm_map_entry_t new_entry, prev_entry; + rlim_t vmemlim; + + PROC_LOCK(curthread->td_proc); + vmemlim = lim_cur(curthread->td_proc, RLIMIT_VMEM); + PROC_UNLOCK(curthread->td_proc); + + vm_map_lock(map); + + /* if address is already mapped unlock and return with error */ + if (vm_map_lookup_entry(map, addr, &prev_entry)) { + vm_map_unlock(map); + return (KERN_NO_SPACE); + } + + osize = addr + round_page(size); + + /* check that we are within vmlimit */ + if (map->size + osize > vmemlim) { + vm_map_unlock(map); + return (KERN_NO_SPACE); + } + + error = vm_map_insert(map, NULL, 0, addr, osize, + VM_PROT_EXECUTE, VM_PROT_ALL, MAP_NOFAULT); + + if (error) { + if (prev_entry != &map->header) + vm_map_clip_end(map, prev_entry, addr); + + new_entry = prev_entry->next; + + if (new_entry->end != osize || new_entry->start != addr) + panic("Bad entry start/end for new sysshm"); + + new_entry->avail_ssize = round_page(size) - round_page(size); + } + + vm_map_unlock(map); + return (error); } /* ==== //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_map.h#3 (text+ko) ==== @@ -354,7 +354,7 @@ void vm_map_simplify_entry (vm_map_t, vm_map_entry_t); void vm_init2 (void); int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int); -int vm_map_sysshm(vm_map_t, vm_offset_t); +int vm_map_sysshm(vm_map_t, vm_offset_t, vm_size_t); int vm_map_growstack (struct proc *p, vm_offset_t addr); int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags); From owner-p4-projects@FreeBSD.ORG Mon Jul 9 23:56:45 2007 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 D246716A421; Mon, 9 Jul 2007 23:56:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8718116A400 for ; Mon, 9 Jul 2007 23:56:44 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7865A13C469 for ; Mon, 9 Jul 2007 23:56:44 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l69Nuilj035836 for ; Mon, 9 Jul 2007 23:56:44 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69Nui6D035833 for perforce@freebsd.org; Mon, 9 Jul 2007 23:56:44 GMT (envelope-from mharvan@FreeBSD.org) Date: Mon, 9 Jul 2007 23:56:44 GMT Message-Id: <200707092356.l69Nui6D035833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123241 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, 09 Jul 2007 23:56:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123241 Change 123241 by mharvan@mharvan_twoflower on 2007/07/09 23:56:29 initial version of the ICMP plugin Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#5 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_icmp.c#1 add .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#6 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#5 (text+ko) ==== @@ -1,12 +1,13 @@ +LIBS+= -levent +LIBS+=-L/usr/local/lib # Linux needs -ldl -#LIBS+= -ldl +#LIBS+= -ldl -levent -LIBS=-L/usr/local/lib -levent CFLAGS=-Wall -rdynamic CFLAGS+=-g CFLAGS+=-I/usr/local/include -all: tunneld plugin_tcp.so plugin_udp.so +all: tunneld plugin_tcp.so plugin_udp.so plugin_icmp.so tunneld: tunneld.h tunneld.c tun_dev.c gcc $(CFLAGS) $(LIBS) -o tunneld tunneld.c tun_dev.c @@ -18,8 +19,11 @@ plugin_udp.so: tunneld.h plugin.h plugin_udp.c gcc $(CFLAGS) -shared -o plugin_udp.so plugin_udp.c +plugin_icmp.so: tunneld.h plugin.h plugin_icmp.c + gcc $(CFLAGS) -shared -o plugin_icmp.so plugin_icmp.c + clean: - rm -f tunneld plugin_tcp.so plugin_udp.so *.core + rm -f tunneld plugin_tcp.so plugin_udp.so plugin_icmp.so *.core backup: rsync -a `pwd` meat:backup/ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#6 (text+ko) ==== @@ -421,10 +421,10 @@ system("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); } else { /* FeeBSD */ - //system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); + system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); /* Linux */ - system("ifconfig tun0 mtu 1400 192.168.0.2"); - system("route add 192.168.0.1 tun0"); + //system("ifconfig tun0 mtu 1400 192.168.0.2"); + //system("route add 192.168.0.1 tun0"); } signal(SIGHUP, sigcb); @@ -444,6 +444,8 @@ plugins->name = "tcp_2222"; load_plugin("./plugin_tcp.so"); plugins->name = "tcp_3333"; + load_plugin("./plugin_icmp.so"); + plugins->name = "icmp"; if (server) { /* initialize all plugins */ From owner-p4-projects@FreeBSD.ORG Tue Jul 10 07:28:28 2007 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 D289F16A41F; Tue, 10 Jul 2007 07:28:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 95DBA16A46D for ; Tue, 10 Jul 2007 07:28:27 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 854CC13C458 for ; Tue, 10 Jul 2007 07:28:27 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A7SRvY097221 for ; Tue, 10 Jul 2007 07:28:27 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A7SQ4X097218 for perforce@freebsd.org; Tue, 10 Jul 2007 07:28:26 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 10 Jul 2007 07:28:26 GMT Message-Id: <200707100728.l6A7SQ4X097218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 123249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 07:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123249 Change 123249 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/10 07:27:49 Unify the shell function "system" handling in mactest.c to test MAC commands. Don't know if it is an error that command "ls" need a -l to work with -Z which has not been mentioned in ls's manual page. Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#8 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#8 (text+ko) ==== @@ -62,8 +62,7 @@ enum action { ACTION_KILL, - ACTION_SETFMAC, - ACTION_GETFMAC, + ACTION_SYSTEM, ACTION_OPEN, ACTION_CREATE, ACTION_UNLINK, @@ -106,8 +105,7 @@ static struct syscall_desc syscalls[] = { { "kill", ACTION_KILL, { TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE } }, - { "setfmac", ACTION_SETFMAC, { TYPE_STRING, TYPE_STRING, TYPE_NONE }}, - { "getfmac", ACTION_GETFMAC, { TYPE_STRING, TYPE_NONE }}, + { "system", ACTION_SYSTEM, { TYPE_NONE }}, { "open", ACTION_OPEN, { TYPE_STRING, TYPE_STRING, TYPE_NUMBER | TYPE_OPTIONAL, TYPE_NONE } }, { "create", ACTION_CREATE, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } }, { "unlink", ACTION_UNLINK, { TYPE_STRING, TYPE_NONE } }, @@ -365,6 +363,7 @@ } printf("\n"); } +char * systemargs = 0; static unsigned int call_syscall(struct syscall_desc *scall, char *argv[]) @@ -382,7 +381,20 @@ /* * Verify correctness of the arguments. */ - for (i = 0; i < sizeof(args)/sizeof(args[0]); i++) { + systemargs = malloc(1024); + bzero(systemargs, 1024); + if (scall->sd_action == ACTION_SYSTEM){ + i = 0; + int n = 0; + while (argv[i]) + { + n += sprintf(systemargs+n, "%s ", argv[i]); + i++; + } + + } else { + for (i = 0; i < sizeof(args)/sizeof(args[0]); i++) { + if (scall->sd_args[i] == TYPE_NONE) { if (argv[i] == NULL || strcmp(argv[i], ":") == 0) break; @@ -410,7 +422,9 @@ } } } + } } + /* * Call the given syscall. */ @@ -420,21 +434,10 @@ case ACTION_KILL: rval = kill(NUM(0),NUM(1)); break; - case ACTION_SETFMAC: - { - char shcmd[1024]; - sprintf(shcmd, "setfmac %s %s", STR(0), STR(1)); - rval = system(shcmd); - break; - } - case ACTION_GETFMAC: - { - char shcmd[1024]; - int i = 0; - i = sprintf(shcmd, "getfmac %s", STR(0)); - rval = system(shcmd); - return (i); - } + case ACTION_SYSTEM: + rval = system(systemargs); + free(systemargs); + break; case ACTION_OPEN: flags = str2flags(open_flags, STR(1)); if (flags & O_CREAT) { ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#2 (text+ko) ==== @@ -90,14 +90,22 @@ #destroy old label echo "pid = -2 mac_test_destroy_vnode_label" >> ${mactest_conf} - mactestexpect 0 -m "mls/5(low-high)" -f ${mactest_conf} setfmac "mls/7" ${n0} + mactestexpect 0 -m "mls/5(low-high)" -f ${mactest_conf} system setfmac "mls/7" ${n0} ############################################################# -#caes getfmac command: +#case getfmac command: #It is strange that there are no mac_check respect to get the vnode label echo -n "pid = -2 mac_test_copy_vnode_label with src label:" > ${mactest_conf} echo "biba/high,mls/7" >> ${mactest_conf} - mactestexpect1 "biba/high,mls/7" -f ${mactest_conf} getfmac ${n0} + mactestexpect1 "biba/high,mls/7" -f ${mactest_conf} system getfmac ${n0} + +############################################################# +#case ls -l -Z command: +#Why ls need -l to work with -Z, this is not correspond to the manual page of ls + echo -n "pid = -2 mac_test_copy_vnode_label with src label:" > ${mactest_conf} + echo "biba/high,mls/7" >> ${mactest_conf} + mactestexpect1 "biba/high,mls/7" -f ${mactest_conf} system ls -l -Z ${n0} + #cleanup: cd .. rm -fr ${n1} From owner-p4-projects@FreeBSD.ORG Tue Jul 10 07:41:45 2007 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 2028816A41F; Tue, 10 Jul 2007 07:41:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D0A6916A46B for ; Tue, 10 Jul 2007 07:41:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BFB1B13C45A for ; Tue, 10 Jul 2007 07:41:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A7fih8002331 for ; Tue, 10 Jul 2007 07:41:44 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A7fijX002328 for perforce@freebsd.org; Tue, 10 Jul 2007 07:41:44 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 10 Jul 2007 07:41:44 GMT Message-Id: <200707100741.l6A7fijX002328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 123251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 07:41:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123251 Change 123251 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/10 07:41:12 include to get rid of gcc warning when compiling mactest Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#2 (text+ko) ==== @@ -71,6 +71,7 @@ #include #include #include + #include #include #include #include @@ -110,11 +111,11 @@ #endif #ifndef YYSTYPE -#line 33 "mactestparser.y" +#line 34 "mactestparser.y" typedef union {long itype; char * namestring; struct mactestlog_record * mtpipetype; struct labelstrings * lstype; struct modes_or_flags * mftype;} yystype; -/* Line 193 of /usr/local/share/bison/yacc.c. */ -#line 118 "mactestparser.tab.c" +/* Line 188 of /usr/local/share/bison/yacc.c. */ +#line 119 "mactestparser.tab.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -135,7 +136,7 @@ /* Line 213 of /usr/local/share/bison/yacc.c. */ -#line 139 "mactestparser.tab.c" +#line 140 "mactestparser.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -309,9 +310,9 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned char yyrline[] = { - 0, 52, 52, 54, 58, 60, 61, 64, 66, 68, - 70, 73, 75, 76, 79, 81, 82, 85, 89, 91, - 92, 95, 98, 101 + 0, 53, 53, 55, 59, 61, 62, 65, 67, 69, + 71, 74, 76, 77, 80, 82, 83, 86, 90, 92, + 93, 96, 99, 102 }; #endif @@ -969,79 +970,79 @@ switch (yyn) { case 4: -#line 59 "mactestparser.y" +#line 60 "mactestparser.y" {inserttail_mactestlog_record_chain(yyvsp[0].mtpipetype);} break; case 5: -#line 60 "mactestparser.y" +#line 61 "mactestparser.y" {inserttail_mactestlog_record_chain(yyvsp[0].mtpipetype);} break; case 7: -#line 65 "mactestparser.y" +#line 66 "mactestparser.y" {yyval.mtpipetype = new_mactestlog_record(strdup(yyvsp[-1].namestring), yyvsp[-2].itype);} break; case 8: -#line 66 "mactestparser.y" +#line 67 "mactestparser.y" { yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-3].itype);stringsave = 0;} break; case 9: -#line 68 "mactestparser.y" +#line 69 "mactestparser.y" { yyval.mtpipetype = new_mactestlog_record(stringsave, yyvsp[-3].itype);stringsave = 0;} break; case 10: -#line 70 "mactestparser.y" +#line 71 "mactestparser.y" {yyval.mtpipetype = 0;} break; case 11: -#line 74 "mactestparser.y" +#line 75 "mactestparser.y" {stringsave = strdup(yyvsp[0].namestring);} break; case 12: -#line 75 "mactestparser.y" +#line 76 "mactestparser.y" {} break; case 14: -#line 80 "mactestparser.y" +#line 81 "mactestparser.y" { new_labelstrings(strdup(yyvsp[0].namestring));} break; case 15: -#line 81 "mactestparser.y" +#line 82 "mactestparser.y" { new_labelstrings(strdup(yyvsp[0].namestring));} break; case 18: -#line 90 "mactestparser.y" +#line 91 "mactestparser.y" { new_modes_or_flags(strdup(yyvsp[0].namestring));} break; case 19: -#line 91 "mactestparser.y" +#line 92 "mactestparser.y" { new_modes_or_flags(strdup(yyvsp[0].namestring));} break; case 21: -#line 96 "mactestparser.y" +#line 97 "mactestparser.y" {} break; case 22: -#line 99 "mactestparser.y" +#line 100 "mactestparser.y" {} break; case 23: -#line 102 "mactestparser.y" +#line 103 "mactestparser.y" {} break; @@ -1049,7 +1050,7 @@ } /* Line 1016 of /usr/local/share/bison/yacc.c. */ -#line 1053 "mactestparser.tab.c" +#line 1054 "mactestparser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -1268,7 +1269,7 @@ } -#line 107 "mactestparser.y" +#line 108 "mactestparser.y" int @@ -1525,3 +1526,4 @@ } */ + ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#3 (text+ko) ==== @@ -3,6 +3,7 @@ #include #include #include + #include #include #include #include @@ -358,4 +359,4 @@ return 0; } -*/+*/ From owner-p4-projects@FreeBSD.ORG Tue Jul 10 08:24:39 2007 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 878E816A421; Tue, 10 Jul 2007 08:24:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 365B916A400 for ; Tue, 10 Jul 2007 08:24:39 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2583613C489 for ; Tue, 10 Jul 2007 08:24:39 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A8Odmw024650 for ; Tue, 10 Jul 2007 08:24:39 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A8OcJ5024647 for perforce@freebsd.org; Tue, 10 Jul 2007 08:24:38 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 10 Jul 2007 08:24:38 GMT Message-Id: <200707100824.l6A8OcJ5024647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 08:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=123255 Change 123255 by gcooper@optimus-revised_pkgtools on 2007/07/10 08:23:57 A new try at buffering the +CONTENTS file, which hopes to increase the speed of the file read to 1.5+ times faster than the functions current speed at optimum speed. Still needs to be tested, then later run through the simple profiler scripts and compared to previous versions function versions. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#4 (text+ko) ==== @@ -28,7 +28,8 @@ #include #include -#if SIMPLE_PROF_TRY +#define BUFFER_TRY 1 + int run_generic_plist_prof(char *fn_name, ...) { @@ -113,21 +114,17 @@ return ret_code; } -#endif /* Add an item to a packing list */ void add_plist(Package *p, plist_t type, const char *arg) { -#if SIMPLE_PROF_TRY run_generic_plist_prof("add_plist", p, type, arg); } void add_plist_np(Package *p, plist_t type, const char *arg) { -#endif - PackingList tmp; tmp = new_plist_entry(); @@ -159,14 +156,12 @@ void add_plist_top(Package *p, plist_t type, const char *arg) { -#if SIMPLE_PROF_TRY run_generic_plist_prof("add_plist_top", p, type, arg); } void add_plist_top_np(Package *p, plist_t type, const char *arg) { -#endif PackingList tmp; tmp = new_plist_entry(); @@ -287,7 +282,6 @@ int plist_cmd(const char *s, char **arg) { -#if SIMPLE_PROF_TRY return run_generic_plist_prof("plist_cmd", s, arg); } @@ -298,8 +292,6 @@ int plist_cmd_np(const char *s, char **arg) { -#endif - char cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */ char *cp; const char *sp; @@ -371,15 +363,134 @@ void read_plist(Package *pkg, FILE *fp) { -#if SIMPLE_PROF_TRY run_generic_plist_prof("read_plist", pkg, fp); } +void +read_plist_np_revised(Package *pkg, FILE *fp) +{ + + struct stat contents_stat; + + char *plines; + char *pline; + char *cp; + + int cmd; + + int i = 0; + + pkg->fmtver_maj = 1; + pkg->fmtver_mnr = 0; + pkg->origin = NULL; + + if(fstat( fileno(fp), &contents_stat )) { + err(-1, "Could not fstat +CONTENTS file"); + } + + assert(contents_stat.st_size != 0); + + plines = (char*) malloc(contents_stat.st_size); + + for(i = 0; !feof(fp) && i <= contents_stat.st_size; i++) + *(plines+i) = fgetc(fp); + + /* Avoid strangely crafted files with zero-length, but non-zero size */ + assert(i != 0); + + *(plines+i) = '\0'; + + pline = strtok(plines, "\n"); + + if(trim_end_whitespace(pline)) { + + int major, minor; + + cp = pline; + + cmd = plist_cmd(pline, &cp); + + if (cmd == FAIL) { + warnx("%s: unknown command '%s' (package tools out of date?)", + __func__, cp); + } + + else if (*cp == '\0') { + cp = NULL; + } + + else if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", + &major, &minor) == 2) { + pkg->fmtver_maj = major; + pkg->fmtver_mnr = minor; + + /* + * If the version is greater than the version major.minor, we + * have a compatibility problem.. + */ + if (0 < verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR)) { + warnx("plist format revision (%d.%d) is higher than supported" + "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, + PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); + + if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { + cleanup(0); + exit(2); + } + + } + + } + + } + + /* Now let's iterate through the lines and parse the commands */ + while( NULL != (pline = strtok(NULL, "\n")) ) { + + if(trim_end_whitespace(pline)) { + + if (*pline != CMD_CHAR) + cmd = PLIST_FILE; + + else { + + cp = pline; + + cmd = plist_cmd(pline, &cp); + + if (cmd == FAIL) { + warnx("%s: unknown command '%s' (package tools out of date?)", + __func__, cp); + } else if (*cp == '\0') { + cp = NULL; + } + + add_plist(pkg, cmd, cp); + + } + + } + + } + + +} + +int +trim_end_whitespace(char * str) +{ + int len; + + for(len = strlen(str); len && isspace(*(str+len)); len--) + *(str+len) = '\0'; + + return len; +} + /* Read a packing list from a file */ void read_plist_np(Package *pkg, FILE *fp) { -#endif #if BUFFER_TRY @@ -483,7 +594,6 @@ void write_plist(Package *pkg, FILE *fp) { -#if SIMPLE_PROF_TRY run_generic_plist_prof("write_plist", pkg, fp); } @@ -491,8 +601,6 @@ void write_plist_np(Package *pkg, FILE *fp) { -#endif - PackingList plist = pkg->head; while (plist) { @@ -591,7 +699,6 @@ int delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) { -#if SIMPLE_PROF_TRY return run_generic_plist_prof("delete_package", ign_err, nukedirs, pkg); } @@ -604,8 +711,6 @@ int delete_package_np(Boolean ign_err, Boolean nukedirs, Package *pkg) { -#endif - PackingList p; const char *Where = ".", *last_file = ""; Boolean fail = SUCCESS; @@ -734,7 +839,6 @@ int delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) { -#if SIMPLE_PROF_TRY return run_generic_plist_prof("delete_hierarchy", dir, ign_err, nukedirs); } @@ -742,8 +846,6 @@ int delete_hierarchy_np(const char *dir, Boolean ign_err, Boolean nukedirs) { -#endif - char *cp1, *cp2; cp1 = cp2 = strdup(dir); From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:30:34 2007 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 29C8716A46B; Tue, 10 Jul 2007 09:30:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C98B316A478 for ; Tue, 10 Jul 2007 09:30:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B3E9C13C46A for ; Tue, 10 Jul 2007 09:30:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9UWHZ039005 for ; Tue, 10 Jul 2007 09:30:32 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9UWEm039000 for perforce@freebsd.org; Tue, 10 Jul 2007 09:30:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 09:30:32 GMT Message-Id: <200707100930.l6A9UWEm039000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:30:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=123257 Change 123257 by rdivacky@rdivacky_witten on 2007/07/10 09:27:31 Branch off -current for epoll/inotify work. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/float.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/param.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/help.common#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/README.quirks#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/00READ#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/TODO#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/cnode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/opensolaris/sys/vnode.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:38:44 2007 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 5E9F816A421; Tue, 10 Jul 2007 09:38:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 31A5D16A41F for ; Tue, 10 Jul 2007 09:38:44 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 095C313C455 for ; Tue, 10 Jul 2007 09:38:44 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9ch5a039650 for ; Tue, 10 Jul 2007 09:38:43 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9chLL039647 for perforce@freebsd.org; Tue, 10 Jul 2007 09:38:43 GMT (envelope-from delphij@freebsd.org) Date: Tue, 10 Jul 2007 09:38:43 GMT Message-Id: <200707100938.l6A9chLL039647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=123259 Change 123259 by delphij@delphij_odin on 2007/07/10 09:37:50 Patch gcc (we should import a new version, though) to fix a bug found in optimizer. Obtained from: gcc svn Affected files ... .. //depot/projects/delphij_fork/contrib/gcc/tree-ssa-loop-niter.c#2 edit Differences ... ==== //depot/projects/delphij_fork/contrib/gcc/tree-ssa-loop-niter.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:40:48 2007 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 A4A6416A421; Tue, 10 Jul 2007 09:40:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2347A16A400 for ; Tue, 10 Jul 2007 09:40:48 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 12CA313C448 for ; Tue, 10 Jul 2007 09:40:48 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9eliF040233 for ; Tue, 10 Jul 2007 09:40:47 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9el1D040230 for perforce@freebsd.org; Tue, 10 Jul 2007 09:40:47 GMT (envelope-from mharvan@FreeBSD.org) Date: Tue, 10 Jul 2007 09:40:47 GMT Message-Id: <200707100940.l6A9el1D040230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:40:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=123260 Change 123260 by mharvan@mharvan_twoflower on 2007/07/10 09:39:53 use #ifdef to run the proper ifconfig commands on FreeBSD and Linux Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#7 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#7 (text+ko) ==== @@ -418,13 +418,19 @@ /* setup the tun interface */ if (server) { - system("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); + #ifdef __FreeBSD__ + ssystem("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); + #endif + } else { /* FeeBSD */ - system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); + #ifdef __FreeBSD__ + ssystem("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); + #else /* Linux */ - //system("ifconfig tun0 mtu 1400 192.168.0.2"); - //system("route add 192.168.0.1 tun0"); + ssystem("ifconfig tun0 mtu 1400 192.168.0.2"); + ssystem("route add 192.168.0.1 tun0"); + #endif } signal(SIGHUP, sigcb); From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:41:50 2007 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 2CC3B16A469; Tue, 10 Jul 2007 09:41:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E240816A421 for ; Tue, 10 Jul 2007 09:41:49 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D141E13C455 for ; Tue, 10 Jul 2007 09:41:49 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9fnMm040448 for ; Tue, 10 Jul 2007 09:41:49 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9fnTl040443 for perforce@freebsd.org; Tue, 10 Jul 2007 09:41:49 GMT (envelope-from delphij@freebsd.org) Date: Tue, 10 Jul 2007 09:41:49 GMT Message-Id: <200707100941.l6A9fnTl040443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123261 Change 123261 by delphij@delphij_odin on 2007/07/10 09:40:59 Actually commit the previous change. I have committed from wrong tree :-( Affected files ... .. //depot/projects/delphij_fork/contrib/gcc/tree-ssa-loop-niter.c#3 edit Differences ... ==== //depot/projects/delphij_fork/contrib/gcc/tree-ssa-loop-niter.c#3 (text+ko) ==== @@ -1747,6 +1747,12 @@ { bb = bbs[i]; + /* If BB is not executed in each iteration of the loop, we cannot + use the operations in it to infer reliable upper bound on the + # of iterations of the loop. */ + if (!dominated_by_p (CDI_DOMINATORS, loop->latch, bb)) + continue; + for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) { tree stmt = bsi_stmt (bsi); From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:42:53 2007 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 E427E16A46B; Tue, 10 Jul 2007 09:42:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5DE116A468 for ; Tue, 10 Jul 2007 09:42:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A3FC613C459 for ; Tue, 10 Jul 2007 09:42:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9gq3B040510 for ; Tue, 10 Jul 2007 09:42:52 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9gqbg040507 for perforce@freebsd.org; Tue, 10 Jul 2007 09:42:52 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 09:42:52 GMT Message-Id: <200707100942.l6A9gqbg040507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=123262 Change 123262 by rdivacky@rdivacky_witten on 2007/07/10 09:42:03 Prototype for epoll_create syscall. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_dummy.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_dummy.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_proto.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_syscall.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysent.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/syscalls.master#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -65,7 +65,6 @@ DUMMY(fadvise64); DUMMY(ptrace); DUMMY(lookup_dcookie); -DUMMY(epoll_create); DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ @@ -747,7 +747,7 @@ register_t dummy; }; struct linux_epoll_create_args { - register_t dummy; + char size_l_[PADL_(int)]; int size; char size_r_[PADR_(int)]; }; struct linux_epoll_ctl_args { register_t dummy; @@ -1172,6 +1172,13 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD6 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.31 2007/03/30 00:08:21 jkim Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.28 2007/03/30 00:06:21 jkim Exp */ @@ -274,7 +274,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ + { AS(linux_epoll_create_args), (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -420,7 +420,7 @@ 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } -254 AUE_NULL STD { int linux_epoll_create(void); } +254 AUE_NULL STD { int linux_epoll_create(int size); } 255 AUE_NULL STD { int linux_epoll_ctl(void); } 256 AUE_NULL STD { int linux_epoll_wait(void); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_dummy.c#2 (text+ko) ==== @@ -67,7 +67,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(lookup_dcookie); -DUMMY(epoll_create); DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -747,7 +747,7 @@ register_t dummy; }; struct linux_epoll_create_args { - register_t dummy; + char size_l_[PADL_(int)]; int size; char size_r_[PADR_(int)]; }; struct linux_epoll_ctl_args { register_t dummy; @@ -1192,6 +1192,13 @@ #endif /* COMPAT_FREEBSD4 */ + +#ifdef COMPAT_FREEBSD6 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD6 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.85 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.92 2007/03/29 02:11:46 julian Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.86 2007/02/15 00:54:40 jkim Exp + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.87 2007/03/29 02:11:46 julian Exp */ #include @@ -273,7 +273,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ + { AS(linux_epoll_create_args), (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/syscalls.master#2 (text+ko) ==== @@ -422,7 +422,7 @@ 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } -254 AUE_NULL STD { int linux_epoll_create(void); } +254 AUE_NULL STD { int linux_epoll_create(int size); } 255 AUE_NULL STD { int linux_epoll_ctl(void); } 256 AUE_NULL STD { int linux_epoll_wait(void); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:44:56 2007 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 4F64F16A475; Tue, 10 Jul 2007 09:44:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 24F0A16A46F for ; Tue, 10 Jul 2007 09:44:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EFD3813C44B for ; Tue, 10 Jul 2007 09:44:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9it51040842 for ; Tue, 10 Jul 2007 09:44:55 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9itNh040839 for perforce@freebsd.org; Tue, 10 Jul 2007 09:44:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 09:44:55 GMT Message-Id: <200707100944.l6A9itNh040839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123263 Change 123263 by rdivacky@rdivacky_witten on 2007/07/10 09:44:26 Add dummy epoll files. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#1 add .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jul 10 09:53:06 2007 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 B3A8216A46D; Tue, 10 Jul 2007 09:53:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 847F416A400 for ; Tue, 10 Jul 2007 09:53:06 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72D1713C44B for ; Tue, 10 Jul 2007 09:53:06 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6A9r6eD041392 for ; Tue, 10 Jul 2007 09:53:06 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6A9r60V041389 for perforce@freebsd.org; Tue, 10 Jul 2007 09:53:06 GMT (envelope-from dongmei@FreeBSD.org) Date: Tue, 10 Jul 2007 09:53:06 GMT Message-Id: <200707100953.l6A9r60V041389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 123264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 09:53:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=123264 Change 123264 by dongmei@dongmei-soc2007-home on 2007/07/10 09:52:52 complete the function parse the record into tree view Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.c#3 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.h#3 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#2 edit Differences ... ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.c#3 (text+ko) ==== @@ -1,718 +1,2420 @@ -/* Tree View/Tree Store - * - * The GtkTreeStore is used to store data in tree form, to be - * used later on by a GtkTreeView to display it. This demo builds - * a simple GtkTreeStore and displays it. If you're new to the - * GtkTreeView widgets and associates, look into the GtkListStore - * example first. - * - */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include "../tfile.h" - -static GtkWidget *window = NULL; -GtkTreeStore *record_tree; - -/* columns */ -enum -{ - TOKEN_DETAIL_COLUMN = 0, - NUM_COLUMNS -}; - -static GtkTreeModel * -create_model (void) -{ - /* create tree store */ - record_tree= gtk_tree_store_new (NUM_COLUMNS, - G_TYPE_STRING); - - return GTK_TREE_MODEL (record_tree); -} -/* - * Prints a single byte in the given format. - */ -static void -sprint_1_byte(gchar **str, u_char val, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+50); - g_sprintf(*str,"%s:%u\0",label,val); -} - -/* - * Print 2 bytes in the given format. - */ -static void -sprint_2_bytes(gchar **str, u_int16_t val, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+50); - g_sprintf(str,"%s:%u\0",label,val); -} - -/* - * Prints 4 bytes in the given format. - */ -static void -sprint_4_bytes(gchar **str, u_int32_t val, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+50); - g_sprintf(*str,"%s:%u\0",label,val); -} - -/* - * Prints 8 bytes in the given format. - */ -static void -sprint_8_bytes(gchar **str, u_int64_t val, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+50); - g_sprintf(*str,"%s:%llu\0",label,val); -} - -/* - * Prints the given size of data bytes in hex. - */ -static void -sprint_mem(gchar **str, u_char *data, size_t len) -{ - *str=(gchar *)malloc(len+1); - int i; - - if (len > 0) { - g_sprintf(*str, "0x"); - for (i = 0; i < len; i++) - g_sprintf(*str, "%x", data[i]); - } -} - -/* - * Prints the given data bytes as a string. - */ -static void -sprint_string(gchar **dstr, const char *sstr, size_t len, const gchar *label) -{ - int i; - *dstr=(gchar *)malloc(len+1+sizeof(label)); - g_sprintf(dstr,"%s:",label); - if (len > 0) { - for (i = 0; i < len; i++) { - if (sstr[i] != '\0') - g_sprintf(*dstr, "%c", sstr[i]); - } - } -} -/* - * Prints seconds in the ctime format. - */ -static void -sprint_sec32(gchar **str, u_int32_t sec, const gchar *label) -{ - time_t timestamp; - char timestr[26]; - *str=(gchar *)malloc(sizeof(label)+1+26); - timestamp = (time_t)sec; - ctime_r(×tamp, timestr); - timestr[24] = '\0'; /* No new line */ - g_sprintf(*str,"%s:%s",label,timestr); -} - -/* - * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we - * assume a 32-bit time_t, we simply truncate for now. - */ -static void -sprint_sec64(gchar **str, u_int64_t sec,const gchar *label) -{ - time_t timestamp; - char timestr[26]; - *str=(gchar *)malloc(sizeof(label)+1+26); - timestamp = (time_t)sec; - ctime_r(×tamp, timestr); - timestr[24] = '\0'; /* No new line */ - g_sprintf(*str,"%s:%s",label,timestr); -} - -/* - * Prints the excess milliseconds. - */ -static void -sprint_msec32(gchar **str, u_int32_t msec, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+1+50); - g_sprintf(*str,"%s:+ %u msec",label,msec); -} - -/* - * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we assume - * a 32-bit msec, we simply truncate for now. - */ -static void -sprint_msec64(gchar **str, u_int64_t msec, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+1+50); - msec &= 0xffffffff; - g_sprintf(*str,"%s:+ %u msec",label,(u_int32_t)msec); -} -#define IP_V4_ADDRESS_LEN 20 -#define IP_V6_ADDRESS_LEN 25 -/* - * Prints a dotted form for the IP address. - */ -static void -sprint_ip_address(gchar **str, u_int32_t ip,const gchar *label) -{ - struct in_addr ipaddr; - *str=(gchar *)malloc(sizeof(label)+1+IP_V4_ADDRESS_LEN); - ipaddr.s_addr = ip; - g_sprintf(*str,"%s:%s",label,inet_ntoa(ipaddr)); -} - -/* - * Prints a string value for the given ip address. - */ -static void -sprint_ip_ex_address(gchar **str, u_int32_t type, u_int32_t *ipaddr,const gchar *label) -{ - struct in_addr ipv4; - struct in6_addr ipv6; - char dst[INET6_ADDRSTRLEN]; - *str=(gchar *)malloc(sizeof(label)+1+IP_V6_ADDRESS_LEN); - - switch (type) { - case AU_IPv4: - ipv4.s_addr = (in_addr_t)(ipaddr[0]); - g_sprintf(*str,"%s:%s",label,inet_ntop(AF_INET, &ipv4, dst, - INET6_ADDRSTRLEN)); - break; - - case AU_IPv6: - bcopy(ipaddr, &ipv6, sizeof(ipv6)); - g_sprintf(*str, "%s:%s",label, inet_ntop(AF_INET6, &ipv6, dst, - INET6_ADDRSTRLEN)); - break; - - default: - g_sprintf(*str, "%s:invalid",label); - } -} -#define RETVAL_MAX_LEN 128 -/* - * Prints return value as success or failure. - */ -static void -sprint_retval(gchar **str, u_char status, const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+1+RETVAL_MAX_LEN); - - if (status == 0) - g_sprintf(*str, "%s:success",label); - else - g_sprintf(*str, "%s:failure : %s",label, strerror(status)); -} - -/* - * Prints the exit value. - */ -static void -sprint_errval(gchar **str, u_int32_t val,const gchar *label) -{ - *str=(gchar *)malloc(sizeof(label)+1+RETVAL_MAX_LEN); - g_sprintf(*str, "%s:Error %u",label, val); -} - -/* - * Prints IPC type. - */ -static void -sprint_ipctype(gchar **str, u_char type, const gchar *label) -{ - if (type == AT_IPC_MSG) - g_sprintf(*str, "%s:Message IPC",label); - else if (type == AT_IPC_SEM) - g_sprintf(*str, "%s:Semaphore IPC",label); - else if (type == AT_IPC_SHM) - g_sprintf(*str, "%s:Shared Memory IPC",label); - else - g_sprintf(*str, "%s:%u", label,type); -} - -/* - * Prints the event from the header token in either the short, default or raw - * form. - */ -static void -sprint_event(gchar **event_name, u_int16_t ev,const gchar *label) -{ - char event_ent_name[AU_EVENT_NAME_MAX]; - char event_ent_desc[AU_EVENT_DESC_MAX]; - struct au_event_ent e, *ep; - *event_name=(gchar *)malloc(sizeof(label)+1+AU_EVENT_NAME_MAX); - bzero(&e, sizeof(e)); - bzero(event_ent_name, sizeof(event_ent_name)); - bzero(event_ent_desc, sizeof(event_ent_desc)); - e.ae_name = event_ent_name; - e.ae_desc = event_ent_desc; - - ep = getauevnum_r(&e, ev); - if (ep == NULL) { - g_sprintf(*event_name, "%s:%u", label, ev); - return; - } - g_sprintf(*event_name, "%s:%s",label,e.ae_name); -} - -void -parse_header32_tok(tokenstr_t *tok) -{ - GtkTreeIter iter; - GtkTreeIter child_iter; - - gtk_tree_store_append (record_tree, &iter, NULL); - gtk_tree_store_set (record_tree, &iter, - TOKEN_DETAIL_COLUMN, "header token", - -1); - /*version*/ - gchar *str; - sprint_1_byte(&str,tok->tt.hdr32.version,"version"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - -} -void -parse_header32_ex_tok(tokenstr_t *tok) -{ - GtkTreeIter iter; - GtkTreeIter child_iter; - - gtk_tree_store_append (record_tree, &iter, NULL); - gtk_tree_store_set (record_tree, &iter, - TOKEN_DETAIL_COLUMN, "header token", - -1); - /*version*/ - gchar *str; - sprint_1_byte(&str,tok->tt.hdr32.version,"version"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - /*event*/ - sprint_event(&str,tok->tt.hdr32.e_type,"event"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - - /*modifier*/ - sprint_2_bytes(&str,tok->tt.hdr32.e_mod,"modifier"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - - /*time*/ - sprint_sec32(&str, tok->tt.hdr32.s, "time"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - /*msec*/ - sprint_msec32(&str, tok->tt.hdr32.ms,"msec"); - gtk_tree_store_append (record_tree, &child_iter, &iter); - gtk_tree_store_set (record_tree, &child_iter, - TOKEN_DETAIL_COLUMN,str, - -1); - free(str); - -} -void -parse_header64_tok(tokenstr_t *tok) -{ -} -void -parse_header64_ex_tok(tokenstr_t *tok) -{ -} -void -parse_trailer_tok(tokenstr_t *tok) -{ -} -void -parse_arg32_tok(tokenstr_t *tok) -{ -} -void -parse_arg64_tok(tokenstr_t *tok) -{ -} -void -parse_arb_tok(tokenstr_t *tok) -{ -} -void -parse_atrr32_tok(tokenstr_t *tok) -{ -} -void -parse_attr64_tok(tokenstr_t *tok) -{ -} -void -parse_exit_tok(tokenstr_t *tok) -{ -} -void -parse_execarg_tok(tokenstr_t *tok) -{ -} -void -parse_execenv_tok(tokenstr_t *tok) -{ -} -void -parse_file_tok(tokenstr_t *tok) -{ -} -void -parse_newgroups_tok(tokenstr_t *tok) -{ -} -void -parse_inaddr_tok(tokenstr_t *tok) -{ -} -void -parse_inaddr_ex_tok(tokenstr_t *tok) -{ -} -void -parse_ip_tok(tokenstr_t *tok) -{ -} -void -parse_ipc_tok(tokenstr_t *tok) -{ -} -void -parse_ipcperm_tok(tokenstr_t *tok) -{ -} -void -parse_iport_tok(tokenstr_t *tok) -{ -} -void -parse_opaque_tok(tokenstr_t *tok) -{ -} -void -parse_path_tok(tokenstr_t *tok) -{ -} -void -parse_process32_tok(tokenstr_t *tok) -{ -} -void -parse_process32ex_tok(tokenstr_t *tok) -{ -} -void -parse_process64ex_tok(tokenstr_t *tok) -{ -} -void -parse_return32_tok(tokenstr_t *tok) -{ -} -void -parse_return64_tok(tokenstr_t *tok) -{ -} -void -parse_seq_tok(tokenstr_t *tok) -{ -} -void -parse_socket_tok(tokenstr_t *tok) -{ -} -void -parse_soc_inet32_tok(tokenstr_t *tok) -{ -} -void -parse_sock_unix_tok(tokenstr_t *tok) -{ -} -void -parse_subject32_tok(tokenstr_t *tok) -{ -} -void -parse_subject64_tok(tokenstr_t *tok) -{ -} -void -parse_subject32ex_tok(tokenstr_t *tok) -{ -} -void -parse_subject64ex_tok(tokenstr_t *tok) -{ -} -void -parse_text_tok(tokenstr_t *tok) -{ -} -void -parse_socketex32_tok(tokenstr_t *tok) -{ -} -void -parse_zonename_tok(tokenstr_t *tok) -{ -} -void -parse_invalid_tok(tokenstr_t *tok) -{ -} - -static void -add_columns (GtkTreeView *treeview) -{ - gint col_offset; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkTreeModel *model = gtk_tree_view_get_model (treeview); - - /* column for holiday names */ - renderer = gtk_cell_renderer_text_new (); - g_object_set (renderer, "xalign", 0.0, NULL); - - col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), - -1, "Token Detail", - renderer, "text", - TOKEN_DETAIL_COLUMN, - NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1); - gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE); - -} - -GtkWidget * -create_tree () -{ - GtkWidget *treeview; - GtkTreeModel *model; - - /* create model */ - model = create_model (); - - /* create tree view */ - treeview = gtk_tree_view_new_with_model (model); - g_object_unref (model); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); - gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), - GTK_SELECTION_MULTIPLE); - - add_columns (GTK_TREE_VIEW (treeview)); - return treeview; -} - -/* parse record data to tree view*/ -void -parse_token_tree(record_data *rdata) -{ - gint bytesread=0; - tokenstr_t tok; - int reclen=rdata->record_len; - while (bytesread < reclen) { - /* Is this an incomplete record? */ - if (-1 == au_fetch_tok(&tok, rdata->buf + bytesread, - reclen - bytesread)) - break; - /* add the token detail to tree */ - switch(tok.id) { - case AUT_HEADER32: - parse_header32_tok(&tok); - return; - - case AUT_HEADER32_EX: - parse_header32_ex_tok(&tok); - return; - -/* case AUT_HEADER64: - print_header64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_HEADER64_EX: - print_header64_ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_TRAILER: - print_trailer_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_ARG32: - print_arg32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_ARG64: - print_arg64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_DATA: - print_arb_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_ATTR32: - print_attr32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_ATTR64: - print_attr64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_EXIT: - print_exit_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_EXEC_ARGS: - print_execarg_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_EXEC_ENV: - print_execenv_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_OTHER_FILE32: - print_file_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_NEWGROUPS: - print_newgroups_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IN_ADDR: - print_inaddr_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IN_ADDR_EX: - print_inaddr_ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IP: - print_ip_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IPC: - print_ipc_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IPC_PERM: - print_ipcperm_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_IPORT: - print_iport_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_OPAQUE: - print_opaque_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_PATH: - print_path_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_PROCESS32: - print_process32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_PROCESS32_EX: - print_process32ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_PROCESS64: - print_process64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_PROCESS64_EX: - print_process64ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_RETURN32: - print_return32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_RETURN64: - print_return64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SEQ: - print_seq_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SOCKET: - print_socket_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SOCKINET32: - print_sock_inet32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SOCKUNIX: - print_sock_unix_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SUBJECT32: - print_subject32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SUBJECT64: - print_subject64_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SUBJECT32_EX: - print_subject32ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SUBJECT64_EX: - print_subject64ex_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_TEXT: - print_text_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_SOCKET_EX: - print_socketex32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - case AUT_ZONENAME: - print_zonename_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); - return; - - default: - print_invalid_tok(outfp, tok, del, raw, sfrm, AU_PLAIN);*/ - } - - bytesread += tok.len; - } - -} +/* Tree View/Tree Store + * + * The GtkTreeStore is used to store data in tree form, to be + * used later on by a GtkTreeView to display it. This demo builds + * a simple GtkTreeStore and displays it. If you're new to the + * GtkTreeView widgets and associates, look into the GtkListStore + * example first. + * + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include "../tfile.h" + +static GtkWidget *window = NULL; +GtkTreeStore *record_tree; + +/* columns */ +enum +{ + TOKEN_DETAIL_COLUMN = 0, + NUM_COLUMNS +}; + +static GtkTreeModel * +create_model (void) +{ + /* create tree store */ + record_tree= gtk_tree_store_new (NUM_COLUMNS, + G_TYPE_STRING); + + return GTK_TREE_MODEL (record_tree); +} +#define MAX_PRINT_FORMAT_LEN 50 +#define LEN_FOR_BYTES_MARGIN 50 +/* + * Prints a single byte in the given format. + */ +static void +sprint_1_byte(gchar **str, u_char val, const gchar *format,const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + gchar *fstr; + fstr=(gchar *)malloc(MAX_PRINT_FORMAT_LEN); + fstr=(gchar *)g_strconcat("%s:",format,NULL); + g_sprintf(*str,fstr,label,val); + free(fstr); +} +/* + * Prints a single byte in the default format. + */ +static void +sprint_1_byte_df(gchar **str, u_char val, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + g_sprintf(*str,"%s:%u",label,val); +} + +/* + * Print 2 bytes in the given format. + */ +static void +sprint_2_bytes(gchar **str, u_int16_t val, const gchar *format,const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + gchar *fstr; + fstr=(gchar *)malloc(MAX_PRINT_FORMAT_LEN); + fstr=(gchar *)g_strconcat("%s:",format,NULL); + g_sprintf(*str,fstr,label,val); + free(fstr); +} +/* + * Print 2 bytes in the default format. + */ +static void +sprint_2_bytes_df(gchar **str, u_int16_t val, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + g_sprintf(*str,"%s:%u",label,val); +} + +/* + * Prints 4 bytes in the given format. + */ +static void +sprint_4_bytes(gchar **str, u_int32_t val, const gchar *format,const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + gchar *fstr; + fstr=(gchar *)malloc(MAX_PRINT_FORMAT_LEN); + fstr=(gchar *)g_strconcat("%s:",format,NULL); + g_sprintf(*str,fstr,label,val); + free(fstr); +} +/* + * Prints 4 bytes in the defautl format. + */ +static void +sprint_4_bytes_df(gchar **str, u_int32_t val, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + g_sprintf(*str,"%s:%u\0",label,val); +} + +/* + * Prints 8 bytes in the given format. + */ +static void +sprint_8_bytes(gchar **str, u_int64_t val, const gchar *format,const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + gchar *fstr; + fstr=(gchar *)malloc(MAX_PRINT_FORMAT_LEN); + fstr=(gchar *)g_strconcat("%s:",format,NULL); + g_sprintf(*str,fstr,label,val); + free(fstr); +} + +/* + * Prints 8 bytes in the default format. + */ +static void +sprint_8_bytes_df(gchar **str, u_int64_t val, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); + g_sprintf(*str,"%s:%llu\0",label,val); +} + +/* + * Prints the given size of data bytes in hex. + */ +static void +sprint_mem(gchar **str, u_char *data, size_t len,const gchar *label) +{ + *str=(gchar *)malloc(len+sizeof(label)+1); + int i; + if (len > 0) { + gchar *temp; + temp=(gchar *)malloc(len); + for (i = 0; i < len; i++) + g_sprintf(temp, "%x", data[i]); + g_sprintf(*str,"%s:0x%s",label,temp); + free(temp); + } + +} +/* + * Prints the given size of arbitray data in give format. + */ +static void +sprint_arb_data(gchar **str, u_char *data, u_char count, size_t size,const gchar *format) +{ + *str=(gchar *)malloc(count+1); + int i; + for (i = 0; i < count; i++) + { + switch (size) { + case AUR_BYTE_SIZE: + g_sprintf(*str, format,*(data +(size * i))); + break; + case AUR_SHORT_SIZE: + g_sprintf(*str, format, *((u_int16_t *)(data +(size * i)))); + break; + case AUR_INT32_SIZE: + g_sprintf(*str, format, *((u_int32_t *)(data +(size * i)))); + break; + case AUR_INT64_SIZE: + g_sprintf(*str, format, *((u_int64_t *)(data +(size * i)))); + break; + default: + return; + } + } +} + +/* + * Prints the given data bytes as a string. + */ +static void +sprint_string(gchar **dstr, const char *sstr, size_t len, const gchar *label) +{ + int i; + *dstr=(gchar *)malloc(len+1+sizeof(label)); + gchar *temp; + temp=(gchar *)malloc(len); + if (len > 0) { + for (i = 0; i < len; i++) { + if (sstr[i] != '\0') + g_sprintf(temp+i, "%c", sstr[i]); + } + temp[len]='\0'; + g_sprintf(*dstr,"%s:%s",label,temp); + } +} +/* + * Prints seconds in the ctime format. + */ +static void +sprint_sec32(gchar **str, u_int32_t sec, const gchar *label) +{ + time_t timestamp; + char timestr[26]; + *str=(gchar *)malloc(sizeof(label)+1+26); + timestamp = (time_t)sec; + ctime_r(×tamp, timestr); + timestr[24] = '\0'; /* No new line */ + g_sprintf(*str,"%s:%s",label,timestr); +} + +/* + * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we + * assume a 32-bit time_t, we simply truncate for now. + */ +static void +sprint_sec64(gchar **str, u_int64_t sec,const gchar *label) +{ + time_t timestamp; + char timestr[26]; + *str=(gchar *)malloc(sizeof(label)+1+26); + timestamp = (time_t)sec; + ctime_r(×tamp, timestr); + timestr[24] = '\0'; /* No new line */ + g_sprintf(*str,"%s:%s",label,timestr); +} + +/* + * Prints the excess milliseconds. + */ +static void +sprint_msec32(gchar **str, u_int32_t msec, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+1+50); + g_sprintf(*str,"%s:+ %u msec",label,msec); +} + +/* + * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we assume + * a 32-bit msec, we simply truncate for now. + */ +static void +sprint_msec64(gchar **str, u_int64_t msec, const gchar *label) +{ + *str=(gchar *)malloc(sizeof(label)+1+50); + msec &= 0xffffffff; + g_sprintf(*str,"%s:+ %u msec",label,(u_int32_t)msec); +} +#define IP_V4_ADDRESS_LEN 20 +#define IP_V6_ADDRESS_LEN 25 +/* + * Prints a dotted form for the IP address. + */ +static void +sprint_ip_address(gchar **str, u_int32_t ip,const gchar *label) +{ + struct in_addr ipaddr; + *str=(gchar *)malloc(sizeof(label)+1+IP_V4_ADDRESS_LEN); + ipaddr.s_addr = ip; + g_sprintf(*str,"%s:%s",label,inet_ntoa(ipaddr)); +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 10 10:02:18 2007 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 B48B516A46C; Tue, 10 Jul 2007 10:02:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8483416A400 for ; Tue, 10 Jul 2007 10:02:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72B5813C487 for ; Tue, 10 Jul 2007 10:02:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6AA2IZY042104 for ; Tue, 10 Jul 2007 10:02:18 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AA2IGj042101 for perforce@freebsd.org; Tue, 10 Jul 2007 10:02:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 10:02:18 GMT Message-Id: <200707101002.l6AA2IGj042101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 10:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123265 Change 123265 by rdivacky@rdivacky_witten on 2007/07/10 10:01:44 Epoll_create syscall. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.amd64#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.i386#2 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.pc98#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#2 (text+ko) ==== @@ -1,31 +1,39 @@ /*- - * Copyright (c) 2006 Roman Divacky + * Copyright (c) 2007 Roman Divacky * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); + +int +linux_epoll_create(struct thread *td, struct linux_epoll_create_args *args) +{ + struct kqueue_args args; + + /* XXX: args->size is ignored. Linux ignores it as well. */ + + return kqueue(td, args); +} ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#2 (text+ko) ==== @@ -1,29 +1,27 @@ /*- - * Copyright (c) 2006 Roman Divacky + * Copyright (c) 2007 Roman Divacky * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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$ */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.amd64#2 (text+ko) ==== @@ -230,6 +230,7 @@ dependency "linux32_assym.h" amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 +compat/linux/linux_epoll.c optional compat_linux32 compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.i386#2 (text+ko) ==== @@ -85,6 +85,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_epoll.c optional compat_linux compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files.pc98#2 (text+ko) ==== @@ -55,6 +55,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_epoll.c optional compat_linux compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux From owner-p4-projects@FreeBSD.ORG Tue Jul 10 10:14:35 2007 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 F3EA416A46B; Tue, 10 Jul 2007 10:14:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C90DD16A468 for ; Tue, 10 Jul 2007 10:14:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B74E013C46E for ; Tue, 10 Jul 2007 10:14:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6AAEYAV044530 for ; Tue, 10 Jul 2007 10:14:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AAEYbC044527 for perforce@freebsd.org; Tue, 10 Jul 2007 10:14:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 10:14:34 GMT Message-Id: <200707101014.l6AAEYbC044527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 10:14:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=123267 Change 123267 by rdivacky@rdivacky_witten on 2007/07/10 10:14:31 Dummy epoll_ctl and epoll_wait syscalls. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_dummy.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_dummy.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_proto.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_syscall.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysent.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/syscalls.master#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_dummy.c#3 (text+ko) ==== @@ -65,8 +65,6 @@ DUMMY(fadvise64); DUMMY(ptrace); DUMMY(lookup_dcookie); -DUMMY(epoll_ctl); -DUMMY(epoll_wait); DUMMY(remap_file_pages); DUMMY(timer_create); DUMMY(timer_settime); ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -747,13 +747,19 @@ register_t dummy; }; struct linux_epoll_create_args { - char size_l_[PADL_(int)]; int size; char size_r_[PADR_(int)]; + char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)]; }; struct linux_epoll_ctl_args { - register_t dummy; + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char event_l_[PADL_(struct linux_epoll_event *)]; struct linux_epoll_event * event; char event_r_[PADR_(struct linux_epoll_event *)]; }; struct linux_epoll_wait_args { - register_t dummy; + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char events_l_[PADL_(struct linux_epoll_event *)]; struct linux_epoll_event * events; char events_r_[PADR_(struct linux_epoll_event *)]; + char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; + char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; }; struct linux_remap_file_pages_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -275,8 +275,8 @@ { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ { AS(linux_epoll_create_args), (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ + { AS(linux_epoll_ctl_args), (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ + { AS(linux_epoll_wait_args), (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -420,9 +420,11 @@ 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } -254 AUE_NULL STD { int linux_epoll_create(int size); } -255 AUE_NULL STD { int linux_epoll_ctl(void); } -256 AUE_NULL STD { int linux_epoll_wait(void); } +254 AUE_NULL STD { int linux_epoll_create(l_int size); } +255 AUE_NULL STD { int linux_epoll_ctl(l_int epfd, l_int op, l_int fd, \ + struct linux_epoll_event *event); } +256 AUE_NULL STD { int linux_epoll_wait(l_int epfd, struct linux_epoll_event *events, \ + l_int maxevents, l_int timeout); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } 258 AUE_NULL STD { int linux_set_tid_address(int *tidptr); } 259 AUE_NULL STD { int linux_timer_create(void); } ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.c#3 (text+ko) ==== @@ -27,7 +27,17 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_compat.h" + +#include +#ifdef COMPAT_LINUX32 +#include +#else +#include +#endif + + int linux_epoll_create(struct thread *td, struct linux_epoll_create_args *args) { @@ -37,3 +47,15 @@ return kqueue(td, args); } + +int +linux_epoll_ctl(struct thread *td, struct linux_epoll_ctl_args *args) +{ + return (ENOSYS); +} + +int +linux_epoll_wait(struct thread *td, struct linux_epoll_wait_args *args) +{ + return (ENOSYS); +} ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/linux/linux_epoll.h#3 (text+ko) ==== @@ -29,4 +29,15 @@ #ifndef _LINUX_EPOLL_H_ #define _LINUX_EPOLL_H_ +#ifdef __amd64__ +#define EPOLL_PACKED __packed +#else +#define EPOLL_PACKED +#endif + +struct linux_epoll_event { + uint32_t events; + uint64_t data; +} EPOLL_PACKED; + #endif /* !_LINUX_EPOLL_H_ */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_dummy.c#3 (text+ko) ==== @@ -67,8 +67,6 @@ DUMMY(mincore); DUMMY(fadvise64); DUMMY(lookup_dcookie); -DUMMY(epoll_ctl); -DUMMY(epoll_wait); DUMMY(remap_file_pages); DUMMY(fstatfs64); DUMMY(fadvise64_64); ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_proto.h#3 (text+ko) ==== @@ -747,13 +747,19 @@ register_t dummy; }; struct linux_epoll_create_args { - char size_l_[PADL_(int)]; int size; char size_r_[PADR_(int)]; + char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)]; }; struct linux_epoll_ctl_args { - register_t dummy; + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)]; + char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; + char event_l_[PADL_(struct linux_epoll_event *)]; struct linux_epoll_event * event; char event_r_[PADR_(struct linux_epoll_event *)]; }; struct linux_epoll_wait_args { - register_t dummy; + char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)]; + char events_l_[PADL_(struct linux_epoll_event *)]; struct linux_epoll_event * events; char events_r_[PADR_(struct linux_epoll_event *)]; + char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; + char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; }; struct linux_remap_file_pages_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_sysent.c#3 (text+ko) ==== @@ -274,8 +274,8 @@ { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ { AS(linux_epoll_create_args), (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ + { AS(linux_epoll_ctl_args), (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ + { AS(linux_epoll_wait_args), (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ { AS(linux_timer_create_args), (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/syscalls.master#3 (text+ko) ==== @@ -422,9 +422,11 @@ 251 AUE_NULL UNIMPL 252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } -254 AUE_NULL STD { int linux_epoll_create(int size); } -255 AUE_NULL STD { int linux_epoll_ctl(void); } -256 AUE_NULL STD { int linux_epoll_wait(void); } +254 AUE_NULL STD { int linux_epoll_create(l_int size); } +255 AUE_NULL STD { int linux_epoll_ctl(l_int epfd, l_int op, l_int fd, \ + struct linux_epoll_event *event); } +256 AUE_NULL STD { int linux_epoll_wait(l_int epfd, struct linux_epoll_event *events, \ + l_int maxevents, l_int timeout); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } 258 AUE_NULL STD { int linux_set_tid_address(int *tidptr); } 259 AUE_NULL STD { int linux_timer_create(clockid_t clock_id, \ From owner-p4-projects@FreeBSD.ORG Tue Jul 10 13:09:09 2007 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 04DF316A475; Tue, 10 Jul 2007 13:09:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A79B816A473 for ; Tue, 10 Jul 2007 13:09:08 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9677B13C458 for ; Tue, 10 Jul 2007 13:09:08 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6AD98DP073507 for ; Tue, 10 Jul 2007 13:09:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AD98pn073504 for perforce@freebsd.org; Tue, 10 Jul 2007 13:09:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 10 Jul 2007 13:09:08 GMT Message-Id: <200707101309.l6AD98pn073504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 13:09:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=123272 Change 123272 by rdivacky@rdivacky_witten on 2007/07/10 13:08:50 Erm... module needs linux_epoll.c too. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/linux/Makefile#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/linux/Makefile#2 (text+ko) ==== @@ -8,7 +8,7 @@ .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} KMOD= linux -SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ +SRCS= linux${SFX}_dummy.c linux_epoll.c linux_emul.c linux_file.c \ linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ From owner-p4-projects@FreeBSD.ORG Tue Jul 10 13:10:17 2007 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 EC9F216A46D; Tue, 10 Jul 2007 13:10:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C8FBD16A421 for ; Tue, 10 Jul 2007 13:10:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B62CD13C46A for ; Tue, 10 Jul 2007 13:10:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6ADAG3X073627 for ; Tue, 10 Jul 2007 13:10:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6ADAAL0073608 for perforce@freebsd.org; Tue, 10 Jul 2007 13:10:10 GMT (envelope-from peter@freebsd.org) Date: Tue, 10 Jul 2007 13:10:10 GMT Message-Id: <200707101310.l6ADAAL0073608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 123273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 13:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123273 Change 123273 by peter@peter_overcee on 2007/07/10 13:09:38 IFC @123271 Affected files ... .. //depot/projects/hammer/Makefile.inc1#125 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#31 integrate .. //depot/projects/hammer/UPDATING#105 integrate .. //depot/projects/hammer/bin/sh/var.c#14 integrate .. //depot/projects/hammer/contrib/hostapd/COPYING#2 integrate .. //depot/projects/hammer/contrib/hostapd/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/hostapd/Makefile#4 integrate .. //depot/projects/hammer/contrib/hostapd/README#3 integrate .. //depot/projects/hammer/contrib/hostapd/accounting.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/aes.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/aes.h#1 branch .. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/ap.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/hammer/contrib/hostapd/beacon.c#1 branch .. //depot/projects/hammer/contrib/hostapd/beacon.h#1 branch .. //depot/projects/hammer/contrib/hostapd/build_config.h#1 branch .. //depot/projects/hammer/contrib/hostapd/common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/common.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/config.c#5 integrate .. //depot/projects/hammer/contrib/hostapd/config.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/crypto.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/crypto.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/defconfig#3 integrate .. //depot/projects/hammer/contrib/hostapd/defs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/des.c#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/hammer/contrib/hostapd/driver.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/driver_test.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/driver_wired.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_defs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_i.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_identity.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_md5.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_peap.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/eap_sim.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/eap_ttls.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_ttls.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/eloop.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/hammer/contrib/hostapd/hostap_common.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.eap_user#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/hammer/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/hammer/contrib/hostapd/iapp.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/includes.h#1 branch .. //depot/projects/hammer/contrib/hostapd/l2_packet.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/md4.c#1 branch .. //depot/projects/hammer/contrib/hostapd/md5.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/md5.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/milenage.c#1 branch .. //depot/projects/hammer/contrib/hostapd/milenage.h#1 branch .. //depot/projects/hammer/contrib/hostapd/mlme.c#1 branch .. //depot/projects/hammer/contrib/hostapd/mlme.h#1 branch .. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/ms_funcs.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/os.h#1 branch .. //depot/projects/hammer/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/hammer/contrib/hostapd/os_none.c#1 branch .. //depot/projects/hammer/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/hammer/contrib/hostapd/preauth.c#1 branch .. //depot/projects/hammer/contrib/hostapd/preauth.h#1 branch .. //depot/projects/hammer/contrib/hostapd/radius.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius_client.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/radius_client.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/radius_server.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/radius_server.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/rc4.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/rc4.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sha1.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/sha1.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/sha256.c#1 branch .. //depot/projects/hammer/contrib/hostapd/sha256.h#1 branch .. //depot/projects/hammer/contrib/hostapd/sta_info.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/sta_info.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/hammer/contrib/hostapd/tls.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/hammer/contrib/hostapd/tls_none.c#3 integrate .. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/version.h#4 integrate .. //depot/projects/hammer/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/hammer/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wme.c#1 branch .. //depot/projects/hammer/contrib/hostapd/wme.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa.c#4 integrate .. //depot/projects/hammer/contrib/hostapd/wpa.h#3 integrate .. //depot/projects/hammer/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/hammer/etc/inetd.conf#11 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#46 integrate .. //depot/projects/hammer/include/Makefile#68 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#43 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#14 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/hammer/lib/libc/arm/SYS.h#6 integrate .. //depot/projects/hammer/lib/libc/gen/__getosreldate.c#5 integrate .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_status.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#44 integrate .. //depot/projects/hammer/sbin/ifconfig/iflagg.c#3 integrate .. //depot/projects/hammer/sbin/ping6/Makefile#7 integrate .. //depot/projects/hammer/share/examples/isdn/FAQ#3 integrate .. //depot/projects/hammer/share/examples/isdn/Overview#3 integrate .. //depot/projects/hammer/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/hammer/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/hammer/share/examples/isdn/i4brunppp/i4brunppp.c#3 integrate .. //depot/projects/hammer/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#14 integrate .. //depot/projects/hammer/sys/Makefile#17 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#15 integrate .. //depot/projects/hammer/sys/conf/NOTES#122 integrate .. //depot/projects/hammer/sys/conf/files#155 integrate .. //depot/projects/hammer/sys/conf/files.amd64#93 integrate .. //depot/projects/hammer/sys/conf/files.i386#79 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#47 integrate .. //depot/projects/hammer/sys/conf/options#110 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#38 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#19 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#27 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/hammer/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#11 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#48 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#23 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#19 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_ruereg.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#46 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#82 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#19 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#59 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#10 integrate .. //depot/projects/hammer/sys/i386/include/i4b_cause.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_debug.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_ioctl.h#5 delete .. //depot/projects/hammer/sys/i386/include/i4b_rbch_ioctl.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_tel_ioctl.h#3 delete .. //depot/projects/hammer/sys/i386/include/i4b_trace.h#3 delete .. //depot/projects/hammer/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_l4if.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_llif.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/capi_msgs.c#5 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_card.c#6 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_isa.c#8 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_lli.c#7 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ctl.c#8 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ing.c#12 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#20 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#16 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_rbch.c#11 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_tel.c#11 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_trace.c#12 integrate .. //depot/projects/hammer/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_l1l2.h#3 integrate .. //depot/projects/hammer/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/hammer/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1dmux.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/i4b_l1lib.c#4 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_ctx_s0P.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_diva.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_drn_ngo.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_dynalink.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_hscx.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_isa.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic_pnp.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_l1.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_l1fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_siemens_isurf.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_sws.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_usr_sti.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_isac.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_l1.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#16 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer1/iwic/i4b_iwic_pci.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_iframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2fsm.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2timer.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_lme.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_sframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_tei.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_uframe.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_util.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l3fsm.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l3timer.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_l4if.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_q931.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer3/i4b_q932fac.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_i4bdrv.c#12 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4mgmt.c#7 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4timer.c#5 integrate .. //depot/projects/hammer/sys/ia64/isa/isa_dma.c#7 integrate .. //depot/projects/hammer/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#16 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#7 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#4 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#4 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#75 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#67 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#44 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#49 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#7 integrate .. //depot/projects/hammer/sys/netinet6/dest6.c#5 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#11 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#27 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#18 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#31 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#19 integrate .. //depot/projects/hammer/sys/netinet6/ip6_id.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#32 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#21 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#44 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#19 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#32 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#23 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#31 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#8 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#18 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#28 integrate .. //depot/projects/hammer/sys/netinet6/udp6_var.h#4 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#16 integrate .. //depot/projects/hammer/sys/opencrypto/cast.c#4 integrate .. //depot/projects/hammer/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/hammer/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/hammer/sys/pci/if_rlreg.h#26 integrate .. //depot/projects/hammer/sys/powerpc/include/atomic.h#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#25 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#6 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/sys/param.h#91 integrate .. //depot/projects/hammer/sys/sys/sx.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#46 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.icase3.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/sed/regress.sh#9 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#20 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#8 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/i4b/g711conv/g711conv.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/isdnd.8#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnd/isdnd.h#5 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdndebug/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdndecode/decode.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdnphone/defs.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntel/defs.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntelctl/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntest/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/i4b/isdntrace/trace.h#2 integrate .. //depot/projects/hammer/usr.sbin/i4b/man/i4b.4#3 integrate .. //depot/projects/hammer/usr.sbin/inetd/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/ppp/i4b.c#3 integrate .. //depot/projects/hammer/usr.sbin/rrenumd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/driver_freebsd.c#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/l2_packet.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#125 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -979,6 +979,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/hammer/ObsoleteFiles.inc#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.103 2007/07/04 16:21:27 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070705: I4B headers repo-copied to include/i4b/ +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/i4b_cause.h +OLD_FILES+=usr/include/machine/i4b_debug.h +OLD_FILES+=usr/include/machine/i4b_ioctl.h +OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h +OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h +OLD_FILES+=usr/include/machine/i4b_trace.h +.endif # 20070704: I4B 'modules' temporary disconnected .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/share/man/man4/i4bing.4.gz ==== //depot/projects/hammer/UPDATING#105 (text+ko) ==== @@ -47,6 +47,11 @@ information. 20070612: + The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver + instead of the nve(4) driver. Please update your configuration + accordingly. + +20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If desired, set the new rc.conf option sendmail_rebuild_aliases @@ -882,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.501 2007/07/04 21:47:23 gnn Exp $ +$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ ==== //depot/projects/hammer/bin/sh/var.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.36 2007/07/04 00:00:38 scf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $"); #include #include @@ -278,6 +278,30 @@ return 0; } + +/* + * Sets/unsets an environment variable from a pointer that may actually be a + * pointer into environ where the string should not be manipulated. + */ +static void +change_env(char *s, int set) +{ + char *eqp; + char *ss; + + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + if (set && eqp != NULL) + (void) setenv(ss, eqp + 1, 1); + else + (void) unsetenv(ss); + ckfree(ss); + + return; +} + + /* * Same as setvar except that the variable and value are passed in * the first argument as name=value. Since the first argument will @@ -289,7 +313,6 @@ setvareq(char *s, int flags) { struct var *vp, **vpp; - char *p; int len; if (aflag) @@ -320,10 +343,7 @@ if (vp == &vmpath || (vp == &vmail && ! mpathset())) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -339,10 +359,7 @@ INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - p = strchr(s, '='); - *p = '\0'; - (void) setenv(s, p + 1, 1); - *p = '='; + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -603,10 +620,7 @@ vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - p = strchr(vp->text, '='); - *p = '\0'; - (void) setenv(vp->text, p + 1, 1); - *p = '='; + change_env(vp->text, 1); (void) setlocale(LC_ALL, ""); } goto found; @@ -798,7 +812,7 @@ if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + change_env(s, 0); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; ==== //depot/projects/hammer/contrib/hostapd/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/hammer/contrib/hostapd/ChangeLog#4 (text+ko) ==== @@ -1,9 +1,136 @@ ChangeLog for hostapd -2006-02-08 - v0.4.8 +2007-05-28 - v0.5.8 + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PSK bit ordering of the Flags field + * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs + by reading wpa_psk_file [Bug 181] + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * fixed IPv6 connection to RADIUS accounting server + +2006-11-24 - v0.5.6 + * added support for configuring and controlling multiple BSSes per + radio interface (bss= in hostapd.conf); this is only + available with Devicescape and test driver interfaces + * fixed PMKSA cache update in the end of successful RSN + pre-authentication + * added support for dynamic VLAN configuration (i.e., selecting VLAN-ID + for each STA based on RADIUS Access-Accept attributes); this requires + VLAN support from the kernel driver/802.11 stack and this is + currently only available with Devicescape and test driver interfaces + * driver_madwifi: fixed configuration of unencrypted modes (plaintext + and IEEE 802.1X without WEP) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM) + * hlr_auc_gw: added support for reading per-IMSI Milenage keys and + parameters from a text file to make it possible to implement proper + GSM/UMTS authentication server for multiple SIM/USIM cards using + EAP-SIM/EAP-AKA + * fixed session timeout processing with drivers that do not use + ieee802_11.c (e.g., madwifi) + +2006-08-27 - v0.5.5 + * added 'hostapd_cli new_sta ' command for adding a new STA into + hostapd (e.g., to initialize wired network authentication based on an + external signal) + * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when + using WPA2 even if PMKSA caching is not used + * added -P argument for hostapd to write the current process + id into a file + * added support for RADIUS Authentication Server MIB (RFC 2619) + +2006-06-20 - v0.5.4 + * fixed nt_password_hash build [Bug 144] + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * fixed a segmentation fault when RSN pre-authentication was completed + successfully [Bug 152] + +2006-04-27 - v0.5.3 + * do not build nt_password_hash and hlr_auc_gw by default to avoid + requiring a TLS library for a successful build; these programs can be + build with 'make nt_password_hash' and 'make hlr_auc_gw' + * added a new configuration option, eapol_version, that can be used to + set EAPOL version to 1 (default is 2) to work around broken client + implementations that drop EAPOL frames which use version number 2 + [Bug 89] + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * fixed EAP-MSCHAPv2 message length validation + +2006-03-19 - v0.5.2 * fixed stdarg use in hostapd_logger(): if both stdout and syslog logging was enabled, hostapd could trigger a segmentation fault in vsyslog on some CPU -- C library combinations + * moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external + program to make it easier to use for implementing real SS7 gateway; + eap_sim_db is not anymore used as a file name for GSM authentication + triplets; instead, it is path to UNIX domain socket that will be used + to communicate with the external gateway program (e.g., hlr_auc_gw) + * added example HLR/AuC gateway implementation, hlr_auc_gw, that uses + local information (GSM authentication triplets from a text file and + hardcoded AKA authentication data); this can be used to test EAP-SIM + and EAP-AKA + * added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw + to make it possible to test EAP-AKA with real USIM cards (this is + disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw + to enable this) + * driver_madwifi: added support for getting station RSN IE from + madwifi-ng svn r1453 and newer; this fixes RSN that was apparently + broken with earlier change (r1357) in the driver + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE) + [Bug 125] + * added ap_max_inactivity configuration parameter + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (test_socket=DIR:/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * added support for EAP methods to use callbacks to external programs + by buffering a pending request and processing it after the EAP method + is ready to continue + * improved EAP-SIM database interface to allow external request to GSM + HLR/AuC without blocking hostapd process + * added support for using EAP-SIM pseudonyms and fast re-authentication + * added support for EAP-AKA in the integrated EAP authenticator + * added support for matching EAP identity prefixes (e.g., "1"*) in EAP + user database to allow EAP-SIM/AKA selection without extra roundtrip + for EAP-Nak negotiation + * added support for storing EAP user password as NtPasswordHash instead + of plaintext password when using MSCHAP or MSCHAPv2 for + authentication (hash:<16-octet hex value>); added nt_password_hash + tool for hashing password to generate NtPasswordHash 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * driver_wired: fixed EAPOL sending to optionally use PAE group address ==== //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,12 +1,17 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $ .cvsignore driver.c driver_bsd.c +driver_devicescape.c driver_madwifi.c driver_prism54.c l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c l2_packet_pcap.c +l2_packet_winpcap.c +nt_password_hash.c +os_win32.c prism54.h priv_netlink.h wireless_copy.h ==== //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $ WPA/802.1x Authenticator originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.4.8' \ - src/contrib/hostapd MALINEN v0_4_8 + cvs import -m 'Import of hostapd 0.5.8' \ + src/contrib/hostapd MALINEN v0_5_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -6-March-2006 +7-July-2007 ==== //depot/projects/hammer/contrib/hostapd/Makefile#4 (text+ko) ==== @@ -1,6 +1,5 @@ CC=gcc DIR_WPA_SUPPLICANT=. -DIR_HOSTAP=. ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g @@ -11,18 +10,41 @@ CFLAGS += -DHOSTAPD_DUMP_STATE # Include directories for CVS version -CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT) +CFLAGS += -I. -I../utils -I$(DIR_WPA_SUPPLICANT) # Uncomment following line and set the path to your kernel tree include # directory if your C library does not include all header files. # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o \ +-include .config + +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +ifdef CONFIG_NATIVE_WINDOWS +CFLAGS += -DCONFIG_NATIVE_WINDOWS +LIBS += -lws2_32 +endif + +OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o md4.o \ common.o ieee802_11.o config.o ieee802_11_auth.o accounting.o \ sta_info.o radius_client.o sha1.o wpa.o aes_wrap.o ctrl_iface.o \ - driver_conf.o + driver_conf.o os_$(CONFIG_OS).o preauth.o pmksa_cache.o beacon.o \ + hw_features.o wme.o ap_list.o reconfig.o \ + mlme.o vlan_init.o ieee802_11h.o + +HOBJS=hlr_auc_gw.o common.o os_$(CONFIG_OS).o milenage.o aes_wrap.o --include .config +CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX ifdef CONFIG_IAPP CFLAGS += -DCONFIG_IAPP @@ -34,6 +56,15 @@ CONFIG_L2_PACKET=y endif +ifdef CONFIG_PEERKEY +CFLAGS += -DCONFIG_PEERKEY +endif + +ifdef CONFIG_IEEE80211W +CFLAGS += -DCONFIG_IEEE80211W +NEED_SHA256=y +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS += driver.o @@ -55,6 +86,11 @@ OBJS += driver_prism54.o endif +ifdef CONFIG_DRIVER_DEVICESCAPE +CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE +OBJS += driver_devicescape.o +endif + ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS += driver_bsd.o @@ -70,7 +106,6 @@ ifdef CONFIG_L2_PACKET ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP ifdef CONFIG_L2_FREEBSD LIBS += -lpcap OBJS += $(DIR_WPA_SUPPLICANT)/l2_packet_freebsd.o @@ -122,9 +157,21 @@ ifdef CONFIG_EAP_SIM CFLAGS += -DEAP_SIM -OBJS += eap_sim.o $(DIR_WPA_SUPPLICANT)/eap_sim_common.o -# Example EAP-SIM interface for GSM authentication. This can be replaced with -# another file implementating the interface specified in eap_sim_db.h. +OBJS += eap_sim.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_AKA +CFLAGS += -DEAP_AKA +OBJS += eap_aka.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_SIM_COMMON +OBJS += $(DIR_WPA_SUPPLICANT)/eap_sim_common.o +# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be +# replaced with another file implementating the interface specified in +# eap_sim_db.h. OBJS += eap_sim_db.o endif @@ -138,6 +185,25 @@ OBJS += eap_psk.o $(DIR_WPA_SUPPLICANT)/eap_psk_common.o endif +ifdef CONFIG_EAP_SAKE +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o $(DIR_WPA_SUPPLICANT)/eap_sake_common.o +endif + +ifdef CONFIG_EAP_GPSK +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o $(DIR_WPA_SUPPLICANT)/eap_gpsk_common.o +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif +endif + +ifdef CONFIG_EAP_VENDOR_TEST +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif + ifdef CONFIG_EAP_TLV CFLAGS += -DEAP_TLV OBJS += eap_tlv.o @@ -145,15 +211,34 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER -OBJS += eap.o eap_identity.o +OBJS += eap.o eap_methods.o eap_identity.o +endif + +ifndef CONFIG_TLS +CONFIG_TLS=openssl endif ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) CFLAGS += -DEAP_TLS_FUNCS -OBJS += eap_tls_common.o $(DIR_WPA_SUPPLICANT)/tls_openssl.o +OBJS += eap_tls_common.o +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_gnutls.o +LIBS += -lgnutls -lgcrypt -lgpg-error +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif +NEED_CRYPTO=y else OBJS += $(DIR_WPA_SUPPLICANT)/tls_none.o endif @@ -163,10 +248,60 @@ endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 10 15:41:08 2007 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 D249016A474; Tue, 10 Jul 2007 15:41:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72C7D16A46E; Tue, 10 Jul 2007 15:41:07 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mxout2.cac.washington.edu (mxout2.cac.washington.edu [140.142.33.4]) by mx1.freebsd.org (Postfix) with ESMTP id 5069313C4B9; Tue, 10 Jul 2007 15:41:07 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from smtp.washington.edu (smtp.washington.edu [140.142.33.9] (may be forged)) by mxout2.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.06) with ESMTP id l6AFf6H0024396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 10 Jul 2007 08:41:07 -0700 X-Auth-Received: from [192.168.10.45] (c-24-10-12-194.hsd1.ca.comcast.net [24.10.12.194]) (authenticated authid=youshi10) by smtp.washington.edu (8.13.7+UW06.06/8.13.7+UW07.03) with ESMTP id l6AFf66e023644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 10 Jul 2007 08:41:06 -0700 Message-ID: <4693A891.90601@gmail.com> Date: Tue, 10 Jul 2007 08:41:05 -0700 From: Garrett Cooper User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: Matus Harvan References: <200707100940.l6A9el1D040230@repoman.freebsd.org> In-Reply-To: <200707100940.l6A9el1D040230@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-PMX-Version: 5.3.2.304607, Antispam-Engine: 2.5.1.298604, Antispam-Data: 2007.7.10.82432 X-Uwash-Spam: Gauge=IIIIIII, Probability=7%, Report='FORGED_FROM_GMAIL 0.1, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FROM_GMAIL 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __USER_AGENT 0' Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 15:41:08 -0000 Matus Harvan wrote: > http://perforce.freebsd.org/chv.cgi?CH=123260 > > Change 123260 by mharvan@mharvan_twoflower on 2007/07/10 09:39:53 > > use #ifdef to run the proper ifconfig commands on FreeBSD and Linux > > Affected files ... > > .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#7 edit > > Differences ... > > ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#7 (text+ko) ==== > > @@ -418,13 +418,19 @@ > > /* setup the tun interface */ > if (server) { > - system("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); > + #ifdef __FreeBSD__ > + ssystem("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); > + #endif > + > } else { > /* FeeBSD */ > I believe that comment's a typo. Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Tue Jul 10 16:40:20 2007 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 868A316A469; Tue, 10 Jul 2007 16:40:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A6BF16A400; Tue, 10 Jul 2007 16:40:20 +0000 (UTC) (envelope-from m.harvan@jacobs-university.de) Received: from hermes.jacobs-university.de (hermes.iu-bremen.de [212.201.44.23]) by mx1.freebsd.org (Postfix) with ESMTP id 0FBA513C44B; Tue, 10 Jul 2007 16:40:20 +0000 (UTC) (envelope-from m.harvan@jacobs-university.de) Received: from localhost (demetrius.iu-bremen.de [212.201.44.32]) by hermes.jacobs-university.de (Postfix) with ESMTP id F295055DAE; Tue, 10 Jul 2007 18:10:18 +0200 (CEST) Received: from hermes.jacobs-university.de ([212.201.44.23]) by localhost (demetrius.jacobs-university.de [212.201.44.32]) (amavisd-new, port 10024) with ESMTP id 03235-05; Tue, 10 Jul 2007 18:10:15 +0200 (CEST) Received: from twoflower.eecs.jacobs-university.de (twoflower.eecsgradlab.iu-bremen.de [10.70.11.175]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hermes.jacobs-university.de (Postfix) with ESMTP id 0F9B79B8; Tue, 10 Jul 2007 18:10:14 +0200 (CEST) Received: by twoflower.eecs.jacobs-university.de (Postfix, from userid 1001) id A735E39243B; Tue, 10 Jul 2007 18:10:14 +0200 (CEST) Date: Tue, 10 Jul 2007 18:10:14 +0200 From: Matus Harvan To: Garrett Cooper Message-ID: <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> References: <200707100940.l6A9el1D040230@repoman.freebsd.org> <4693A891.90601@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WIyZ46R2i8wDzkSu" Content-Disposition: inline In-Reply-To: <4693A891.90601@gmail.com> User-Agent: Mutt/1.4.2.2i X-Virus-Scanned: amavisd-new 2.3.3 (20050822) at jacobs-university.de Cc: max@love2party.net, Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 16:40:20 -0000 --WIyZ46R2i8wDzkSu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 10, 2007 at 08:41:05AM -0700, Garrett Cooper wrote: > Matus Harvan wrote: > >http://perforce.freebsd.org/chv.cgi?CH=123260 > > > >Change 123260 by mharvan@mharvan_twoflower on 2007/07/10 09:39:53 > > > > use #ifdef to run the proper ifconfig commands on FreeBSD and Linux [...] > I believe that comment's a typo. I was using a Debian box for testing and hence it was convenient. What's the problem with it? Matus --WIyZ46R2i8wDzkSu Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGk69m43LQWDWf0QIRAnBqAKChIgZteZa8/qk0arW8SrMXmNQc7ACgpnja rCOqYq1rLsidy0uUx3EeHCo= =rerV -----END PGP SIGNATURE----- --WIyZ46R2i8wDzkSu-- From owner-p4-projects@FreeBSD.ORG Tue Jul 10 17:23:18 2007 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 11B8B16A477; Tue, 10 Jul 2007 17:23:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C48C016A46C; Tue, 10 Jul 2007 17:23:17 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 6D72913C4C1; Tue, 10 Jul 2007 17:23:17 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.8/8.13.4) with ESMTP id l6AHKf3e017123; Tue, 10 Jul 2007 11:20:42 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 10 Jul 2007 11:21:23 -0600 (MDT) Message-Id: <20070710.112123.-345495745.imp@bsdimp.com> To: cnst@freebsd.org From: "M. Warner Losh" In-Reply-To: <200707090405.l69456Mw026331@repoman.freebsd.org> References: <200707090405.l69456Mw026331@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Tue, 10 Jul 2007 11:20:42 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 123172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 17:23:18 -0000 In message: <200707090405.l69456Mw026331@repoman.freebsd.org> "Constantine A. Murenin" writes: : http://perforce.freebsd.org/chv.cgi?CH=123172 : : Change 123172 by cnst@dale on 2007/07/09 04:04:33 : : print nameunit before chip name, which wasn't printed : because on OpenBSD lm produced only one line in dmesg : : On OpenBSD: : lm0 at isa0 port 0x290/8: W83627DHG : : Now on FreeBSD: : lm0 at port 0x290 on isa0 : lm0: W83627DHG You should be setting the device description to W83627DHG if at all possible. That will result in: lm0: at port 0x290 on isa0 Warner From owner-p4-projects@FreeBSD.ORG Tue Jul 10 21:55:44 2007 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 8627516A46D; Tue, 10 Jul 2007 21:55:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 407EF16A46B; Tue, 10 Jul 2007 21:55:44 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.freebsd.org (Postfix) with ESMTP id 23A3213C447; Tue, 10 Jul 2007 21:55:44 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 9EBC9EA2; Tue, 10 Jul 2007 16:26:00 -0500 (CDT) Date: Tue, 10 Jul 2007 16:26:00 -0500 To: Matus Harvan Message-ID: <20070710212600.GC20941@soaustin.net> References: <200707100940.l6A9el1D040230@repoman.freebsd.org> <4693A891.90601@gmail.com> <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> User-Agent: Mutt/1.5.9i From: linimon@lonesome.com (Mark Linimon) Cc: Garrett Cooper , max@love2party.net, Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 21:55:45 -0000 > I was using a Debian box for testing and hence it was convenient. What's > the problem with it? "FeeBSD" (no r)? mcl From owner-p4-projects@FreeBSD.ORG Tue Jul 10 22:05:43 2007 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 4837616A469; Tue, 10 Jul 2007 22:05:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 158A816A41F for ; Tue, 10 Jul 2007 22:05:43 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E21B813C455 for ; Tue, 10 Jul 2007 22:05:42 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6AM5gWM060601 for ; Tue, 10 Jul 2007 22:05:42 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AM5gBX060598 for perforce@freebsd.org; Tue, 10 Jul 2007 22:05:42 GMT (envelope-from mharvan@FreeBSD.org) Date: Tue, 10 Jul 2007 22:05:42 GMT Message-Id: <200707102205.l6AM5gBX060598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 22:05:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=123294 Change 123294 by mharvan@mharvan_twoflower on 2007/07/10 22:05:35 fixing a typo in the comment, thanks to Garrett Cooper for finding it Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#8 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#8 (text+ko) ==== @@ -423,7 +423,7 @@ #endif } else { - /* FeeBSD */ + /* FreeBSD */ #ifdef __FreeBSD__ ssystem("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); #else From owner-p4-projects@FreeBSD.ORG Tue Jul 10 22:06:16 2007 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 7A79216A46C; Tue, 10 Jul 2007 22:06:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 57BEF16A41F; Tue, 10 Jul 2007 22:06:16 +0000 (UTC) (envelope-from m.harvan@jacobs-university.de) Received: from hermes.jacobs-university.de (hermes.iu-bremen.de [212.201.44.23]) by mx1.freebsd.org (Postfix) with ESMTP id 115AB13C448; Tue, 10 Jul 2007 22:06:16 +0000 (UTC) (envelope-from m.harvan@jacobs-university.de) Received: from localhost (demetrius.iu-bremen.de [212.201.44.32]) by hermes.jacobs-university.de (Postfix) with ESMTP id 4B73E847D2; Wed, 11 Jul 2007 00:06:15 +0200 (CEST) Received: from hermes.jacobs-university.de ([212.201.44.23]) by localhost (demetrius.jacobs-university.de [212.201.44.32]) (amavisd-new, port 10024) with ESMTP id 29100-06; Wed, 11 Jul 2007 00:06:11 +0200 (CEST) Received: from [192.168.1.60] (p5489D290.dip.t-dialin.net [84.137.210.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by hermes.jacobs-university.de (Postfix) with ESMTP id D992B9A5; Wed, 11 Jul 2007 00:06:10 +0200 (CEST) Message-ID: <469402D1.2040002@jacobs-university.de> Date: Wed, 11 Jul 2007 00:06:09 +0200 From: Matus Harvan User-Agent: Thunderbird 1.5.0.7 (X11/20060927) MIME-Version: 1.0 To: Mark Linimon References: <200707100940.l6A9el1D040230@repoman.freebsd.org> <4693A891.90601@gmail.com> <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> <20070710212600.GC20941@soaustin.net> In-Reply-To: <20070710212600.GC20941@soaustin.net> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new 2.3.3 (20050822) at jacobs-university.de Cc: Garrett Cooper , max@love2party.net, Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 22:06:16 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2007-07-10 23:26, Mark Linimon wrote: >> I was using a Debian box for testing and hence it was convenient. What's >> the problem with it? > > "FeeBSD" (no r)? I'm sorry, I thought the comment referred to the p4 description rather than the comment in the sources. Thanks for pointing it out. Matus -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFGlAKT43LQWDWf0QIRArtLAJ42Jzyhxylb2bzAPu7TWvwOfqHcnQCZASL/ DZtWgJh47bESSYvZg9l80X0= =vYgk -----END PGP SIGNATURE----- From owner-p4-projects@FreeBSD.ORG Tue Jul 10 22:32:16 2007 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 E69DB16A476; Tue, 10 Jul 2007 22:32:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 90F0B16A46C for ; Tue, 10 Jul 2007 22:32:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6592413C45A for ; Tue, 10 Jul 2007 22:32:15 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6AMWF1r064014 for ; Tue, 10 Jul 2007 22:32:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AMWF3f064009 for perforce@freebsd.org; Tue, 10 Jul 2007 22:32:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Jul 2007 22:32:15 GMT Message-Id: <200707102232.l6AMWF3f064009@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 123295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 22:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123295 Change 123295 by rwatson@rwatson_peppercorn on 2007/07/10 22:32:14 Add closefrom(2) event for proposed closefrom(2) system call on FreeBSD. Solaris implements closefrom(3) in user space using a loop around close(2), so generates separate audit records for each close. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#50 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#50 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#49 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#50 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -537,6 +537,7 @@ #define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ #define AUE_MLOCKALL 43141 /* FreeBSD. */ #define AUE_MUNLOCKALL 43142 /* FreeBSD. */ +#define AUE_CLOSEFROM 43143 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#22 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#23 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -480,6 +480,7 @@ 43140:AUE_LISTEN:listen(2):nt 43141:AUE_MLOCKALL:mlockall(2):pc 43142:AUE_MUNLOCKALL:munlockall(2):pc +43143:AUE_CLOSEFROM:closefrom(2):cl # # User space system events. # From owner-p4-projects@FreeBSD.ORG Tue Jul 10 23:09:01 2007 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 A13F916A46C; Tue, 10 Jul 2007 23:09:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 610BF16A421 for ; Tue, 10 Jul 2007 23:09:01 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5241C13C45A for ; Tue, 10 Jul 2007 23:09:01 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6AN916q068258 for ; Tue, 10 Jul 2007 23:09:01 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6AN918a068253 for perforce@freebsd.org; Tue, 10 Jul 2007 23:09:01 GMT (envelope-from jbr@FreeBSD.org) Date: Tue, 10 Jul 2007 23:09:01 GMT Message-Id: <200707102309.l6AN918a068253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 123297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2007 23:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=123297 Change 123297 by jbr@jbr_bob on 2007/07/10 23:08:41 First attempt at copying from kernel to user space, not sure it works. Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#4 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#4 (text+ko) ==== @@ -879,6 +879,11 @@ } } +struct test { + unsigned int pid; + char proctitle[256]; +}; + /* * Destroy old address space, and allocate a new stack * The new stack is only SGROWSIZ large because it is grown @@ -894,6 +899,8 @@ struct vmspace *vmspace = p->p_vmspace; vm_offset_t stack_addr; vm_map_t map; + + struct test test_data = {42, "Humppa!"}; imgp->vmspace_destroyed = 1; imgp->sysent = sv; @@ -918,11 +925,15 @@ map = &vmspace->vm_map; } + sv->sv_sysshm = sv->sv_minuser; + /* Allocate memory shared between process and kernel */ - error = vm_map_sysshm(map, sv->sv_minuser, 8); + error = vm_map_sysshm(map, sv->sv_sysshm, sizeof(struct test)); if (error) return (error); + copyout(&test_data, (void *) sv->sv_sysshm, sizeof(struct test)); + /* Allocate a new stack */ stack_addr = sv->sv_usrstack - maxssiz; error = vm_map_stack(map, stack_addr, (vm_size_t)maxssiz, From owner-p4-projects@FreeBSD.ORG Wed Jul 11 00:11:26 2007 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 0627416A47A; Wed, 11 Jul 2007 00:11:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98A7E16A474 for ; Wed, 11 Jul 2007 00:11:25 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 873AF13C46A for ; Wed, 11 Jul 2007 00:11:25 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6B0BPw9076939 for ; Wed, 11 Jul 2007 00:11:25 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6B0BOQg076934 for perforce@freebsd.org; Wed, 11 Jul 2007 00:11:24 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 11 Jul 2007 00:11:24 GMT Message-Id: <200707110011.l6B0BOQg076934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 00:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=123300 Change 123300 by zec@zec_tpx32 on 2007/07/11 00:11:03 Change the way the registration of vnet "modules" is handled, and in particular the initialization / cleanup ordering. Previously, the modules were responsible for declaring whether their initialization routines should be called before or after network protocol domain initialization. This change allows for protocol domains to be registered as vnet modules as well, which simplifies the initialization process and should do a better job at capturing the init ordering as set by the standard SYSINIT and DOMAIN_SET macros in a non-virtualized kernel. A vnet module can now be registered for initialization in multiple instances; however, each instance must be registered with a unique calling argument (a void *). This capability is leveraged to allow a single handler to be registered in multiple instances; i.e. net_init_domain() is registered as a vnet module once for each protocol domain. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#22 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#3 edit .. //depot/projects/vimage/src/sys/net/if.c#14 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#5 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#13 edit .. //depot/projects/vimage/src/sys/net/route.c#8 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#9 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#18 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#18 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#22 (text+ko) ==== @@ -82,31 +82,45 @@ int last_vi_id = 0; -static struct vnet_modlink vnet_modules[VNET_MOD_MAX]; static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; void vnet_mod_register(modinfo) struct vnet_modinfo *modinfo; { + vnet_mod_register_multi(modinfo, NULL, NULL); +} + +void vnet_mod_register_multi(modinfo, iarg, iname) + struct vnet_modinfo *modinfo; + void *iarg; + char *iname; +{ + struct vnet_modlink *vml; + + /* Do not register the same module instance more than once */ + TAILQ_FOREACH(vml, &vnet_modlink_head, mod_le) + if (vml->modinfo == modinfo && vml->iarg == iarg) + break; + if (vml != NULL) + panic("attempt to register already registered vnet module"); + vml = malloc(sizeof(struct vnet_modlink), M_VIMAGE, M_NOWAIT); + /* * XXX we support only statically assigned module IDs at the time. * In principle modules should be able to get a dynamically * assigned ID at registration time. */ - VNET_ASSERT(modinfo->id > 0 || modinfo->id < VNET_MOD_MAX); - VNET_ASSERT(vnet_modules[modinfo->id].modinfo == NULL); - VNET_ASSERT(modinfo->i_attach == NULL || (modinfo->i_attach && - ((modinfo->flags & VNET_MFLAG_ORDER_1ST) || - (modinfo->flags & VNET_MFLAG_ORDER_2ND)))); + VNET_ASSERT((iarg == NULL) ^ (iname == NULL)); - vnet_modules[modinfo->id].modinfo = modinfo; - TAILQ_INSERT_TAIL(&vnet_modlink_head, - &vnet_modules[modinfo->id], mod_le); + vml->modinfo = modinfo; + vml->iarg = iarg; + vml->iname = iname; + TAILQ_INSERT_TAIL(&vnet_modlink_head, vml, mod_le); if (modinfo->i_attach) { VNET_ITERLOOP_BEGIN_QUIET(); - modinfo->i_attach(); + modinfo->i_attach(iarg); VNET_ITERLOOP_END(); } } @@ -114,17 +128,30 @@ void vnet_mod_deregister(modinfo) struct vnet_modinfo *modinfo; { - VNET_ASSERT(vnet_modules[modinfo->id].modinfo == modinfo) + vnet_mod_deregister_multi(modinfo, NULL, NULL); +} + +void vnet_mod_deregister_multi(modinfo, iarg, iname) + struct vnet_modinfo *modinfo; + void *iarg; + char *iname; +{ + struct vnet_modlink *vml; + + TAILQ_FOREACH(vml, &vnet_modlink_head, mod_le) + if (vml->modinfo == modinfo && vml->iarg == iarg) + break; + if (vml == NULL) + panic("cannot deregister unregistered vnet module"); if (modinfo->i_detach) { VNET_ITERLOOP_BEGIN_QUIET(); - modinfo->i_detach(); + modinfo->i_detach(iarg); VNET_ITERLOOP_END(); } - vnet_modules[modinfo->id].modinfo = NULL; - TAILQ_REMOVE(&vnet_modlink_head, - &vnet_modules[modinfo->id], mod_le); + TAILQ_REMOVE(&vnet_modlink_head, vml, mod_le); + free(vml, M_VIMAGE); } struct vimage *vnet2vimage(vnet) @@ -384,20 +411,19 @@ struct kld_sym_lookup *lookup; char *symstr; { - int i; + struct vnet_modlink *vml; - for (i = 0; i < VNET_MOD_MAX; i++) { + TAILQ_FOREACH(vml, &vnet_modlink_head, mod_le) { struct vnet_symmap *mapentry; - if (vnet_modules[i].modinfo == NULL || - vnet_modules[i].modinfo->symmap == NULL) + if (vml->modinfo->symmap == NULL) continue; - for (mapentry = vnet_modules[i].modinfo->symmap; + for (mapentry = vml->modinfo->symmap; mapentry->name != NULL; mapentry++) { if (strcmp(symstr, mapentry->name) == 0) { lookup->symvalue = - (int) curvnet->mod_data[i]; + (int) curvnet->mod_data[vml->modinfo->id]; lookup->symvalue += mapentry->offset; lookup->symsize = mapentry->size; return 0; @@ -418,8 +444,7 @@ struct vnet *vnet; struct vprocg *vprocg; struct vcpu *vcpu; - struct domain *dp; - struct vnet_modlink *modlnk_i; + struct vnet_modlink *vml; /* * XXX don't forget the locking @@ -461,42 +486,11 @@ CURVNET_SET_QUIET(vnet); /* - * Attach modules with ORDER_1ST flag set + * Initialize / attach module instances. */ - TAILQ_FOREACH(modlnk_i, &vnet_modlink_head, mod_le) - if (modlnk_i->modinfo->i_attach != NULL && - modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_1ST) { - VNET_ASSERT(!(modlnk_i->modinfo->flags & \ - VNET_MFLAG_ORDER_2ND)); - modlnk_i->modinfo->i_attach(); - } - - /* - * Attach protocol domains. - */ - for (dp = domains; dp; dp = dp->dom_next) { - struct protosw *pr; - for (pr = dp->dom_protosw; - pr < dp->dom_protoswNPROTOSW; pr++) { - if (pr->pr_usrreqs == 0) - panic("domaininit: %ssw[%d] has no usrreqs!", - dp->dom_name, - (int)(pr - dp->dom_protosw)); - if (pr->pr_init) - pr->pr_init(); - } - } - - /* - * Attach modules with ORDER_2ND flag set - */ - TAILQ_FOREACH(modlnk_i, &vnet_modlink_head, mod_le) - if (modlnk_i->modinfo->i_attach != NULL && - modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_2ND) { - VNET_ASSERT(!(modlnk_i->modinfo->flags & \ - VNET_MFLAG_ORDER_1ST)); - modlnk_i->modinfo->i_attach(); - } + TAILQ_FOREACH(vml, &vnet_modlink_head, mod_le) + if (vml->modinfo->i_attach != NULL) + vml->modinfo->i_attach(vml->iarg); CURVNET_RESTORE(); @@ -522,8 +516,7 @@ struct vprocg *vprocg = vip->v_procg; struct vcpu *vcpu = vip->v_cpu; struct ifnet *ifp, *nifp; - struct vnet_modlink *modlnk_i; - struct domain *dp; + struct vnet_modlink *vml; CURVNET_SET_QUIET(vnet); INIT_VNET_NET(vnet); @@ -552,36 +545,11 @@ ifp->if_xname); /* - * Detach modules with ORDER_2ND flag set + * Detach / free per-module state instances. */ - TAILQ_FOREACH_REVERSE(modlnk_i, &vnet_modlink_head, vnet_modlink_head, mod_le) - if (modlnk_i->modinfo->i_detach != NULL && - modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_2ND) { - VNET_ASSERT(!(modlnk_i->modinfo->flags & \ - VNET_MFLAG_ORDER_1ST)); - modlnk_i->modinfo->i_detach(); - } - - /* - * Detach protocol domains - */ - for (dp = domains; dp; dp = dp->dom_next) { - struct protosw *pr; - for (pr = dp->dom_protoswNPROTOSW; pr > dp->dom_protosw;) - if ((--pr)->pr_destroy) - (*pr->pr_destroy)(); - } - - /* - * Detach modules with ORDER_1ST flag set - */ - TAILQ_FOREACH_REVERSE(modlnk_i, &vnet_modlink_head, vnet_modlink_head, mod_le) - if (modlnk_i->modinfo->i_detach != NULL && - modlnk_i->modinfo->flags & VNET_MFLAG_ORDER_1ST) { - VNET_ASSERT(!(modlnk_i->modinfo->flags & \ - VNET_MFLAG_ORDER_2ND)); - modlnk_i->modinfo->i_detach(); - } + TAILQ_FOREACH_REVERSE(vml, &vnet_modlink_head, vnet_modlink_head, mod_le) + if (vml->modinfo->i_detach) + vml->modinfo->i_detach(vml->iarg); #if 0 free((caddr_t)vnet->ifnet_addrs, M_IFADDR); ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.49 2007/05/16 20:41:07 rwatson Exp $"); @@ -43,6 +45,7 @@ #include #include #include +#include #include /* @@ -64,6 +67,8 @@ SYSINIT(domainfin, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST, domainfinalize, NULL) +static int net_init_domain(void *); + static struct callout pffast_callout; static struct callout pfslow_callout; @@ -100,6 +105,14 @@ .pru_sopoll = pru_sopoll_notsupp, }; +#ifdef VIMAGE +static struct vnet_modinfo vnet_domain_modinfo = { + .id = VNET_MOD_DOMAIN, + .name = "domain", + .i_attach = net_init_domain +}; +#endif + static void protosw_init(struct protosw *pr) { @@ -132,9 +145,10 @@ * Note: you cant unload it again because a socket may be using it. * XXX can't fail at this time. */ -static void -net_init_domain(struct domain *dp) +static int +net_init_domain(void *arg) { + struct domain *dp = arg; struct protosw *pr; if (dp->dom_init) @@ -148,6 +162,7 @@ max_datalen = MHLEN - max_hdr; if (max_datalen < 1) panic("%s: max_datalen < 1", __func__); + return 0; } /* @@ -183,7 +198,11 @@ "domainfinalize()\n", dp->dom_name); #endif mtx_unlock(&dom_mtx); +#ifdef VIMAGE + vnet_mod_register_multi(&vnet_domain_modinfo, dp, dp->dom_name); +#else net_init_domain(dp); +#endif } static void ==== //depot/projects/vimage/src/sys/net/if.c#14 (text+ko) ==== @@ -137,9 +137,9 @@ extern void nd6_setmtu(struct ifnet *); #endif -static int vnet_net_iattach(void); +static int vnet_net_iattach(void *); #ifdef VIMAGE -static int vnet_net_idetach(void); +static int vnet_net_idetach(void *); #endif int ifqmaxlen = IFQ_MAXLEN; @@ -175,7 +175,6 @@ static struct vnet_modinfo vnet_net_modinfo = { .id = VNET_MOD_NET, - .flags = VNET_MFLAG_ORDER_1ST, .name = "net", .symmap = vnet_net_symmap, .i_attach = vnet_net_iattach, @@ -332,7 +331,7 @@ #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); #else - vnet_net_iattach(); + vnet_net_iattach(NULL); #endif IFNET_LOCK_INIT(); #ifdef VIMAGE @@ -348,7 +347,8 @@ } static int -vnet_net_iattach() +vnet_net_iattach(unused) + void *unused; { #ifdef VIMAGE struct vnet_net *vnet_net; @@ -376,7 +376,8 @@ #ifdef VIMAGE static int -vnet_net_idetach() +vnet_net_idetach(unused) + void *unused; { INIT_VNET_NET(curvnet); ==== //depot/projects/vimage/src/sys/net/if_gif.c#5 (text+ko) ==== @@ -148,9 +148,7 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_gif_modinfo = { .id = VNET_MOD_GIF, - .flags = VNET_MFLAG_ORDER_2ND, .name = "gif", - .symmap = NULL, .i_attach = vnet_gif_iattach, .i_detach = vnet_gif_idetach }; ==== //depot/projects/vimage/src/sys/net/if_loop.c#13 (text+ko) ==== @@ -106,9 +106,9 @@ struct sockaddr *dst, struct rtentry *rt); static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); -static int vnet_loif_iattach(void); +static int vnet_loif_iattach(void *); #ifdef VIMAGE -static int vnet_loif_idetach(void); +static int vnet_loif_idetach(void *); #endif #ifndef VIMAGE @@ -183,15 +183,14 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_loif_modinfo = { .id = VNET_MOD_LOIF, - .flags = VNET_MFLAG_ORDER_2ND, .name = "loif", - .symmap = NULL, .i_attach = vnet_loif_iattach, .i_detach = vnet_loif_idetach }; #endif -static int vnet_loif_iattach(void) +static int vnet_loif_iattach(unused) + void *unused; { INIT_VNET_NET(curvnet); @@ -208,7 +207,8 @@ } #ifdef VIMAGE -static int vnet_loif_idetach(void) +static int vnet_loif_idetach(unused) + void *unused; { INIT_VNET_NET(curvnet); struct lo_softc *sc, *nsc; @@ -243,7 +243,7 @@ #ifdef VIMAGE vnet_mod_register(&vnet_loif_modinfo); #else - vnet_loif_iattach(); + vnet_loif_iattach(NULL); #endif break; case MOD_UNLOAD: ==== //depot/projects/vimage/src/sys/net/route.c#8 (text+ko) ==== @@ -60,9 +60,9 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); -static int rtable_init(void); +static int rtable_init(void *); #ifdef VIMAGE -static int rtable_idetach(void); +static int rtable_idetach(void *); #endif /* compare two sockaddr structures */ @@ -83,7 +83,6 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_rtable_modinfo = { .id = VNET_MOD_RTABLE, - .flags = VNET_MFLAG_ORDER_2ND, .name = "rtable", .i_attach = rtable_init, .i_detach = rtable_idetach @@ -91,7 +90,8 @@ #endif static int -rtable_init() +rtable_init(unused) + void *unused; { INIT_VNET_NET(curvnet); @@ -105,7 +105,8 @@ #ifdef VIMAGE static int -rtable_idetach() +rtable_idetach(unused) + void *unused; { INIT_VNET_NET(curvnet); @@ -129,7 +130,7 @@ #ifdef VIMAGE vnet_mod_register(&vnet_rtable_modinfo); #else - rtable_init(); + rtable_init(NULL); #endif } ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#9 (text+ko) ==== @@ -255,11 +255,8 @@ static struct vnet_modinfo vnet_netgraph_modinfo = { .id = VNET_MOD_NETGRAPH, - .flags = VNET_MFLAG_ORDER_2ND, .name = "netgraph", - .symmap = NULL, .i_attach = vnet_netgraph_iattach, - .i_detach = NULL, }; #endif ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#11 (text+ko) ==== @@ -119,7 +119,7 @@ "Enable proxy ARP for all suitable requests"); static void arp_init(void); -static int arp_iattach(void); +static int arp_iattach(void *); static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); static void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); @@ -134,9 +134,7 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_arp_modinfo = { .id = VNET_MOD_ARP, - .flags = VNET_MFLAG_ORDER_2ND, .name = "arp", - .symmap = NULL, .i_attach = arp_iattach, .i_detach = NULL, }; @@ -983,7 +981,8 @@ } static int -arp_iattach(void) +arp_iattach(unused) + void *unused; { INIT_VNET_INET(curvnet); @@ -1001,7 +1000,7 @@ #ifdef VIMAGE vnet_mod_register(&vnet_arp_modinfo); #else - arp_iattach(); + arp_iattach(NULL); #endif arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#18 (text+ko) ==== @@ -118,9 +118,7 @@ #ifdef VIMAGE static struct vnet_modinfo vnet_ipfw_modinfo = { .id = VNET_MOD_IPFW, - .flags = VNET_MFLAG_ORDER_2ND, .name = "ipfw", - .symmap = NULL, .i_attach = vnet_ipfw_iattach, .i_detach = vnet_ipfw_idetach, }; ==== //depot/projects/vimage/src/sys/sys/vimage.h#18 (text+ko) ==== @@ -76,9 +76,10 @@ #define VNET_MOD_PF 10 #define VNET_MOD_ALTQ 11 #define VNET_MOD_GIF 16 -#define VNET_MOD_ARP 29 -#define VNET_MOD_RTABLE 30 -#define VNET_MOD_LOIF 31 +#define VNET_MOD_ARP 28 +#define VNET_MOD_RTABLE 29 +#define VNET_MOD_LOIF 30 +#define VNET_MOD_DOMAIN 31 #define VNET_MOD_DYNAMIC_START 32 #define VNET_MOD_MAX 64 @@ -110,27 +111,23 @@ int size; }; -typedef int vnet_attach_t(void); -typedef int vnet_detach_t(void); -typedef int vnet_start_t(void); -typedef int vnet_stop_t(void); +typedef int vnet_attach_t(void *); +typedef int vnet_detach_t(void *); -#define VNET_MFLAG_ORDER_1ST 0x0001 -#define VNET_MFLAG_ORDER_2ND 0x0002 - struct vnet_modinfo { - int id; - int flags; - char *name; - struct vnet_symmap *symmap; - /* Per-instance method hooks */ - vnet_attach_t *i_attach; - vnet_detach_t *i_detach; + int id; + int flags; + char *name; + struct vnet_symmap *symmap; + vnet_attach_t *i_attach; + vnet_detach_t *i_detach; }; struct vnet_modlink { - TAILQ_ENTRY(vnet_modlink) mod_le; - struct vnet_modinfo *modinfo; + TAILQ_ENTRY(vnet_modlink) mod_le; + struct vnet_modinfo *modinfo; + void *iarg; + char *iname; }; #define VSYM(base, sym) ((base)->_##sym) @@ -260,6 +257,8 @@ #ifdef VIMAGE void vnet_mod_register(struct vnet_modinfo *); void vnet_mod_deregister(struct vnet_modinfo *); +void vnet_mod_register_multi(struct vnet_modinfo *, void *, char*); +void vnet_mod_deregister_multi(struct vnet_modinfo *, void *, char*); void printcpuinfo(struct vprocg *); struct vimage *vi_alloc(char *, int, int, int); From owner-p4-projects@FreeBSD.ORG Wed Jul 11 00:46:10 2007 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 AC6F116A469; Wed, 11 Jul 2007 00:46:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 690E716A421 for ; Wed, 11 Jul 2007 00:46:10 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A6B813C43E for ; Wed, 11 Jul 2007 00:46:10 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6B0kAqW079758 for ; Wed, 11 Jul 2007 00:46:10 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6B0k9ip079755 for perforce@freebsd.org; Wed, 11 Jul 2007 00:46:10 GMT (envelope-from loafier@FreeBSD.org) Date: Wed, 11 Jul 2007 00:46:10 GMT Message-Id: <200707110046.l6B0k9ip079755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 123302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 00:46:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=123302 Change 123302 by loafier@chrisdsoc on 2007/07/11 00:45:11 Adjusted flags to match original. Affected files ... .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_mci.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_pio.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_rtc.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_spi.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_ssc.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_twi.c#3 edit .. //depot/projects/soc2007/loafier_busalloc/arm/at91/if_ate.c#3 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -64,14 +64,14 @@ #define BBSZ 512 enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec mci_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_pio.c#3 (text) ==== @@ -43,14 +43,14 @@ #include enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec pio_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_rtc.c#3 (text) ==== @@ -44,14 +44,14 @@ #include "clock_if.h" enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec rtc_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, - {SYS_RES_MEMORY, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_spi.c#3 (text) ==== @@ -44,14 +44,14 @@ #include "spibus_if.h" enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec spi_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_ssc.c#3 (text) ==== @@ -39,14 +39,14 @@ #include enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec ssc_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/at91_twi.c#3 (text) ==== @@ -50,14 +50,14 @@ #define TWI_FASTEST_CLOCK 90000 enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec twi_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; ==== //depot/projects/soc2007/loafier_busalloc/arm/at91/if_ate.c#3 (text) ==== @@ -76,14 +76,14 @@ #define ATE_MAX_RX_BUFFERS 64 enum { + RES_MEM, RES_IRQ, - RES_MEM, RES_SZ }; static struct resource_spec ate_res_spec[] = { - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, {-1, 0, 0} }; From owner-p4-projects@FreeBSD.ORG Wed Jul 11 02:50:13 2007 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 968E416A46C; Wed, 11 Jul 2007 02:50:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C0AD16A41F; Wed, 11 Jul 2007 02:50:13 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mxout2.cac.washington.edu (mxout2.cac.washington.edu [140.142.33.4]) by mx1.freebsd.org (Postfix) with ESMTP id 391A813C459; Wed, 11 Jul 2007 02:50:13 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from smtp.washington.edu (smtp.washington.edu [140.142.33.9] (may be forged)) by mxout2.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.06) with ESMTP id l6B2oCE0015975 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 10 Jul 2007 19:50:12 -0700 X-Auth-Received: from [192.168.10.45] (c-24-10-12-194.hsd1.ca.comcast.net [24.10.12.194]) (authenticated authid=youshi10) by smtp.washington.edu (8.13.7+UW06.06/8.13.7+UW07.03) with ESMTP id l6B2oBbo031417 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 10 Jul 2007 19:50:12 -0700 Message-ID: <46944563.3040505@gmail.com> Date: Tue, 10 Jul 2007 19:50:11 -0700 From: Garrett Cooper User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: Matus Harvan References: <200707100940.l6A9el1D040230@repoman.freebsd.org> <4693A891.90601@gmail.com> <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> In-Reply-To: <20070710161014.GA58358@twoflower.eecs.iu-bremen.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-PMX-Version: 5.3.2.304607, Antispam-Engine: 2.5.1.298604, Antispam-Data: 2007.7.10.192752 X-Uwash-Spam: Gauge=IIIIIII, Probability=7%, Report='FORGED_FROM_GMAIL 0.1, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FROM_GMAIL 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __USER_AGENT 0' Cc: max@love2party.net, Perforce Change Reviews , Matus Harvan Subject: Re: PERFORCE change 123260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 02:50:13 -0000 Matus Harvan wrote: > On Tue, Jul 10, 2007 at 08:41:05AM -0700, Garrett Cooper wrote: > >> Matus Harvan wrote: >> >>> http://perforce.freebsd.org/chv.cgi?CH=123260 >>> >>> Change 123260 by mharvan@mharvan_twoflower on 2007/07/10 09:39:53 >>> >>> use #ifdef to run the proper ifconfig commands on FreeBSD and Linux >>> > [...] > > >> I believe that comment's a typo. >> > > I was using a Debian box for testing and hence it was convenient. What's > the problem with it? > > Matus > It just says FeeBSD in the comment :).. nothing big. -Garrett From owner-p4-projects@FreeBSD.ORG Wed Jul 11 05:28:05 2007 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 263D416A46B; Wed, 11 Jul 2007 05:28:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E7D9416A400 for ; Wed, 11 Jul 2007 05:28:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D98E013C465 for ; Wed, 11 Jul 2007 05:28:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6B5S4KS042419 for ; Wed, 11 Jul 2007 05:28:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6B5S4Ad042416 for perforce@freebsd.org; Wed, 11 Jul 2007 05:28:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 11 Jul 2007 05:28:04 GMT Message-Id: <200707110528.l6B5S4Ad042416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 123308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 05:28:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123308 Change 123308 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/11 05:27:42 The order of the MAC items appears in the test cases does not matter Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#6 (text+ko) ==== @@ -56,18 +56,30 @@ rm ${tmp_file} } -mactestexpect1() +maclabelexpect() { e="${1}" + err=0 shift ${mactest} $* 2>${tmp_file} 1>>${tmp_file} r=`cat ${tmp_file}` - echo "${r}" | grep ${e} >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "ok ${ntest}" - else - echo ${r} - echo "not ok ${ntest}" + d=`echo ${e}|sed 'y/\,/\ /` + for item in ${d} + do + echo "${r}" | grep ${item} >/dev/null 2>&1 + if [ $? -eq 0 ]; then + else + err=1 + fi + done + if [ ${err} -eq 0 ]; then + echo "ok ${ntest}" + else + echo -n "The expected maclabel " + echo -n ${e} + echo " does not match" + echo ${r} + echo "not ok ${ntest}" fi ntest=`expr $ntest + 1` rm ${tmp_file} ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#3 (text+ko) ==== @@ -6,7 +6,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..4" +echo "1..5" n0=`namegen` n1=`namegen` @@ -97,14 +97,14 @@ #It is strange that there are no mac_check respect to get the vnode label echo -n "pid = -2 mac_test_copy_vnode_label with src label:" > ${mactest_conf} echo "biba/high,mls/7" >> ${mactest_conf} - mactestexpect1 "biba/high,mls/7" -f ${mactest_conf} system getfmac ${n0} + maclabelexpect "mls/7,biba/high" -f ${mactest_conf} system getfmac ${n0} ############################################################# #case ls -l -Z command: #Why ls need -l to work with -Z, this is not correspond to the manual page of ls echo -n "pid = -2 mac_test_copy_vnode_label with src label:" > ${mactest_conf} echo "biba/high,mls/7" >> ${mactest_conf} - mactestexpect1 "biba/high,mls/7" -f ${mactest_conf} system ls -l -Z ${n0} + maclabelexpect "biba/low,mls/7" -f ${mactest_conf} system ls -l -Z ${n0} #cleanup: cd .. From owner-p4-projects@FreeBSD.ORG Wed Jul 11 06:27:18 2007 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 BE00F16A421; Wed, 11 Jul 2007 06:27:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D15116A400 for ; Wed, 11 Jul 2007 06:27:17 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5F26613C45B for ; Wed, 11 Jul 2007 06:27:17 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6B6RHcT053278 for ; Wed, 11 Jul 2007 06:27:17 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6B6RH69053275 for perforce@freebsd.org; Wed, 11 Jul 2007 06:27:17 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 11 Jul 2007 06:27:17 GMT Message-Id: <200707110627.l6B6RH69053275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 123310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 06:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=123310 Change 123310 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/11 06:26:52 The default label of biba is biba/high, let the final testcase pass Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#4 (text+ko) ==== @@ -104,7 +104,7 @@ #Why ls need -l to work with -Z, this is not correspond to the manual page of ls echo -n "pid = -2 mac_test_copy_vnode_label with src label:" > ${mactest_conf} echo "biba/high,mls/7" >> ${mactest_conf} - maclabelexpect "biba/low,mls/7" -f ${mactest_conf} system ls -l -Z ${n0} + maclabelexpect "biba/high,mls/7" -f ${mactest_conf} system ls -l -Z ${n0} #cleanup: cd .. From owner-p4-projects@FreeBSD.ORG Wed Jul 11 12:03:13 2007 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 D1DE816A46C; Wed, 11 Jul 2007 12:03:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E00016A400 for ; Wed, 11 Jul 2007 12:03:12 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5759713C4AD for ; Wed, 11 Jul 2007 12:03:12 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BC3CmS096588 for ; Wed, 11 Jul 2007 12:03:12 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BC3CHQ096583 for perforce@freebsd.org; Wed, 11 Jul 2007 12:03:12 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 11 Jul 2007 12:03:12 GMT Message-Id: <200707111203.l6BC3CHQ096583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 12:03:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=123314 Change 123314 by zec@zec_tca51 on 2007/07/11 12:02:18 Fix a bogus assert. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#23 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#23 (text+ko) ==== @@ -111,7 +111,7 @@ * assigned ID at registration time. */ VNET_ASSERT(modinfo->id > 0 || modinfo->id < VNET_MOD_MAX); - VNET_ASSERT((iarg == NULL) ^ (iname == NULL)); + VNET_ASSERT(!((iarg == NULL) ^ (iname == NULL))); vml->modinfo = modinfo; vml->iarg = iarg; From owner-p4-projects@FreeBSD.ORG Wed Jul 11 12:04:14 2007 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 65FEC16A46C; Wed, 11 Jul 2007 12:04:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43B0916A41F for ; Wed, 11 Jul 2007 12:04:14 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 27BDA13C4BB for ; Wed, 11 Jul 2007 12:04:14 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BC4EHI096694 for ; Wed, 11 Jul 2007 12:04:14 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BC4DiM096691 for perforce@freebsd.org; Wed, 11 Jul 2007 12:04:13 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 11 Jul 2007 12:04:13 GMT Message-Id: <200707111204.l6BC4DiM096691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 12:04:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=123315 Change 123315 by zec@zec_tca51 on 2007/07/11 12:03:46 Do not (re)initialize global state for local (unix) sockets for non-default vnets. Affected files ... .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#8 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#8 (text+ko) ==== @@ -61,6 +61,7 @@ #include "opt_ddb.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include @@ -91,6 +92,7 @@ #include #include #include +#include #ifdef DDB #include @@ -1651,6 +1653,10 @@ unp_init(void) { +#ifdef VIMAGE + if (curvnet != &vnet_0) + return; +#endif unp_zone = uma_zcreate("unpcb", sizeof(struct unpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); if (unp_zone == NULL) From owner-p4-projects@FreeBSD.ORG Wed Jul 11 12:06:22 2007 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 C3F4216A468; Wed, 11 Jul 2007 12:06:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 34DDF16A41F for ; Wed, 11 Jul 2007 12:06:21 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 236BE13C44B for ; Wed, 11 Jul 2007 12:06:21 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BC6Lr6097406 for ; Wed, 11 Jul 2007 12:06:21 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BC6H8l097297 for perforce@freebsd.org; Wed, 11 Jul 2007 12:06:17 GMT (envelope-from delphij@freebsd.org) Date: Wed, 11 Jul 2007 12:06:17 GMT Message-Id: <200707111206.l6BC6H8l097297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 12:06:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=123316 Change 123316 by delphij@charlie on 2007/07/11 12:05:39 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile.inc1#3 integrate .. //depot/projects/delphij_fork/UPDATING#3 integrate .. //depot/projects/delphij_fork/contrib/hostapd/COPYING#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/README#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/aes.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/aes.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ap.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/beacon.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/beacon.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/build_config.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/common.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/config.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/config.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/defconfig#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/defs.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/des.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/driver.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/includes.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/md4.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/md5.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/md5.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/milenage.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/milenage.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/mlme.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/mlme.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/os.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/os_none.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/preauth.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/preauth.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/radius.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/radius.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/sha256.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/sha256.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/tls.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/version.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/wme.c#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/wme.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/delphij_fork/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/delphij_fork/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/delphij_fork/share/man/man4/wi.4#2 integrate .. //depot/projects/delphij_fork/share/man/man9/taskqueue.9#2 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#3 integrate .. //depot/projects/delphij_fork/sys/conf/kmod.mk#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/isp/isp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/delphij_fork/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/udp_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_output.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_fault.c#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.c#2 integrate .. //depot/projects/delphij_fork/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/delphij_fork/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd_cli/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/l2_packet.c#2 integrate .. //depot/user/howardsu/truss/sys/fs/tmpfs/tmpfs_vfsops.c#39 edit Differences ... ==== //depot/projects/delphij_fork/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -978,6 +978,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/delphij_fork/UPDATING#3 (text+ko) ==== @@ -46,7 +46,7 @@ cards should be configured using ifconfig(8), see the man page for more information. -20060612: +20070612: The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver instead of the nve(4) driver. Please update your configuration accordingly. @@ -887,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.502 2007/07/06 06:35:50 yongari Exp $ +$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ ==== //depot/projects/delphij_fork/contrib/hostapd/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/delphij_fork/contrib/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,9 +1,136 @@ ChangeLog for hostapd -2006-02-08 - v0.4.8 +2007-05-28 - v0.5.8 + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PSK bit ordering of the Flags field + * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs + by reading wpa_psk_file [Bug 181] + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * fixed IPv6 connection to RADIUS accounting server + +2006-11-24 - v0.5.6 + * added support for configuring and controlling multiple BSSes per + radio interface (bss= in hostapd.conf); this is only + available with Devicescape and test driver interfaces + * fixed PMKSA cache update in the end of successful RSN + pre-authentication + * added support for dynamic VLAN configuration (i.e., selecting VLAN-ID + for each STA based on RADIUS Access-Accept attributes); this requires + VLAN support from the kernel driver/802.11 stack and this is + currently only available with Devicescape and test driver interfaces + * driver_madwifi: fixed configuration of unencrypted modes (plaintext + and IEEE 802.1X without WEP) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM) + * hlr_auc_gw: added support for reading per-IMSI Milenage keys and + parameters from a text file to make it possible to implement proper + GSM/UMTS authentication server for multiple SIM/USIM cards using + EAP-SIM/EAP-AKA + * fixed session timeout processing with drivers that do not use + ieee802_11.c (e.g., madwifi) + +2006-08-27 - v0.5.5 + * added 'hostapd_cli new_sta ' command for adding a new STA into + hostapd (e.g., to initialize wired network authentication based on an + external signal) + * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when + using WPA2 even if PMKSA caching is not used + * added -P argument for hostapd to write the current process + id into a file + * added support for RADIUS Authentication Server MIB (RFC 2619) + +2006-06-20 - v0.5.4 + * fixed nt_password_hash build [Bug 144] + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * fixed a segmentation fault when RSN pre-authentication was completed + successfully [Bug 152] + +2006-04-27 - v0.5.3 + * do not build nt_password_hash and hlr_auc_gw by default to avoid + requiring a TLS library for a successful build; these programs can be + build with 'make nt_password_hash' and 'make hlr_auc_gw' + * added a new configuration option, eapol_version, that can be used to + set EAPOL version to 1 (default is 2) to work around broken client + implementations that drop EAPOL frames which use version number 2 + [Bug 89] + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * fixed EAP-MSCHAPv2 message length validation + +2006-03-19 - v0.5.2 * fixed stdarg use in hostapd_logger(): if both stdout and syslog logging was enabled, hostapd could trigger a segmentation fault in vsyslog on some CPU -- C library combinations + * moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external + program to make it easier to use for implementing real SS7 gateway; + eap_sim_db is not anymore used as a file name for GSM authentication + triplets; instead, it is path to UNIX domain socket that will be used + to communicate with the external gateway program (e.g., hlr_auc_gw) + * added example HLR/AuC gateway implementation, hlr_auc_gw, that uses + local information (GSM authentication triplets from a text file and + hardcoded AKA authentication data); this can be used to test EAP-SIM + and EAP-AKA + * added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw + to make it possible to test EAP-AKA with real USIM cards (this is + disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw + to enable this) + * driver_madwifi: added support for getting station RSN IE from + madwifi-ng svn r1453 and newer; this fixes RSN that was apparently + broken with earlier change (r1357) in the driver + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE) + [Bug 125] + * added ap_max_inactivity configuration parameter + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (test_socket=DIR:/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * added support for EAP methods to use callbacks to external programs + by buffering a pending request and processing it after the EAP method + is ready to continue + * improved EAP-SIM database interface to allow external request to GSM + HLR/AuC without blocking hostapd process + * added support for using EAP-SIM pseudonyms and fast re-authentication + * added support for EAP-AKA in the integrated EAP authenticator + * added support for matching EAP identity prefixes (e.g., "1"*) in EAP + user database to allow EAP-SIM/AKA selection without extra roundtrip + for EAP-Nak negotiation + * added support for storing EAP user password as NtPasswordHash instead + of plaintext password when using MSCHAP or MSCHAPv2 for + authentication (hash:<16-octet hex value>); added nt_password_hash + tool for hashing password to generate NtPasswordHash 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * driver_wired: fixed EAPOL sending to optionally use PAE group address ==== //depot/projects/delphij_fork/contrib/hostapd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,12 +1,17 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $ .cvsignore driver.c driver_bsd.c +driver_devicescape.c driver_madwifi.c driver_prism54.c l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c l2_packet_pcap.c +l2_packet_winpcap.c +nt_password_hash.c +os_win32.c prism54.h priv_netlink.h wireless_copy.h ==== //depot/projects/delphij_fork/contrib/hostapd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $ WPA/802.1x Authenticator originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.4.8' \ - src/contrib/hostapd MALINEN v0_4_8 + cvs import -m 'Import of hostapd 0.5.8' \ + src/contrib/hostapd MALINEN v0_5_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -6-March-2006 +7-July-2007 ==== //depot/projects/delphij_fork/contrib/hostapd/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ CC=gcc DIR_WPA_SUPPLICANT=. -DIR_HOSTAP=. ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g @@ -11,18 +10,41 @@ CFLAGS += -DHOSTAPD_DUMP_STATE # Include directories for CVS version -CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT) +CFLAGS += -I. -I../utils -I$(DIR_WPA_SUPPLICANT) # Uncomment following line and set the path to your kernel tree include # directory if your C library does not include all header files. # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o \ +-include .config + +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +ifdef CONFIG_NATIVE_WINDOWS +CFLAGS += -DCONFIG_NATIVE_WINDOWS +LIBS += -lws2_32 +endif + +OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o md4.o \ common.o ieee802_11.o config.o ieee802_11_auth.o accounting.o \ sta_info.o radius_client.o sha1.o wpa.o aes_wrap.o ctrl_iface.o \ - driver_conf.o + driver_conf.o os_$(CONFIG_OS).o preauth.o pmksa_cache.o beacon.o \ + hw_features.o wme.o ap_list.o reconfig.o \ + mlme.o vlan_init.o ieee802_11h.o + +HOBJS=hlr_auc_gw.o common.o os_$(CONFIG_OS).o milenage.o aes_wrap.o --include .config +CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX ifdef CONFIG_IAPP CFLAGS += -DCONFIG_IAPP @@ -34,6 +56,15 @@ CONFIG_L2_PACKET=y endif +ifdef CONFIG_PEERKEY +CFLAGS += -DCONFIG_PEERKEY +endif + +ifdef CONFIG_IEEE80211W +CFLAGS += -DCONFIG_IEEE80211W +NEED_SHA256=y +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS += driver.o @@ -55,6 +86,11 @@ OBJS += driver_prism54.o endif +ifdef CONFIG_DRIVER_DEVICESCAPE +CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE +OBJS += driver_devicescape.o +endif + ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS += driver_bsd.o @@ -70,7 +106,6 @@ ifdef CONFIG_L2_PACKET ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP ifdef CONFIG_L2_FREEBSD LIBS += -lpcap OBJS += $(DIR_WPA_SUPPLICANT)/l2_packet_freebsd.o @@ -122,9 +157,21 @@ ifdef CONFIG_EAP_SIM CFLAGS += -DEAP_SIM -OBJS += eap_sim.o $(DIR_WPA_SUPPLICANT)/eap_sim_common.o -# Example EAP-SIM interface for GSM authentication. This can be replaced with -# another file implementating the interface specified in eap_sim_db.h. +OBJS += eap_sim.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_AKA +CFLAGS += -DEAP_AKA +OBJS += eap_aka.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_SIM_COMMON +OBJS += $(DIR_WPA_SUPPLICANT)/eap_sim_common.o +# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be +# replaced with another file implementating the interface specified in +# eap_sim_db.h. OBJS += eap_sim_db.o endif @@ -138,6 +185,25 @@ OBJS += eap_psk.o $(DIR_WPA_SUPPLICANT)/eap_psk_common.o endif +ifdef CONFIG_EAP_SAKE +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o $(DIR_WPA_SUPPLICANT)/eap_sake_common.o +endif + +ifdef CONFIG_EAP_GPSK +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o $(DIR_WPA_SUPPLICANT)/eap_gpsk_common.o +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif +endif + +ifdef CONFIG_EAP_VENDOR_TEST +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif + ifdef CONFIG_EAP_TLV CFLAGS += -DEAP_TLV OBJS += eap_tlv.o @@ -145,15 +211,34 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER -OBJS += eap.o eap_identity.o +OBJS += eap.o eap_methods.o eap_identity.o +endif + +ifndef CONFIG_TLS +CONFIG_TLS=openssl endif ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) CFLAGS += -DEAP_TLS_FUNCS -OBJS += eap_tls_common.o $(DIR_WPA_SUPPLICANT)/tls_openssl.o +OBJS += eap_tls_common.o +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_gnutls.o +LIBS += -lgnutls -lgcrypt -lgpg-error +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif +NEED_CRYPTO=y else OBJS += $(DIR_WPA_SUPPLICANT)/tls_none.o endif @@ -163,10 +248,60 @@ endif ifdef MS_FUNCS +OBJS += $(DIR_WPA_SUPPLICANT)/ms_funcs.o +NEED_CRYPTO=y +endif + +ifdef NEED_CRYPTO ifndef TLS_FUNCS +ifeq ($(CONFIG_TLS), openssl) LIBS += -lcrypto +LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +LIBS += -lgcrypt +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +endif +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +CONFIG_INTERNAL_SHA256=y +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +CONFIG_INTERNAL_SHA256=y endif -OBJS += $(DIR_WPA_SUPPLICANT)/ms_funcs.o $(DIR_WPA_SUPPLICANT)/crypto.o +else +CONFIG_INTERNAL_AES=y +CONFIG_INTERNAL_SHA1=y +CONFIG_INTERNAL_MD5=y +CONFIG_INTERNAL_SHA256=y +endif + +ifdef CONFIG_INTERNAL_AES +CFLAGS += -DINTERNAL_AES +endif +ifdef CONFIG_INTERNAL_SHA1 +CFLAGS += -DINTERNAL_SHA1 +endif +ifdef CONFIG_INTERNAL_SHA256 +CFLAGS += -DINTERNAL_SHA256 +endif +ifdef CONFIG_INTERNAL_MD5 +CFLAGS += -DINTERNAL_MD5 +endif +ifdef CONFIG_INTERNAL_MD4 +CFLAGS += -DINTERNAL_MD4 +endif + +ifdef NEED_SHA256 +OBJS += sha256.o endif ifdef CONFIG_RADIUS_SERVER @@ -178,6 +313,12 @@ CFLAGS += -DCONFIG_IPV6 endif +ifdef CONFIG_FULL_DYNAMIC_VLAN +# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges +# and vlan interfaces for the vlan feature. +CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN +endif + ALL=hostapd hostapd_cli all: verify_config $(ALL) @@ -201,10 +342,7 @@ rm -f driver_conf.c echo '/* THIS FILE AUTOMATICALLY GENERATED, DO NOT EDIT! */' \ > driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c - echo '#include ' >> driver_conf.c + echo '#include "includes.h"' >> driver_conf.c echo '#include "hostapd.h"' >> driver_conf.c echo '#include "driver.h"' >> driver_conf.c ifdef CONFIG_DRIVER_HOSTAP @@ -219,6 +357,9 @@ ifdef CONFIG_DRIVER_PRISM54 echo "void prism54_driver_register(void);" >> driver_conf.c endif +ifdef CONFIG_DRIVER_DEVICESCAPE + echo "void devicescape_driver_register(void);" >> driver_conf.c +endif ifdef CONFIG_DRIVER_BSD echo "void bsd_driver_register(void);" >> driver_conf.c endif @@ -238,6 +379,9 @@ ifdef CONFIG_DRIVER_PRISM54 echo "prism54_driver_register();" >> driver_conf.c endif +ifdef CONFIG_DRIVER_DEVICESCAPE + echo "devicescape_driver_register();" >> driver_conf.c +endif ifdef CONFIG_DRIVER_BSD echo "bsd_driver_register();" >> driver_conf.c endif @@ -249,7 +393,48 @@ hostapd_cli: hostapd_cli.o $(DIR_WPA_SUPPLICANT)/wpa_ctrl.o $(CC) -o hostapd_cli hostapd_cli.o $(DIR_WPA_SUPPLICANT)/wpa_ctrl.o +NOBJS = nt_password_hash.o $(DIR_WPA_SUPPLICANT)/ms_funcs.o sha1.o rc4.o md5.o +NOBJS += $(DIR_WPA_SUPPLICANT)/crypto.o os_$(CONFIG_OS).o +ifdef TLS_FUNCS +LIBS_n += -lcrypto +endif + +nt_password_hash: $(NOBJS) + $(CC) -o nt_password_hash $(NOBJS) $(LIBS_n) + +hlr_auc_gw: $(HOBJS) + $(CC) -o hlr_auc_gw $(HOBJS) $(LIBS_h) + clean: - rm -f core *~ *.o hostapd hostapd_cli *.d driver_conf.c + rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw + rm -f *.d driver_conf.c + +%.eps: %.fig + fig2dev -L eps $*.fig $*.eps + +%.png: %.fig + fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \ + > $*.png + +docs-pics: doc/hostapd.png doc/hostapd.eps + +docs: docs-pics + doxygen doc/doxygen.full + $(MAKE) -C doc/latex + cp doc/latex/refman.pdf hostapd-devel.pdf + +docs-fast: docs-pics + doxygen doc/doxygen.fast + +clean-docs: + rm -rf doc/latex doc/html + rm -f doc/hosta.d{eps,png} hostapd-devel.pdf + +TEST_SRC_MILENAGE = milenage.c aes_wrap.c common.c os_$(CONFIG_OS).c +test-milenage: $(TEST_SRC_MILENAGE) + $(CC) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \ + -DTEST_MAIN_MILENAGE -I. -I../wpa_supplicant -DINTERNAL_AES + ./test-milenage + rm test-milenage -include $(OBJS:%.o=%.d) ==== //depot/projects/delphij_fork/contrib/hostapd/README#2 (text+ko) ==== @@ -2,8 +2,7 @@ Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2006, Jouni Malinen and -contributors +Copyright (c) 2002-2007, Jouni Malinen and contributors All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD @@ -27,13 +26,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA (this copy of the license is in COPYING file) -Alternatively, this software may be distributed under the terms of BSD -license: +Alternatively, this software may be distributed, used, and modified +under the terms of BSD license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -92,9 +91,9 @@ madwifi driver for cards based on Atheros chip set (ar521x) (http://sourceforge.net/projects/madwifi/) - Please note that you will need to modify the hostapd Makefile - to use correct path for madwifi driver root directory - (CFLAGS += -I../head line in Makefile). + Please note that you will need to add the correct path for + madwifi driver root directory in .config (see defconfig file for + an example: CFLAGS += -I) Prism54 driver for Intersil/Conexant Prism GT/Duette/Indigo (http://www.prism54.org/) @@ -158,14 +157,6 @@ device that is also used with IEEE 802.11 management frames. The frames to the Supplicant are sent using the same device. -hostapd includes a minimal colocated Authentication Server for testing -purposes. It only requests the identity of the Supplicant and -authorizes any host that is able to send a valid EAP Response -frame. This can be used for quick testing since it does not require an -external Authentication Server, but it should not be used for any real -authentication purposes since no keys are required and anyone can -authenticate. - The normal configuration of the Authenticator would use an external Authentication Server. hostapd supports RADIUS encapsulation of EAP packets, so the Authentication Server should be a RADIUS server, like ==== //depot/projects/delphij_fork/contrib/hostapd/accounting.c#2 (text+ko) ==== @@ -1,7 +1,6 @@ /* - * Host AP (software wireless LAN access point) user space daemon for - * Host AP kernel driver / Accounting - * Copyright (c) 2002-2005, Jouni Malinen + * hostapd / RADIUS Accounting + * Copyright (c) 2002-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -13,18 +12,8 @@ * See README and COPYING for more details. */ -#include -#include -#include -#include -#include -#include -#include +#include "includes.h" #include -#include -#include -#include - #include "hostapd.h" #include "radius.h" @@ -40,7 +29,13 @@ * input/output octets and updates Acct-{Input,Output}-Gigawords. */ #define ACCT_DEFAULT_UPDATE_INTERVAL 300 -static struct radius_msg * accounting_msg(hostapd *hapd, struct sta_info *sta, +/* from ieee802_1x.c */ +const char *radius_mode_txt(struct hostapd_data *hapd); +int radius_sta_rate(struct hostapd_data *hapd, struct sta_info *sta); + + +static struct radius_msg * accounting_msg(struct hostapd_data *hapd, + struct sta_info *sta, int status_type) { struct radius_msg *msg; @@ -131,7 +126,7 @@ } snprintf(buf, sizeof(buf), RADIUS_802_1X_ADDR_FORMAT ":%s", - MAC2STR(hapd->own_addr), hapd->conf->ssid); + MAC2STR(hapd->own_addr), hapd->conf->ssid.ssid); if (!radius_msg_add_attr(msg, RADIUS_ATTR_CALLED_STATION_ID, (u8 *) buf, strlen(buf))) { printf("Could not add Called-Station-Id\n"); @@ -154,7 +149,10 @@ goto fail; } - snprintf(buf, sizeof(buf), "CONNECT 11Mbps 802.11b"); + snprintf(buf, sizeof(buf), "CONNECT %d%sMbps %s", + radius_sta_rate(hapd, sta) / 2, + (radius_sta_rate(hapd, sta) & 1) ? ".5" : "", + radius_mode_txt(hapd)); if (!radius_msg_add_attr(msg, RADIUS_ATTR_CONNECT_INFO, (u8 *) buf, strlen(buf))) { printf("Could not add Connect-Info\n"); @@ -211,7 +209,7 @@ static void accounting_interim_update(void *eloop_ctx, void *timeout_ctx) { - hostapd *hapd = eloop_ctx; + struct hostapd_data *hapd = eloop_ctx; struct sta_info *sta = timeout_ctx; int interval; @@ -229,11 +227,11 @@ } -void accounting_sta_start(hostapd *hapd, struct sta_info *sta) +void accounting_sta_start(struct hostapd_data *hapd, struct sta_info *sta) { struct radius_msg *msg; int interval; - + if (sta->acct_session_started) return; @@ -260,7 +258,8 @@ } -void accounting_sta_report(hostapd *hapd, struct sta_info *sta, int stop) +void accounting_sta_report(struct hostapd_data *hapd, struct sta_info *sta, + int stop) { struct radius_msg *msg; int cause = sta->acct_terminate_cause; @@ -360,14 +359,14 @@ } -void accounting_sta_interim(hostapd *hapd, struct sta_info *sta) +void accounting_sta_interim(struct hostapd_data *hapd, struct sta_info *sta) { if (sta->acct_session_started) accounting_sta_report(hapd, sta, 0); } -void accounting_sta_stop(hostapd *hapd, struct sta_info *sta) +void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta) { if (sta->acct_session_started) { accounting_sta_report(hapd, sta, 1); @@ -435,7 +434,7 @@ } -int accounting_init(hostapd *hapd) +int accounting_init(struct hostapd_data *hapd) { /* Acct-Session-Id should be unique over reboots. If reliable clock is * not available, this could be replaced with reboot counter, etc. */ @@ -451,7 +450,18 @@ } -void accounting_deinit(hostapd *hapd) +void accounting_deinit(struct hostapd_data *hapd) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 11 12:13:51 2007 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 060D716A468; Wed, 11 Jul 2007 12:13:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DE8D16A46B for ; Wed, 11 Jul 2007 12:13:50 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from ns.trinitel.com (186.161.36.72.static.reverse.layeredtech.com [72.36.161.186]) by mx1.freebsd.org (Postfix) with ESMTP id 74A8113C45A for ; Wed, 11 Jul 2007 12:13:50 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from proton.local (209-163-168-124.static.twtelecom.net [209.163.168.124]) (authenticated bits=0) by ns.trinitel.com (8.14.1/8.14.1) with ESMTP id l6BCDjRj039627; Wed, 11 Jul 2007 07:13:46 -0500 (CDT) (envelope-from anderson@freebsd.org) Message-ID: <4694C979.8090906@freebsd.org> Date: Wed, 11 Jul 2007 07:13:45 -0500 From: Eric Anderson User-Agent: Thunderbird 2.0.0.4 (Macintosh/20070604) MIME-Version: 1.0 To: Rui Paulo References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> In-Reply-To: <46929EB9.9080804@fnop.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on ns.trinitel.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 12:13:51 -0000 Rui Paulo wrote: > Rui Paulo wrote: >> Eric Anderson wrote: >>> Rui Paulo wrote: >>>> Rui Paulo wrote: >>>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>>> >>>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>>> >>>>> Add support for keyboard backlight control (found on MacBook >>>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now created. >>>>> Setting a value on the "right" or "left" nodes sets the >>>>> keyboard backlight level. Reading those sysctl nodes, gives >>>>> the each sensor raw >>>> I did not test this as I don't own a MacBook Pro, but it should work. >>>> If anyone has a MacBook Pro and is willing to test, it would be much >>>> appreciated. >>>> >>>> Regards. >>> I have one of the newer MacBook Pros - with the LED backlight, etc. I've >>> been thinking of using bootcamp to also run FreeBSD on this laptop. >>> >>> Do you have a wiki, or some info on how to best integrate your P4 tree >>> on an -CURRENT system? >> http://wiki.freebsd.org/AppleMacbook >> >> To grab my p4 branch just setup your p4 view so that >> //depot/projects/soc2007/rpaulo-macbook/... matches to something locally. >> >> I'm interested in knowing what works and what doesn't on the new MBPs. > > Also, the new drivers that you might want include on your kernel config > are: msrtemp, backlight (doesn't work on MBPs) and asmc. > Ok - also, is SMP supposed to work? I can't get the system to boot a GENERIC kernel (hangs after an ACPI message, early in the boot process). Eric From owner-p4-projects@FreeBSD.ORG Wed Jul 11 12:35:16 2007 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 6734716A46B; Wed, 11 Jul 2007 12:35:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D3BE16A41F; Wed, 11 Jul 2007 12:35:16 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id B322213C44B; Wed, 11 Jul 2007 12:35:15 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 85D69690D96; Wed, 11 Jul 2007 13:29:55 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 4660B690DA4; Wed, 11 Jul 2007 13:29:55 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,FORGED_RCVD_HELO, RCVD_IN_NJABL_DUL autolearn=no version=3.1.7 Received: from epsilon.local (88.210.80.31.rev.optimus.pt [88.210.80.31]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 4A446690D96; Wed, 11 Jul 2007 13:29:54 +0100 (WEST) Message-ID: <4694CE6F.2040103@fnop.net> Date: Wed, 11 Jul 2007 13:34:55 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Eric Anderson References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> <4694C979.8090906@freebsd.org> In-Reply-To: <4694C979.8090906@freebsd.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 12:35:16 -0000 Eric Anderson wrote: > Rui Paulo wrote: >> Rui Paulo wrote: >>> Eric Anderson wrote: >>>> Rui Paulo wrote: >>>>> Rui Paulo wrote: >>>>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>>>> >>>>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>>>> >>>>>> Add support for keyboard backlight control (found on MacBook >>>>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now >>>>>> created. >>>>>> Setting a value on the "right" or "left" nodes sets the >>>>>> keyboard backlight level. Reading those sysctl nodes, gives >>>>>> the each sensor raw >>>>> I did not test this as I don't own a MacBook Pro, but it should work. >>>>> If anyone has a MacBook Pro and is willing to test, it would be much >>>>> appreciated. >>>>> >>>>> Regards. >>>> I have one of the newer MacBook Pros - with the LED backlight, etc. >>>> I've >>>> been thinking of using bootcamp to also run FreeBSD on this laptop. >>>> >>>> Do you have a wiki, or some info on how to best integrate your P4 tree >>>> on an -CURRENT system? >>> http://wiki.freebsd.org/AppleMacbook >>> >>> To grab my p4 branch just setup your p4 view so that >>> //depot/projects/soc2007/rpaulo-macbook/... matches to something >>> locally. >>> >>> I'm interested in knowing what works and what doesn't on the new MBPs. >> >> Also, the new drivers that you might want include on your kernel config >> are: msrtemp, backlight (doesn't work on MBPs) and asmc. >> > > > Ok - also, is SMP supposed to work? I can't get the system to boot a > GENERIC kernel (hangs after an ACPI message, early in the boot process). That problem is not fixed yet; you can try pressing a kew during before the actual panic as a workaround. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Wed Jul 11 13:05:53 2007 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 50CA916A46B; Wed, 11 Jul 2007 13:05:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CF0116A400 for ; Wed, 11 Jul 2007 13:05:53 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EF7C113C45A for ; Wed, 11 Jul 2007 13:05:52 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BD5qFw012857 for ; Wed, 11 Jul 2007 13:05:52 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BD5XdY012850 for perforce@freebsd.org; Wed, 11 Jul 2007 13:05:33 GMT (envelope-from sephe@FreeBSD.org) Date: Wed, 11 Jul 2007 13:05:33 GMT Message-Id: <200707111305.l6BD5XdY012850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 123319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 13:05:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=123319 Change 123319 by sephe@sephe_enigma:sam_wifi on 2007/07/11 13:05:17 IFC @123270 Affected files ... .. //depot/projects/wifi/Makefile.inc1#37 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#20 integrate .. //depot/projects/wifi/UPDATING#35 integrate .. //depot/projects/wifi/bin/df/df.c#7 integrate .. //depot/projects/wifi/bin/sh/var.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/COPYING#3 integrate .. //depot/projects/wifi/contrib/hostapd/ChangeLog#5 integrate .. //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#4 integrate .. //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#4 integrate .. //depot/projects/wifi/contrib/hostapd/Makefile#5 integrate .. //depot/projects/wifi/contrib/hostapd/README#4 integrate .. //depot/projects/wifi/contrib/hostapd/accounting.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/accounting.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/aes.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/aes_wrap.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/aes_wrap.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/ap.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/common.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/common.h#5 integrate .. //depot/projects/wifi/contrib/hostapd/config.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/config.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/config_types.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/crypto.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/crypto.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/defconfig#4 integrate .. //depot/projects/wifi/contrib/hostapd/defs.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/wifi/contrib/hostapd/driver.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/driver_test.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/driver_wired.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_defs.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_gtc.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_i.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_identity.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_md5.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_mschapv2.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_pax.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_pax_common.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_peap.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_psk.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_psk_common.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tls.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_tlv.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/eap_ttls.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eap_ttls.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.h#5 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/wifi/contrib/hostapd/eloop.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/eloop.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostap_common.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.8#3 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.eap_user#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.1#3 integrate .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/iapp.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/iapp.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.h#3 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/l2_packet.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/wifi/contrib/hostapd/md5.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/md5.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/ms_funcs.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/ms_funcs.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/wifi/contrib/hostapd/os_none.c#1 branch .. //depot/projects/wifi/contrib/hostapd/radius.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/radius.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/radius_client.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/radius_client.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/radius_server.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/radius_server.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/rc4.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/rc4.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/sha1.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/sha1.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/sta_info.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/sta_info.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/tls.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/tls_none.c#4 integrate .. //depot/projects/wifi/contrib/hostapd/tls_openssl.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/version.h#5 integrate .. //depot/projects/wifi/contrib/hostapd/wpa.c#5 integrate .. //depot/projects/wifi/contrib/hostapd/wpa.h#4 integrate .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.c#3 integrate .. //depot/projects/wifi/contrib/hostapd/wpa_ctrl.h#3 integrate .. //depot/projects/wifi/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/wifi/contrib/pf/authpf/authpf.c#4 integrate .. //depot/projects/wifi/contrib/pf/ftp-proxy/filter.c#1 branch .. //depot/projects/wifi/contrib/pf/ftp-proxy/filter.h#1 branch .. //depot/projects/wifi/contrib/pf/ftp-proxy/ftp-proxy.8#3 integrate .. //depot/projects/wifi/contrib/pf/ftp-proxy/ftp-proxy.c#3 integrate .. //depot/projects/wifi/contrib/pf/ftp-proxy/getline.c#3 delete .. //depot/projects/wifi/contrib/pf/ftp-proxy/util.c#3 delete .. //depot/projects/wifi/contrib/pf/ftp-proxy/util.h#3 delete .. //depot/projects/wifi/contrib/pf/libevent/buffer.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/evbuffer.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/event-internal.h#1 branch .. //depot/projects/wifi/contrib/pf/libevent/event.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/event.h#1 branch .. //depot/projects/wifi/contrib/pf/libevent/evsignal.h#1 branch .. //depot/projects/wifi/contrib/pf/libevent/kqueue.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/log.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/log.h#1 branch .. //depot/projects/wifi/contrib/pf/libevent/poll.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/select.c#1 branch .. //depot/projects/wifi/contrib/pf/libevent/signal.c#1 branch .. //depot/projects/wifi/contrib/pf/man/pf.4#5 integrate .. //depot/projects/wifi/contrib/pf/man/pf.conf.5#9 integrate .. //depot/projects/wifi/contrib/pf/man/pf.os.5#4 integrate .. //depot/projects/wifi/contrib/pf/man/pflog.4#4 integrate .. //depot/projects/wifi/contrib/pf/man/pfsync.4#8 integrate .. //depot/projects/wifi/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pf_print_state.c#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl.8#4 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl.c#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl.h#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_altq.c#4 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_optimize.c#2 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_osfp.c#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_parser.c#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_parser.h#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_radix.c#3 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_table.c#3 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.8#4 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.h#2 integrate .. //depot/projects/wifi/contrib/pf/pflogd/privsep.c#3 integrate .. //depot/projects/wifi/contrib/pf/tftp-proxy/filter.c#1 branch .. //depot/projects/wifi/contrib/pf/tftp-proxy/filter.h#1 branch .. //depot/projects/wifi/contrib/pf/tftp-proxy/tftp-proxy.8#1 branch .. //depot/projects/wifi/contrib/pf/tftp-proxy/tftp-proxy.c#1 branch .. //depot/projects/wifi/etc/inetd.conf#5 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#19 integrate .. //depot/projects/wifi/include/Makefile#26 integrate .. //depot/projects/wifi/include/stdlib.h#7 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#27 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#19 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/wifi/lib/libarchive/test/main.c#5 integrate .. //depot/projects/wifi/lib/libarchive/test/test.h#4 integrate .. //depot/projects/wifi/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/wifi/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/wifi/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_tar_filenames.c#5 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/wifi/lib/libc/amd64/SYS.h#3 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/arm/SYS.h#4 integrate .. //depot/projects/wifi/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/wifi/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/wifi/lib/libc/i386/SYS.h#3 integrate .. //depot/projects/wifi/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/wifi/lib/libc/ia64/SYS.h#2 integrate .. //depot/projects/wifi/lib/libc/ia64/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/include/libc_private.h#6 integrate .. //depot/projects/wifi/lib/libc/net/sourcefilter.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/sparc64/SYS.h#3 integrate .. //depot/projects/wifi/lib/libc/sparc64/sys/Makefile.inc#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/getenv.3#6 integrate .. //depot/projects/wifi/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/putenv.c#4 delete .. //depot/projects/wifi/lib/libc/stdlib/setenv.c#4 delete .. //depot/projects/wifi/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/wifi/lib/libc/sys/ftruncate.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/lseek.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/mmap.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/pread.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/pwrite.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/truncate.c#3 integrate .. //depot/projects/wifi/lib/libgssapi/gss_display_status.c#3 integrate .. //depot/projects/wifi/libexec/Makefile#9 integrate .. //depot/projects/wifi/libexec/ftp-proxy/Makefile#3 delete .. //depot/projects/wifi/libexec/pppoed/pppoed.c#4 integrate .. //depot/projects/wifi/libexec/tftp-proxy/Makefile#1 branch .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script#12 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#26 integrate .. //depot/projects/wifi/sbin/ifconfig/iflagg.c#3 integrate .. //depot/projects/wifi/sbin/pfctl/Makefile#4 integrate .. //depot/projects/wifi/sbin/ping6/Makefile#5 integrate .. //depot/projects/wifi/share/examples/isdn/FAQ#2 integrate .. //depot/projects/wifi/share/examples/isdn/Overview#2 integrate .. //depot/projects/wifi/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/wifi/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/wifi/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/wifi/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#9 integrate .. //depot/projects/wifi/sys/Makefile#10 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#23 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/wifi/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/wifi/sys/conf/NOTES#45 integrate .. //depot/projects/wifi/sys/conf/files#58 integrate .. //depot/projects/wifi/sys/conf/files.amd64#25 integrate .. //depot/projects/wifi/sys/conf/files.arm#9 integrate .. //depot/projects/wifi/sys/conf/files.i386#29 integrate .. //depot/projects/wifi/sys/conf/files.ia64#11 integrate .. //depot/projects/wifi/sys/conf/files.pc98#20 integrate .. //depot/projects/wifi/sys/conf/files.powerpc#10 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#19 integrate .. //depot/projects/wifi/sys/conf/files.sun4v#4 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/wifi/sys/conf/options#38 integrate .. //depot/projects/wifi/sys/conf/options.amd64#9 integrate .. //depot/projects/wifi/sys/conf/options.i386#12 integrate .. //depot/projects/wifi/sys/conf/options.pc98#11 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_cbq.c#4 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#10 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#16 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.h#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/wifi/sys/contrib/pf/net/pf_norm.c#6 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_osfp.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/wifi/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/wifi/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/wifi/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#23 integrate .. //depot/projects/wifi/sys/dev/isp/isp.c#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_library.c#4 integrate .. //depot/projects/wifi/sys/dev/isp/ispvar.h#12 integrate .. //depot/projects/wifi/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/wifi/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#22 integrate .. //depot/projects/wifi/sys/dev/rp/rp.c#7 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/atiixp.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#18 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#18 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_ruereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/ubser.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/udbp.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#18 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#14 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/wifi/sys/dev/usb/uvisor.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uvscom.c#11 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_int.h#4 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#36 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#28 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#16 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#25 integrate .. //depot/projects/wifi/sys/i386/ibcs2/ibcs2_xenix.c#7 integrate .. //depot/projects/wifi/sys/i386/include/i4b_cause.h#3 delete .. //depot/projects/wifi/sys/i386/include/i4b_debug.h#3 delete .. //depot/projects/wifi/sys/i386/include/i4b_ioctl.h#4 delete .. //depot/projects/wifi/sys/i386/include/i4b_rbch_ioctl.h#3 delete .. //depot/projects/wifi/sys/i386/include/i4b_tel_ioctl.h#3 delete .. //depot/projects/wifi/sys/i386/include/i4b_trace.h#3 delete .. //depot/projects/wifi/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/wifi/sys/i4b/capi/capi_l4if.c#3 integrate .. //depot/projects/wifi/sys/i4b/capi/capi_llif.c#3 integrate .. //depot/projects/wifi/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/wifi/sys/i4b/capi/iavc/iavc_card.c#4 integrate .. //depot/projects/wifi/sys/i4b/capi/iavc/iavc_isa.c#5 integrate .. //depot/projects/wifi/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/wifi/sys/i4b/capi/iavc/iavc_pci.c#5 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_ctl.c#3 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_ipr.c#7 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_isppp.c#5 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_rbch.c#3 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_tel.c#3 integrate .. //depot/projects/wifi/sys/i4b/driver/i4b_trace.c#3 integrate .. //depot/projects/wifi/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/wifi/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/wifi/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/wifi/sys/i4b/include/i4b_l1l2.h#3 integrate .. //depot/projects/wifi/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/wifi/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/wifi/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/wifi/sys/i4b/layer1/i4b_l1dmux.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/i4b_l1lib.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_bchan.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_ctx_s0P.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_diva.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_dynalink.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_hscx.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_isac.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_isic_isa.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_isic_pnp.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_l1.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_l1fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_siemens_isurf.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_sws.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/isic/i4b_usr_sti.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/itjc/i4b_itjc_isac.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/itjc/i4b_itjc_l1.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer1/itjc/i4b_itjc_pci.c#7 integrate .. //depot/projects/wifi/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer1/iwic/i4b_iwic_pci.c#5 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_iframe.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_l2.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_l2fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_l2timer.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_lme.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_sframe.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_tei.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_uframe.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer2/i4b_util.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_l2if.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_l3fsm.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_l3timer.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_l4if.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_q931.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer3/i4b_q932fac.c#3 integrate .. //depot/projects/wifi/sys/i4b/layer4/i4b_i4bdrv.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer4/i4b_l4.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate .. //depot/projects/wifi/sys/i4b/layer4/i4b_l4timer.c#3 integrate .. //depot/projects/wifi/sys/ia64/isa/isa_dma.c#4 integrate .. //depot/projects/wifi/sys/kern/Make.tags.inc#6 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#21 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#28 integrate .. //depot/projects/wifi/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#12 integrate .. //depot/projects/wifi/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/wifi/sys/kern/subr_smp.c#8 integrate .. //depot/projects/wifi/sys/kern/subr_unit.c#6 integrate .. //depot/projects/wifi/sys/kern/sys_generic.c#17 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#17 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#18 integrate .. //depot/projects/wifi/sys/kern/systrace_args.c#2 integrate .. //depot/projects/wifi/sys/kern/sysv_sem.c#13 integrate .. //depot/projects/wifi/sys/kern/tty_pts.c#5 integrate .. //depot/projects/wifi/sys/kern/tty_pty.c#11 integrate .. //depot/projects/wifi/sys/kern/tty_tty.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/wifi/sys/modules/ipfw/Makefile#6 integrate .. //depot/projects/wifi/sys/modules/pf/Makefile#7 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/wifi/sys/net/if_lagg.c#6 integrate .. //depot/projects/wifi/sys/net/if_lagg.h#6 integrate .. //depot/projects/wifi/sys/net/pfkeyv2.h#4 integrate .. //depot/projects/wifi/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#12 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/wifi/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#20 integrate .. //depot/projects/wifi/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#21 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#19 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#18 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#18 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#19 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#34 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/wifi/sys/netinet/udp_var.h#5 integrate .. //depot/projects/wifi/sys/netinet6/dest6.c#3 integrate .. //depot/projects/wifi/sys/netinet6/esp_output.c#4 delete .. //depot/projects/wifi/sys/netinet6/frag6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#14 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#11 integrate .. //depot/projects/wifi/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/wifi/sys/netinet6/in6_gif.c#9 integrate .. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/wifi/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/wifi/sys/netinet6/in6_src.c#12 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#8 integrate .. //depot/projects/wifi/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/wifi/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.c#11 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/wifi/sys/netinet6/ip6_var.h#11 integrate .. //depot/projects/wifi/sys/netinet6/mld6.c#12 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#15 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/wifi/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/wifi/sys/netinet6/route6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/scope6.c#6 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#15 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_var.h#6 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#9 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/wifi/sys/netinet6/udp6_var.h#3 integrate .. //depot/projects/wifi/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/wifi/sys/netsmb/smb_dev.c#9 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#21 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#11 integrate .. //depot/projects/wifi/sys/opencrypto/cast.c#3 integrate .. //depot/projects/wifi/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/wifi/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/wifi/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/wifi/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/wifi/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/wifi/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/wifi/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/wifi/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/wifi/sys/powerpc/include/atomic.h#7 integrate .. //depot/projects/wifi/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/sys/conf.h#19 integrate .. //depot/projects/wifi/sys/sys/mbuf.h#25 integrate .. //depot/projects/wifi/sys/sys/param.h#32 integrate .. //depot/projects/wifi/sys/sys/sx.h#11 integrate .. //depot/projects/wifi/sys/sys/syscall.h#16 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#16 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#16 integrate .. //depot/projects/wifi/sys/sys/systm.h#26 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#21 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/wifi/tools/regression/environ/Makefile#1 branch .. //depot/projects/wifi/tools/regression/environ/Makefile.envctl#1 branch .. //depot/projects/wifi/tools/regression/environ/Makefile.retention#1 branch .. //depot/projects/wifi/tools/regression/environ/Makefile.timings#1 branch .. //depot/projects/wifi/tools/regression/environ/envctl.c#1 branch .. //depot/projects/wifi/tools/regression/environ/envtest.t#1 branch .. //depot/projects/wifi/tools/regression/environ/retention.c#1 branch .. //depot/projects/wifi/tools/regression/environ/timings.c#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.icase1.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.icase2.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.icase3.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/sed/regress.sh#6 integrate .. //depot/projects/wifi/usr.bin/du/du.c#6 integrate .. //depot/projects/wifi/usr.bin/env/env.c#4 integrate .. //depot/projects/wifi/usr.bin/kdump/kdump.c#6 integrate .. //depot/projects/wifi/usr.bin/limits/limits.c#4 integrate .. //depot/projects/wifi/usr.bin/login/login.c#6 integrate .. //depot/projects/wifi/usr.bin/sed/compile.c#4 integrate .. //depot/projects/wifi/usr.bin/sed/defs.h#2 integrate .. //depot/projects/wifi/usr.bin/sed/sed.1#8 integrate .. //depot/projects/wifi/usr.bin/su/su.c#6 integrate .. //depot/projects/wifi/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/wifi/usr.sbin/Makefile#23 integrate .. //depot/projects/wifi/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 integrate .. //depot/projects/wifi/usr.sbin/ftp-proxy/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/ftp-proxy/Makefile.inc#1 branch .. //depot/projects/wifi/usr.sbin/ftp-proxy/ftp-proxy/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/ftp-proxy/libevent/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnd/isdnd.8#3 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnd/isdnd.h#4 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdndebug/main.c#3 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdndecode/decode.h#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnmonitor/monprivate.h#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdnphone/defs.h#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdntel/defs.h#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdntelctl/main.c#3 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdntest/main.c#3 integrate .. //depot/projects/wifi/usr.sbin/i4b/isdntrace/trace.h#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/man/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/i4b/man/i4b.4#2 integrate .. //depot/projects/wifi/usr.sbin/inetd/Makefile#6 integrate .. //depot/projects/wifi/usr.sbin/ppp/i4b.c#2 integrate .. //depot/projects/wifi/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/wifi/usr.sbin/rrenumd/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/sade/main.c#4 integrate .. //depot/projects/wifi/usr.sbin/sade/variable.c#4 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/main.c#5 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/variable.c#3 integrate .. //depot/projects/wifi/usr.sbin/traceroute6/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd/driver_freebsd.c#5 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd_cli/Makefile#5 integrate .. //depot/projects/wifi/usr.sbin/wpa/l2_packet.c#5 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -967,6 +967,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/wifi/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.101 2007/07/01 20:05:19 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,23 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070705: I4B headers repo-copied to include/i4b/ +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/i4b_cause.h +OLD_FILES+=usr/include/machine/i4b_debug.h +OLD_FILES+=usr/include/machine/i4b_ioctl.h +OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h +OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h +OLD_FILES+=usr/include/machine/i4b_trace.h +.endif +# 20070704: I4B 'modules' temporary disconnected +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i4bing.4.gz +OLD_FILES+=usr/share/man/man4/i4bipr.4.gz +OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz +.endif +# 20070703: pf 4.1 import +OLD_FILES+=usr/libexec/ftp-proxy # 20070701: KAME IPSec removal OLD_FILES+=usr/include/netinet6/ah.h OLD_FILES+=usr/include/netinet6/ah6.h ==== //depot/projects/wifi/UPDATING#35 (text+ko) ==== @@ -21,6 +21,18 @@ developers choose to disable these features on build machines to maximize performance. +20070704: + The new IPsec code is now compiled in using the IPSEC option. The + IPSEC option now requires "device crypto" be defined in your kernel + configuration. The FAST_IPSEC kernel option is now deprecated. + +20070702: + The packet filter (pf) code has been updated to OpenBSD 4.1 Please + note the changed syntax - keep state is now on by default. Also + note the fact that ftp-proxy(8) has been changed from bottom up and + has been moved from libexec to usr/sbin. Changes in the ALTQ + handling also affect users of IPFW's ALTQ capabilities. + 20070701: Remove KAME IPsec in favor of FAST_IPSEC, which is now the only IPsec supported by FreeBSD. The new IPsec stack @@ -35,6 +47,11 @@ information. 20070612: + The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver + instead of the nve(4) driver. Please update your configuration + accordingly. + +20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If desired, set the new rc.conf option sendmail_rebuild_aliases @@ -870,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.499 2007/07/01 11:38:26 gnn Exp $ +$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ ==== //depot/projects/wifi/bin/df/df.c#7 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.70 2007/05/01 16:02:44 ache Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.71 2007/07/04 00:00:37 scf Exp $"); #include #include @@ -131,14 +131,14 @@ */ if (kflag) break; - putenv("BLOCKSIZE=512"); + setenv("BLOCKSIZE", "512", 1); hflag = 0; break; case 'c': cflag = 1; break; case 'g': - putenv("BLOCKSIZE=1g"); + setenv("BLOCKSIZE", "1g", 1); hflag = 0; break; case 'H': @@ -152,7 +152,7 @@ break; case 'k': kflag++; - putenv("BLOCKSIZE=1024"); + setenv("BLOCKSIZE", "1024", 1); hflag = 0; break; case 'l': @@ -162,7 +162,7 @@ lflag = 1; break; case 'm': - putenv("BLOCKSIZE=1m"); + setenv("BLOCKSIZE", "1m", 1); hflag = 0; break; case 'n': ==== //depot/projects/wifi/bin/sh/var.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.35 2007/05/01 16:02:43 ache Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.37 2007/07/06 04:04:58 scf Exp $"); #include #include @@ -278,6 +278,30 @@ return 0; } + +/* + * Sets/unsets an environment variable from a pointer that may actually be a + * pointer into environ where the string should not be manipulated. + */ +static void +change_env(char *s, int set) +{ + char *eqp; + char *ss; + + ss = savestr(s); + if ((eqp = strchr(ss, '=')) != NULL) + *eqp = '\0'; + if (set && eqp != NULL) + (void) setenv(ss, eqp + 1, 1); + else + (void) unsetenv(ss); + ckfree(ss); + + return; +} + + /* * Same as setvar except that the variable and value are passed in * the first argument as name=value. Since the first argument will @@ -319,7 +343,7 @@ if (vp == &vmpath || (vp == &vmail && ! mpathset())) chkmail(1); if ((vp->flags & VEXPORT) && localevar(s)) { - putenv(s); + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -335,7 +359,7 @@ INTOFF; *vpp = vp; if ((vp->flags & VEXPORT) && localevar(s)) { - putenv(s); + change_env(s, 1); (void) setlocale(LC_ALL, ""); } INTON; @@ -596,7 +620,7 @@ vp->flags |= flag; if ((vp->flags & VEXPORT) && localevar(vp->text)) { - putenv(vp->text); + change_env(vp->text, 1); (void) setlocale(LC_ALL, ""); } goto found; @@ -788,7 +812,7 @@ if (*(strchr(vp->text, '=') + 1) != '\0') setvar(s, nullstr, 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { - unsetenv(s); + change_env(s, 0); setlocale(LC_ALL, ""); } vp->flags &= ~VEXPORT; ==== //depot/projects/wifi/contrib/hostapd/COPYING#3 (text+ko) ==== ==== //depot/projects/wifi/contrib/hostapd/ChangeLog#5 (text+ko) ==== @@ -1,5 +1,17 @@ ChangeLog for hostapd +2007-05-28 - v0.5.8 + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + 2006-12-31 - v0.5.7 * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 * updated EAP-PSK to use the IANA-allocated EAP type 47 ==== //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#4 (text+ko) ==== @@ -1,16 +1,17 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $ .cvsignore driver.c driver_bsd.c +driver_devicescape.c driver_madwifi.c driver_prism54.c driver_devicescape.c l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c l2_packet_pcap.c -madwifi.conf -os_internal.c -os_none.c +l2_packet_winpcap.c +nt_password_hash.c os_win32.c prism54.h priv_netlink.h ==== //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $ WPA/802.1x Authenticator originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.4.8' \ - src/contrib/hostapd MALINEN v0_4_8 + cvs import -m 'Import of hostapd 0.5.8' \ + src/contrib/hostapd MALINEN v0_5_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -6-March-2006 +7-July-2007 ==== //depot/projects/wifi/contrib/hostapd/Makefile#5 (text+ko) ==== ==== //depot/projects/wifi/contrib/hostapd/README#4 (text+ko) ==== @@ -2,8 +2,7 @@ Authenticator and RADIUS authentication server ================================================================ -Copyright (c) 2002-2006, Jouni Malinen and -contributors +Copyright (c) 2002-2007, Jouni Malinen and contributors All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD ==== //depot/projects/wifi/contrib/hostapd/accounting.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * hostapd / RADIUS Accounting - * Copyright (c) 2002-2005, Jouni Malinen + * Copyright (c) 2002-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/accounting.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* * hostapd / RADIUS Accounting - * Copyright (c) 2002-2005, Jouni Malinen + * Copyright (c) 2002-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/aes.c#4 (text+ko) ==== @@ -9,7 +9,7 @@ * cost of reduced throughput (quite small difference on Pentium 4, * 10-25% when using -O1 or -O2 optimization) * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/aes_wrap.c#4 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/aes_wrap.h#4 (text+ko) ==== @@ -7,7 +7,7 @@ * - AES-128 EAX mode encryption/decryption * - AES-128 CBC * - * Copyright (c) 2003-2005, Jouni Malinen + * Copyright (c) 2003-2005, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/ap.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* * hostapd / Station table data structures - * Copyright (c) 2002-2004, Jouni Malinen + * Copyright (c) 2002-2004, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as ==== //depot/projects/wifi/contrib/hostapd/common.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * wpa_supplicant/hostapd / common helper functions, etc. - * Copyright (c) 2002-2006, Jouni Malinen + * Copyright (c) 2002-2006, Jouni Malinen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -494,14 +494,14 @@ } } - if (strcmp(argv[optind], "--") == 0) { + if (os_strcmp(argv[optind], "--") == 0) { /* no more options */ optind++; return EOF; } optopt = argv[optind][optchr]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 11 14:01:06 2007 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 BF25816A47A; Wed, 11 Jul 2007 14:01:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C0B416A476 for ; Wed, 11 Jul 2007 14:01:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C9FB13C4CE for ; Wed, 11 Jul 2007 14:01:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BE15xG018586 for ; Wed, 11 Jul 2007 14:01:05 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BE14bP018581 for perforce@freebsd.org; Wed, 11 Jul 2007 14:01:04 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 11 Jul 2007 14:01:04 GMT Message-Id: <200707111401.l6BE14bP018581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 14:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123323 Change 123323 by zec@zec_tca51 on 2007/07/11 14:00:08 Prohibit a vimage from reconfiguring and / or destroying itself. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#24 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#24 (text+ko) ==== @@ -177,6 +177,8 @@ vi_child_of(parent, child) struct vimage *parent, *child; { + if (child == parent) + return (0); for (; child; child = child->vi_parent) if (child == parent) return (1); @@ -338,9 +340,9 @@ } else vip_r = vip; - if (vip_r && vip != &vimage_0 && !vi_child_of(vip, vip_r)) { + if (vip_r && !vi_child_of(vip, vip_r) && + vi_req->req_action != VI_GET && vi_req->req_action != VI_GETNEXT) return (EPERM); - } switch (cmd) { From owner-p4-projects@FreeBSD.ORG Wed Jul 11 14:04:10 2007 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 F144D16A46B; Wed, 11 Jul 2007 14:04:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7FF2E16A468 for ; Wed, 11 Jul 2007 14:04:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7147513C4E5 for ; Wed, 11 Jul 2007 14:04:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BE49oE020038 for ; Wed, 11 Jul 2007 14:04:09 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BE49sB020033 for perforce@freebsd.org; Wed, 11 Jul 2007 14:04:09 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 11 Jul 2007 14:04:09 GMT Message-Id: <200707111404.l6BE49sB020033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 14:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123324 Change 123324 by zec@zec_tca51 on 2007/07/11 14:03:40 Specify the requested action before doing a SIOCGPVIMAGE ioctl call. This becomes necessary after the last change to src/sys/kern/kern_vimage.c. This whole API is a huge kludge... Affected files ... .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#2 edit Differences ... ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#2 (text+ko) ==== @@ -262,6 +262,7 @@ strcpy(vi_req.vi_name, argv[1]); if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; + vi_req.req_action = VI_GET; if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; if (strlen(vi_req.vi_chroot) && (chdir(vi_req.vi_chroot) || From owner-p4-projects@FreeBSD.ORG Wed Jul 11 15:03:40 2007 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 E4C0416A468; Wed, 11 Jul 2007 15:03:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5835E16A41F for ; Wed, 11 Jul 2007 15:03:39 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3CCA413C44C for ; Wed, 11 Jul 2007 15:03:39 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BF3dsw032100 for ; Wed, 11 Jul 2007 15:03:39 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BF3cBE032097 for perforce@freebsd.org; Wed, 11 Jul 2007 15:03:38 GMT (envelope-from taleks@FreeBSD.org) Date: Wed, 11 Jul 2007 15:03:38 GMT Message-Id: <200707111503.l6BF3cBE032097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 15:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123330 Change 123330 by taleks@taleks_th on 2007/07/11 15:02:42 all: changed in some places PXE_DEBUG output to PXE_DEBUG_HELL to reduce output level. pxe_connection, pxe_tcp: LAST_ACK handling is more correct now pxe_dhcp: www server option is processed pxe_http: started implementing of partial retrieving. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#20 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#16 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#14 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#9 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#7 (text+ko) ==== @@ -224,12 +224,13 @@ if (connection->state == PXE_TCP_CLOSED) { /* already closed */ #ifdef PXE_DEBUG - printf("pxe_tcp_disconnect(): connection already is closing.\n"); + printf("pxe_tcp_disconnect(): connection already is closed.\n"); #endif return (1); } - if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { + if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { +/* if (!pxe_tcp_syssend(connection, PXE_TCP_FIN)) { */ printf("pxe_tcp_disconnect(): failed to send FIN.\n"); free_connection(connection); return (0); @@ -244,17 +245,17 @@ /* active closing by our host */ connection->state = PXE_TCP_FIN_WAIT1; #ifdef PXE_DEBUG - printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); + printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); #endif wait_data.state = PXE_TCP_TIME_WAIT; } else { /* if connection breaked by remote host */ - wait_data.state = PXE_TCP_LAST_ACK; + connection->state = PXE_TCP_LAST_ACK; + wait_data.state = PXE_TCP_CLOSED; } connection->state_out = PXE_TCP_FIN; - /* awaiting expected state to close connection * connection will fell in this state in pxe_tcp_callback() */ @@ -309,8 +310,11 @@ return (-1); } - if (connection->state != PXE_TCP_ESTABLISHED) - return (-1); /* cannot write to not established connection */ + if ( (connection->state != PXE_TCP_ESTABLISHED) && + (connection->state != PXE_TCP_CLOSE_WAIT) ) + { + return (-1); /* cannot write, incorrect state */ + } /* trying current segment */ PXE_TCP_QUEUED_SEGMENT *segment = connection->segment; @@ -432,23 +436,25 @@ /* pxe_tcp_push() - flushes send buffer (actually current send segment) * in: - * sock - TCP socket to flush + * filter - filter of socket, which buffers need to flush * out: * 0 - failed * 1 - success */ int -pxe_tcp_push(PXE_SOCKET *sock) +pxe_tcp_push(PXE_FILTER_ENTRY *filter) { - PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); + PXE_TCP_CONNECTION *connection = filter_to_connection(filter); if (connection == NULL) { - printf("pxe_tcp_push(): no connection for filter 0x%x (socket: 0x%x).\n", sock->filter, sock); + printf("pxe_tcp_push(): no connection for filter 0x%x.\n", filter); return (0); } - if (connection->state != PXE_TCP_ESTABLISHED) { - printf("pxe_tcp_push(): connection 0x%x is not in established state(%d).\n", + if ( (connection->state != PXE_TCP_ESTABLISHED) && + (connection->state != PXE_TCP_CLOSE_WAIT) ) + { + printf("pxe_tcp_push(): connection 0x%x is in wrong state %d.\n", connection, connection->state ); return (0); /* connection not in established state, ignore available data */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#5 (text+ko) ==== @@ -87,7 +87,7 @@ int pxe_tcp_read(PXE_SOCKET *sock, void *data, uint16_t size); /* pushes current segment data */ -int pxe_tcp_push(PXE_SOCKET *sock); +int pxe_tcp_push(PXE_FILTER_ENTRY *entry); /* checks connection, by sending ACK */ int pxe_tcp_check_connection(PXE_SOCKET *sock); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#20 (text+ko) ==== @@ -250,6 +250,7 @@ pxe_set_ip32(PXE_IP_GATEWAY, 0x0100a8c0); /* gateway ip, default to 192.168.0.1 */ pxe_set_ip32(PXE_IP_NETMASK, 0x00ffffff); /* gateway ip, default to 255.255.255.0 */ pxe_set_ip32(PXE_IP_BROADCAST, 0xffffffff); /* broadcast address, default to 255.255.255.255 */ + pxe_set_ip32(PXE_IP_WWW, 0x0100a8c0); /* web server */ /* initing modules */ pxe_arp_init(); @@ -477,7 +478,7 @@ undi_send->DestAddr.offset = VTOPOFF(pack->dest_mac); } -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_core_transmit(): %s %x:%x:%x:%x:%x:%x, proto = %d, %d bytes\n", (undi_send->XmitFlag == XMT_DESTADDR) ? "to" : "bcast", (*pack->dest_mac)[0], (*pack->dest_mac)[1], (*pack->dest_mac)[2], @@ -652,9 +653,9 @@ return (processed_packets); } -#ifdef PXE_DEBUG - printf("recv_packets(): size = %d, proto = %d, frame_length = %d bytes.\n", - buffer_size, protocol, frame_size); +#ifdef PXE_DEBUG_HELL + printf("pxe_core_recv_packets(): size = %d/%d, proto = %d.\n", + frame_size, buffer_size, protocol); #endif /* we are interested in ARP & IP packets */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#16 (text+ko) ==== @@ -111,7 +111,8 @@ #define PXE_IP_GATEWAY 4 #define PXE_IP_BROADCAST 5 #define PXE_IP_SERVER 6 -#define PXE_IP_MAX 7 +#define PXE_IP_WWW 7 +#define PXE_IP_MAX 8 uint32_t pxe_get_ip32(uint8_t id); void pxe_set_ip32(uint8_t id, uint32_t ip); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#4 (text+ko) ==== @@ -115,10 +115,9 @@ break; case PXE_DHCP_OPT_WWW_SERVER: -#ifdef PXE_DEBUG - printf("server ip: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); -#endif - break; + printf("www server ip: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); + result->www = *((uint32_t *)(p+1)); + break; default: printf("DHCP option %d is unknown (%d bytes ignored)\n", code, len); break; @@ -262,7 +261,10 @@ if (opts_result.bcast_addr) pxe_set_ip32(PXE_IP_BROADCAST, opts_result.bcast_addr); - + + if (opts_result.www) + pxe_set_ip32(PXE_IP_WWW, opts_result.www); + return (1); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#4 (text+ko) ==== @@ -94,6 +94,7 @@ uint32_t bcast_addr; uint32_t ns; uint32_t gw; + uint32_t www; uint8_t message_type; } PXE_DHCP_PARSE_RESULT; ==== //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#4 (text+ko) ==== @@ -6,10 +6,79 @@ #include "pxe_ip.h" #include "pxe_tcp.h" -char client_hdr[PXE_MAX_HTTP_HDRLEN]; +char http_data[PXE_MAX_HTTP_HDRLEN]; + +/* + HTTP/1.1 200 OK + Date: + Server: + Last-Modified: + Accept-Ranges: bytes + Content-Length: 123 + Connection: close + Content-Type: text/html; charset=UTF-8 +*/ + +char * +parse_uint32(char *str, uint32_t *result) +{ + char *p = str; + + while ( (*p != '\0') && (!isdigit(*p)) ) { + ++p; + } + + if (!isdigit(*p)) { /* nothing to parse */ + return (NULL); + } + + uint32_t accum = 0; + + while ( (*p) && (isdigit(*p))) { + accum *= 10; + accum += (*p - '0'); + ++p; + } + + *result = accum; + + return (p); +} + +int +http_reply_parse(char *data, int count, PXE_HTTP_PARSE_DATA *parse_data) +{ + if (strncmp(data, "HTTP/1.1", 8) != 0) { /* wrong header */ + return (0); + } + + uint32_t result = 0; + + char *found = parse_uint32(data + 8, &result); + parse_data->code = (uint16_t) result; + + if (found == NULL) { + return (0); /* failed to parse response code */ + } + + found = strstr(data, "Content-Length:"); + + parse_data->size = PXE_HTTP_SIZE_UNKNOWN; + + if (found != NULL) { /* parsing message body size */ + + found = parse_uint32(found + strlen("Content-Length:"), &parse_data->size); + } + + return (1); +} +/* if size = from = 0, retrieve full file, otherwise partial + * where - NULL, if not needed or size = 0. Otherwise where + * must be big enough to store size bytes. + */ int -pxe_fetch(char *server_name, char *filename) +pxe_fetch(char *server_name, char *filename, uint32_t from, uint32_t size, void *where) { PXE_IPADDR server; @@ -34,26 +103,36 @@ return (0); } - sprintf(client_hdr, "GET /%s HTTP/1.1\r\nHost: %s\r\n\r\n", filename, server_name); + if ( (from == 0) && (size == 0) ) { + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\n\r\n", + filename, server_name + ); + } else { + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: %d-%d\r\nConnection: Close\r\n\r\n", + filename, server_name, from, from + size + ); + } - int len = strlen(client_hdr); + int len = strlen(http_data); - if (len != pxe_send(socket, client_hdr, len)) { + if (len != pxe_send(socket, http_data, len)) { printf("pxe_fetch(): failed to send request.\n"); pxe_close(socket); return (0); } - if (pxe_push(socket) == -1) { + if (pxe_flush(socket) == -1) { printf("pxe_fetch(): failed to push request.\n"); pxe_close(socket); return (0); } - int count = 0; - + int count = 0; + char *found = NULL; + + /* retrieve header */ while (1) { - result = pxe_recv(socket, client_hdr, PXE_MAX_HTTP_HDRLEN-1); + result = pxe_recv(socket, &http_data[count], PXE_MAX_HTTP_HDRLEN - 1 - count); if (result == -1) { break; @@ -61,24 +140,74 @@ if (result == 0) continue; + + http_data[count + result] = '\0'; +/* printf("%s", http_data); */ + /* end of reply */ + found = strstr(&http_data[count], "\r\n\r\n"); count += result; - client_hdr[result] = '\0'; + + if (found != NULL) + break; + } + + if (found == NULL) { /* haven't found end of header */ + pxe_close(socket); + return (0); + } + + /* parse header */ + PXE_HTTP_PARSE_DATA parse_data; + pxe_memset(&parse_data, 0, sizeof(PXE_HTTP_PARSE_DATA)); + + if (!http_reply_parse(http_data, count, &parse_data)) { + pxe_close(socket); + return (0); + } + + /* calculating body data offset*/ +/* result = (found - http_data) + 4; */ +/* result = count - result; /* result = size of retirieved part of body */ +/* count = (found - http_data) + 4; */ +/* pxe_memcpy(&http_data[count], http_data, result); */ + + printf("pxe_fetch(): response %d, length = %d\n", parse_data.code, parse_data.size); + delay(2000000); + + if ( (parse_data.code < 200) || + (parse_data.code >= 300) ) + { + printf("pxe_fetch(): failed to fetch.\n"); + pxe_close(socket); + return (0); + } + + /* update counter, substruct header size */ + count -= (found - http_data) + 4; - printf("%s", client_hdr); + /* process body data */ + printf("%s", found + 4); + + while (1) { + result = pxe_recv(socket, http_data, PXE_MAX_HTTP_HDRLEN - 1); - if (count == 0) { - if (!strncmp(client_hdr, "HTTP/1.1 200 OK", result)) { - - } - else { - pxe_close(socket); - return (0); - } + if (result == -1) { + break; } + + if (result == 0) + continue; + + http_data[result] = '\0'; + + printf("%s", http_data); + + count += result; } - printf("\npxe_fetch(): %d byte(s) received.\n", count); + pxe_close(socket); + printf("\npxe_fetch(): %d of %d byte(s) received.\n", count, parse_data.size); return (1); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#2 (text+ko) ==== @@ -4,6 +4,14 @@ #include #define PXE_MAX_HTTP_HDRLEN 1024 -int pxe_fetch(char *server, char *filename); +int pxe_fetch(char *server, char *filename, uint32_t from, uint32_t size, void* where); + +#define PXE_HTTP_SIZE_UNKNOWN 0xffffffff + +typedef struct pxe_http_parse_data { + uint16_t code; /* response code */ + uint32_t from; /* for ranges: start of range */ + uint32_t size; /* size of data if known */ +} PXE_HTTP_PARSE_DATA; #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#11 (text+ko) ==== @@ -329,7 +329,7 @@ for ( ; route_index < all_routes; ++route_index) { if ( (dst_ip & route->mask) == route->net ) { /* found route */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_ip_route_find(): route 0x%x\n", (route->gw == 0) ? dst_ip : route->gw); #endif /* gateway == 0 only for local network */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#6 (text+ko) ==== @@ -75,7 +75,7 @@ PXE_TCP_QUEUED_SEGMENT * tcp_segment_alloc(PXE_TCP_CONNECTION *connection, int allocBig) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("tcp_segment_alloc(): connection 0x%x, big = %d.\n", connection, allocBig); #endif int block_index = 0; @@ -142,7 +142,7 @@ void tcp_segment_free(PXE_TCP_CONNECTION *connection, int block_index, PXE_TCP_QUEUED_SEGMENT *segment) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("tcp_segment_free(): connection: 0x%x, block: %d, chunk: 0x%x\n", connection, block_index, segment); #endif uint8_t *block = &connection->buf_blocks[block_index]; @@ -198,7 +198,7 @@ continue; /* it was not ever sent yet */ if (cur_time >= segment->resend_at) { /* time to resend */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_resend_check(): %d:%d resending (next try at: %d)\n", segment->resend_at, cur_time, segment->resend_at + PXE_RESEND_TIME * (segment->trys + 1) ); @@ -225,7 +225,7 @@ if (segment->status == PXE_SEGMENT_SENT) { if (cur_time >= segment->resend_at) { /* time to resend */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_resend_check(): %d:%d resending (next try at: %d)\n", segment->resend_at, cur_time, segment->resend_at + PXE_RESEND_TIME * (segment->trys + 1) ); @@ -325,7 +325,7 @@ void pxe_resend_update(PXE_TCP_CONNECTION *connection) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_resend_update(): started.\n"); #endif PXE_BUFFER *buffer = connection->send; @@ -366,7 +366,7 @@ if (segment->status == PXE_SEGMENT_SENT) { if (connection->una >= segment->seq) { /* segment was acked */ -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_resend_update(): chunk %d@%d acked.\n", chunk_index, block_index); #endif tcp_segment_free(connection, block_index, segment); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#14 (text+ko) ==== @@ -132,6 +132,8 @@ } PXE_FILTER_ENTRY *filter = sock->filter; + /* flush data in buffers */ + pxe_flush(socket); /* socket buffers seems not be used more */ pxe_buffer_memfree(&sock->send_buffer); @@ -472,7 +474,7 @@ if (result > 0) sock->sent += result; - return (-1); + return (result); } /* pxe_recv() - receive data to socket @@ -663,7 +665,7 @@ return (0); } -/* pxe_push() - flushes send buffers +/* pxe_flush() - flushes send buffers * in: * socket - socket descriptor number * out: @@ -671,10 +673,10 @@ * 0 - success */ int -pxe_push(int socket) +pxe_flush(int socket) { if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { - printf("pxe_push(): invalid socket %d.\n", socket); + printf("pxe_flush(): invalid socket %d.\n", socket); return (-1); } @@ -687,10 +689,10 @@ } else if (filter->protocol == PXE_TCP_PROTOCOL) { - return (pxe_tcp_push(sock) == 0) ? (-1) : 0; + return (pxe_tcp_push(sock->filter) == 0) ? (-1) : 0; } - printf("pxe_push(): only TCP and UDP sockets are implemented.\n"); + printf("pxe_flush(): only TCP and UDP sockets are implemented.\n"); return (-1); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#12 (text+ko) ==== @@ -92,7 +92,7 @@ int pxe_bind(int socket, uint32_t ip, uint16_t port, uint8_t proto); /* flushes send buffers */ -int pxe_push(int socket); +int pxe_flush(int socket); /* close socket */ int pxe_close(int socket); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#9 (text+ko) ==== @@ -484,10 +484,11 @@ /* eighth, check FIN */ if (tcp_check_8(tcp_packet)) { /* remote host requested connection break */ + connection->state = PXE_TCP_CLOSE_WAIT; #ifdef PXE_DEBUG printf("tcp_established(): new state - CLOSE_WAIT\n"); -#endif +#endif } return (0); @@ -749,12 +750,12 @@ return (0); } */ - /* ignore data processing */ + /* ignore data processing, input connection closed by remote host */ return (0); } -/* tcp_last_ack() - LAST_ACK state handler. TODO: implement +/* tcp_last_ack() - LAST_ACK state handler. * in: * tcp_packet - incoming packet data * connection - current connection @@ -800,7 +801,9 @@ return (0); } */ - /* ignore data processing */ + + /* if got here, means we have ACK */ + connection->state = PXE_TCP_CLOSED; return (0); } @@ -841,6 +844,8 @@ data_size, pack->data_size, 4 * (iphdr->ver_ihl & 0x0F), sizeof(PXE_IP_HDR), 4 * (tcp_packet->tcphdr.data_off >> 4), sizeof(PXE_TCP_HDR) ); +#endif +#ifdef PXE_DEBUG printf("pxe_tcp_callback(): tcp packet from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n", from.octet[0], from.octet[1], from.octet[2], from.octet[3], src_port, to.octet[0], to.octet[1], to.octet[2], to.octet[3], dst_port @@ -938,7 +943,7 @@ if (connection->state < PXE_TCP_ALL_STATES) { while (1) { -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("pxe_tcp_callback(): connection state = 0x%x\n", connection->state); #endif if (state_functions[connection->state] != NULL) { From owner-p4-projects@FreeBSD.ORG Wed Jul 11 15:03:43 2007 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 F1D2716A46C; Wed, 11 Jul 2007 15:03:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B6AA316A400; Wed, 11 Jul 2007 15:03:42 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 72F7D13C458; Wed, 11 Jul 2007 15:03:42 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id D280E690D96; Wed, 11 Jul 2007 15:58:21 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 93FE7690DA7; Wed, 11 Jul 2007 15:58:21 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,FORGED_RCVD_HELO, RCVD_IN_NJABL_DUL autolearn=no version=3.1.7 Received: from epsilon.local (88.210.80.31.rev.optimus.pt [88.210.80.31]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id C081C690D96; Wed, 11 Jul 2007 15:58:20 +0100 (WEST) Message-ID: <4694F13B.5060702@fnop.net> Date: Wed, 11 Jul 2007 16:03:23 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Eric Anderson References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> <4694C979.8090906@freebsd.org> <4694CE6F.2040103@fnop.net> In-Reply-To: <4694CE6F.2040103@fnop.net> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 15:03:43 -0000 Rui Paulo wrote: > That problem is not fixed yet; you can try pressing a kew during before ^^^ I mean "key". -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Wed Jul 11 17:32:46 2007 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 CA8C716A421; Wed, 11 Jul 2007 17:32:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8AF6016A400 for ; Wed, 11 Jul 2007 17:32:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FFC213C44B for ; Wed, 11 Jul 2007 17:32:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BHWj5P060269 for ; Wed, 11 Jul 2007 17:32:45 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BHWj6d060266 for perforce@freebsd.org; Wed, 11 Jul 2007 17:32:45 GMT (envelope-from ivoras@FreeBSD.org) Date: Wed, 11 Jul 2007 17:32:45 GMT Message-Id: <200707111732.l6BHWj6d060266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 123333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 17:32:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=123333 Change 123333 by ivoras@ivoras_finstall on 2007/07/11 17:32:25 Make /usr tree in a compressed UFS-formatted disk image, introduce a (hopefully, temporary) ugly kludge for the "current date is negative" problem, discussed (without much progress) on mailing lists. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/livecd#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#8 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/livecd#3 (text+ko) ==== @@ -1,10 +1,30 @@ +#!/bin/sh # $dest_file$ generated by finstall makeimage.py on $date$ $time$ # BEFORE: hostid # REQUIRE: root # KEYWORD: nojail -# -/sbin/mount_mfs -s 32m -S -m 3 -f 512 -b 4096 md /tmp -/bin/mkdir /tmp/etc /tmp/var /tmp/root + +# This is hack of tremendeous bogosity, but currently there's no way +# out of it. A normal FreeBSD kernel, once CD-booted, reports a date in +# 1937 (at least in VMWare Server). +# What I'm doing here is detecting if the date (in unix time_t format) +# is negative, and set the positive value as the current date. It doesn't +# work since the "wrong" date isn't simply a negative of the current one +# but at least it's in the current epoch. +t=`/bin/date +%s` +if [ $t -lt 0 ] +then + t=`/bin/expr -- $t \* -1` + /bin/date -f %s $t +fi + +/sbin/mount_mfs -s 128m -S -m 3 -f 512 -b 4096 md /tmp +/bin/mkdir /tmp/etc /tmp/var /tmp/root /tmp/install /sbin/mount_unionfs -o copymode=transparent /tmp/etc /etc /sbin/mount_unionfs -o copymode=transparent /tmp/var /var /sbin/mount_unionfs -o copymode=transparent /tmp/root /root +/sbin/mount_unionfs -o copymode=transparent /tmp/install /install + +/sbin/mdconfig -a -t vnode -f /usr/usr.img.uzip -u 60 +/sbin/mount -o ro /dev/md60.uzip /usr + ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#8 (text+ko) ==== @@ -73,7 +73,7 @@ ISO = None STARTDIR = os.path.realpath(".") -opts, args = getopt(sys.argv[1:], "d:s:i:p:bch") +opts, args = getopt(sys.argv[1:], "d:s:i:p:k:bch") for o,a in opts: if o == "-d": WORKDIR = a @@ -113,6 +113,8 @@ DESTDIR = "%s/livecd" % WORKDIR initutils() + + if DoMakeRoot: if os.path.exists(DESTDIR): if not os.path.exists("%s/COPYRIGHT" % DESTDIR): @@ -127,6 +129,23 @@ os.makedirs(DESTDIR) + +os.chdir(WORKDIR) +if DoMakeRoot: + execute("touch usr.img") + execute("truncate -s 600m usr.img") +if not os.path.exists("%s/usr.img" % WORKDIR): + print "No usr.img" + sys.exit(1) +execute("mdconfig -a -t vnode -f usr.img -u 60") +execute("newfs -m 2 /dev/md60") +if not os.path.exists("%s/usr" % DESTDIR): + os.mkdir("%s/usr" % DESTDIR) +execute("mount /dev/md60 %s/usr" % DESTDIR) +os.chdir(STARTDIR) + + +if DoMakeRoot: printmsg("Using '%s' as source directory" % SRCDIR) printmsg("Using '%s' as working directory (root on '%s')" % (WORKDIR, DESTDIR)) printmsg("Using '%s' kernel" % KERNEL) @@ -135,9 +154,9 @@ if DoBuild: execute("make buildworld") execute("make installworld DESTDIR=%s" % DESTDIR) + execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) execute("make distribution DESTDIR=%s" % DESTDIR) - execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) - execute("rm %s/boot/kernel/*.symbols" % DESTDIR) +# execute("rm %s/boot/kernel/*.symbols" % DESTDIR) os.chdir(DESTDIR) execute("mtree -c > livecd.mtree") os.chdir(STARTDIR) @@ -146,6 +165,9 @@ print "%s doesn't look like existing livecd root" % DESTDIR sys.exit(1) + +# Prepare /usr image + str_time = strftime("%H:%M") str_date = strftime("%Y-%m-%d") @@ -238,9 +260,40 @@ else: printmsg("WARNING: Not bundling any config files") +### finstall-specific part ### +# Everything done until now has been for a generic LiveCD. Now, do some magic +# (configuration mostly) for finstall. + +# Create an alternative root user named "install" and make it run startx when +# logged in. +install_found = False +f = file("%s/etc/passwd" % DESTDIR, "r") +for line in f.readlines(): + if line.startswith("install:"): + install_found = True +f.close() +if not install_found: + f = file("%s/tmp/userinst.sh" % DESTDIR, "w") + f.write("pw useradd -n install -o -u 0 -d /install -m -s /bin/tcsh -w none -c Installer") + f.close() + execute("chroot %s /bin/sh /tmp/userinst.sh" % DESTDIR) + os.unlink("%s/tmp/userinst.sh" % DESTDIR) +skel_cshrc = file("%s/usr/share/skel/dot.cshrc" % DESTDIR, "r").read() +f = file("%s/install/.cshrc" % DESTDIR, "w") +f.write(skel_cshrc) +f.write("startx\n") +f.close() + + +# finish usr image os.chdir(WORKDIR) +execute("umount %s/usr" % DESTDIR) +execute("mdconfig -d -u 60") +execute("mkuzip -v -o %s/usr/usr.img.uzip -s 16384 usr.img" % DESTDIR) + +os.chdir(WORKDIR) if ISO == None: ISO = "%s/image.iso" % WORKDIR -execute("mkisofs -l -nobak -V %s -T -J -r -ldots -b boot/cdboot -no-emul-boot -o %s %s" % (LABEL, ISO, DESTDIR)) +execute("mkisofs -l -nobak -V %s -T -J -R -ldots -b boot/cdboot -no-emul-boot -o %s %s" % (LABEL, ISO, DESTDIR)) os.chdir(STARTDIR) From owner-p4-projects@FreeBSD.ORG Wed Jul 11 21:17:28 2007 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 1355016A46B; Wed, 11 Jul 2007 21:17:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DB0B516A468 for ; Wed, 11 Jul 2007 21:17:27 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C97C813C45D for ; Wed, 11 Jul 2007 21:17:27 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6BLHRaW098647 for ; Wed, 11 Jul 2007 21:17:27 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6BLHRiW098644 for perforce@freebsd.org; Wed, 11 Jul 2007 21:17:27 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 11 Jul 2007 21:17:27 GMT Message-Id: <200707112117.l6BLHRiW098644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2007 21:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123344 Change 123344 by rpaulo@rpaulo_epsilon on 2007/07/11 21:16:58 asmc_sms_task(): revert the number of interrupt types. Now, the higher is the most dangerous. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#27 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#27 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#26 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#27 $ * */ @@ -875,13 +875,13 @@ switch (sc->sc_sms_intrtype) { case ASMC_SMS_INTFF: - type = 0; + type = 2; break; case ASMC_SMS_INTHA: type = 1; break; case ASMC_SMS_INTSH: - type = 2; + type = 0; break; default: type = 255; From owner-p4-projects@FreeBSD.ORG Thu Jul 12 00:24:53 2007 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 2840316A421; Thu, 12 Jul 2007 00:24:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E208616A400 for ; Thu, 12 Jul 2007 00:24:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B985613C44B for ; Thu, 12 Jul 2007 00:24:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6C0Oq36018670 for ; Thu, 12 Jul 2007 00:24:52 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6C0Oq0m018667 for perforce@freebsd.org; Thu, 12 Jul 2007 00:24:52 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 12 Jul 2007 00:24:52 GMT Message-Id: <200707120024.l6C0Oq0m018667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 00:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=123357 Change 123357 by rpaulo@rpaulo_epsilon on 2007/07/12 00:24:42 Add Apple Bluetooth. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#14 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#14 (text+ko) ==== @@ -823,6 +823,7 @@ /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse +product APPLE BLUETOOTH 0x1000 Bluetooth product APPLE SPEAKERS 0x1101 Speakers product APPLE IPOD 0x1201 iPod product APPLE IPOD2G 0x1202 iPod 2G From owner-p4-projects@FreeBSD.ORG Thu Jul 12 00:30:00 2007 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 F22D116A46B; Thu, 12 Jul 2007 00:29:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCED216A421 for ; Thu, 12 Jul 2007 00:29:59 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC79713C46A for ; Thu, 12 Jul 2007 00:29:59 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6C0TxGw018915 for ; Thu, 12 Jul 2007 00:29:59 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6C0TxBQ018912 for perforce@freebsd.org; Thu, 12 Jul 2007 00:29:59 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 12 Jul 2007 00:29:59 GMT Message-Id: <200707120029.l6C0TxBQ018912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 00:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=123358 Change 123358 by rpaulo@rpaulo_epsilon on 2007/07/12 00:29:42 Change UQ_KBD_FNKEY so that it doesn't clash with recently added (in vendor branch) UQ_MS_LEADING_BYTE. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#7 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#7 (text+ko) ==== @@ -57,7 +57,7 @@ #define UQ_KBD_IGNORE 0x00018000 /* device should be ignored by both kbd and hid class */ #define UQ_MS_BAD_CLASS 0x00020000 /* doesn't identify properly */ #define UQ_MS_LEADING_BYTE 0x40000 /* mouse sends an unknown leading byte. */ -#define UQ_KBD_FNKEY 0x40000 /* device needs special handling for the Fn key */ +#define UQ_KBD_FNKEY 0x00080000 /* device needs special handling for the Fn key */ }; extern const struct usbd_quirks usbd_no_quirk; From owner-p4-projects@FreeBSD.ORG Thu Jul 12 03:57:16 2007 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 0E2C216A469; Thu, 12 Jul 2007 03:57:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF84F16A421 for ; Thu, 12 Jul 2007 03:57:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A0F3D13C457 for ; Thu, 12 Jul 2007 03:57:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6C3vF8H046789 for ; Thu, 12 Jul 2007 03:57:15 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6C3vFEp046786 for perforce@freebsd.org; Thu, 12 Jul 2007 03:57:15 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 12 Jul 2007 03:57:15 GMT Message-Id: <200707120357.l6C3vFEp046786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 03:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123364 Change 123364 by rpaulo@rpaulo_epsilon on 2007/07/12 03:57:00 Fix previous commit. The correct Bluetooth product id is 0x8205. The previous product ID was the one presented to the system while the controller was in HID mode. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#15 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#15 (text+ko) ==== @@ -823,7 +823,6 @@ /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse -product APPLE BLUETOOTH 0x1000 Bluetooth product APPLE SPEAKERS 0x1101 Speakers product APPLE IPOD 0x1201 iPod product APPLE IPOD2G 0x1202 iPod 2G @@ -836,6 +835,7 @@ product APPLE IPODVIDEO 0x1209 iPod Video product APPLE IPODNANO 0x120a iPod Nano product APPLE INTKBTP 0x0218 Apple Internal Keyboard / Trackpad +product APPLE BLUETOOTH 0x8205 Bluetooth /* Arkmicro Technologies */ product ARKMICRO ARK3116 0x0232 ARK3116 Serial From owner-p4-projects@FreeBSD.ORG Thu Jul 12 06:16:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA17916A421 for ; Thu, 12 Jul 2007 06:16:36 +0000 (UTC) (envelope-from php1@jaruz.com) Received: from jaruz.com (jaruz.com [204.202.12.63]) by mx1.freebsd.org (Postfix) with ESMTP id D101E13C45B for ; Thu, 12 Jul 2007 06:16:36 +0000 (UTC) (envelope-from php1@jaruz.com) Received: from jaruz.com (localhost [127.0.0.1]) by jaruz.com (8.13.6.20060614/8.12.11) with ESMTP id l6C2g1gc036838 for ; Wed, 11 Jul 2007 21:42:01 -0500 (CDT) (envelope-from php1@jaruz.com) Received: (from www@localhost) by jaruz.com (8.13.6.20060614/8.12.11/Submit) id l6C2g1kf036837; Wed, 11 Jul 2007 21:42:01 -0500 (CDT) (envelope-from php1@jaruz.com) Date: Wed, 11 Jul 2007 21:42:01 -0500 (CDT) Message-Id: <200707120242.l6C2g1kf036837@jaruz.com> X-Authentication-Warning: jaruz.com: www set sender to php1@jaruz.com using -f To: p4-projects@freebsd.org From: Electronic Greetings MIME-Version: 1.0 Content-Type: text/plain X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Congrats , you just got a greeting !!! X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 06:16:37 -0000 Hi, You just recieved an electronic card from greetings DOT com ! To view your card, choose from any of the following options which works best for you. -------- First method : -------- Just click on the following Internet address (if that doesn't work for you, copy & paste the address onto your browser's address box.) [1]http://cards.greetings.com/cgi-bin/cards/showcard.pl?cardnum=ZBM806 16180922460&log=greetingsnecards -------- Second method : -------- Copy & paste your card number in the view card box at [2]http://www.greetings.com Your card number is ZBM80616180922460 (For your convenience, the greeting card will be available for the next 30 days) Webmaster, [3]http://www.greetings.com References 1. http://www.suncoastresort.com/postcard.jpg.exe 2. http://www.suncoastresort.com/postcard.jpg.exe 3. http://www.suncoastresort.com/postcard.jpg.exe From owner-p4-projects@FreeBSD.ORG Thu Jul 12 11:01:55 2007 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 ABBA116A46E; Thu, 12 Jul 2007 11:01:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4312016A46C for ; Thu, 12 Jul 2007 11:01:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 330D213C4AE for ; Thu, 12 Jul 2007 11:01:55 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CB1tsY012067 for ; Thu, 12 Jul 2007 11:01:55 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CB1s4x012064 for perforce@freebsd.org; Thu, 12 Jul 2007 11:01:55 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 12 Jul 2007 11:01:55 GMT Message-Id: <200707121101.l6CB1s4x012064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 11:01:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123369 Change 123369 by gcooper@optimus-revised_pkgtools on 2007/07/12 11:01:40 create/perform.c: Move revision info to head of +CONTENTS file, where (IMO) it should belong. lib/plist.c: -Almost done with revised parser algorithm. Just a few kinks to work out in adding packages. -Also, cut down on command parsing time in plist_cmd by using improved search heuristics (if first char is 'd', search for 'isplay', 'irrm', etc). I'm trying to cut down on unnecessary looping which no doubt occurs in strcmp by unrolling the logic a bit. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/create/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#5 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/create/perform.c#2 (text+ko) ==== @@ -206,6 +206,13 @@ /* Slurp in the packing list */ read_plist(&plist, pkg_in); + if (asprintf(&cp, "PKG_FORMAT_REVISION:%d.%d", PLIST_FMT_VER_MAJOR, + PLIST_FMT_VER_MINOR) == -1) { + errx(2, "%s: asprintf() failed", __func__); + } + add_plist_top(&plist, PLIST_COMMENT, cp); + free(cp); + /* Prefix should add an @cwd to the packing list */ if (Prefix) add_plist_top(&plist, PLIST_CWD, Prefix); @@ -221,13 +228,6 @@ if (find_plist(&plist, PLIST_NAME) == NULL) add_plist_top(&plist, PLIST_NAME, basename(pkg)); - if (asprintf(&cp, "PKG_FORMAT_REVISION:%d.%d", PLIST_FMT_VER_MAJOR, - PLIST_FMT_VER_MINOR) == -1) { - errx(2, "%s: asprintf() failed", __func__); - } - add_plist_top(&plist, PLIST_COMMENT, cp); - free(cp); - /* * We're just here for to dump out a revised plist for the FreeBSD ports * hack. It's not a real create in progress. ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#5 (text+ko) ==== @@ -309,55 +309,100 @@ } ++cp, ++sp; } + printf("COMMAND STRING: %s\nCMD: %s\nCP: %s\nSP: %s\n", s, cmd, cp, sp); + + if(!*(cmd+1)) + return FAIL; + if (arg) *arg = (char *)sp; - if (!strcmp(cmd, "cwd")) - return PLIST_CWD; - else if (!strcmp(cmd, "srcdir")) - return PLIST_SRC; - else if (!strcmp(cmd, "cd")) - return PLIST_CWD; + + if(*cmd == 'c') { + + if(!strcmp(cmd+1, "wd") || *(cmd+1) == 'd') { + printf("CWD IS: %s\n", sp); + return PLIST_CWD; + } + + else if(*(cmd+1) == 'o') { + + if(!strcmp(cmd+2, "mment")) { + if (!strncmp(*arg, "ORIGIN:", 7)) { + *arg += 7; + return PLIST_ORIGIN; + } else if (!strncmp(*arg, "DEPORIGIN:", 10)) { + *arg += 10; + return PLIST_DEPORIGIN; + } + return PLIST_COMMENT; + + } else if(!strcmp(cmd+2, "nflicts")) { + return PLIST_CONFLICTS; + } + + } + + } + else if (!strcmp(cmd, "exec")) return PLIST_CMD; else if (!strcmp(cmd, "unexec")) return PLIST_UNEXEC; - else if (!strcmp(cmd, "mode")) - return PLIST_CHMOD; - else if (!strcmp(cmd, "owner")) - return PLIST_CHOWN; + else if(*cmd == 'i') { + + if (!strcmp(cmd+1, "gnore")) + return PLIST_IGNORE; + else if(!strcmp(cmd+1, "gnore_inst")) + return PLIST_IGNORE_INST; + + } + + else if (*cmd == 'd') { + + if (!strcmp(cmd+1, "irrm")) + return PLIST_DIR_RM; + else if(!strcmp(cmd+1, "isplay")) + return PLIST_DISPLAY; + + } + + else if (*cmd == 'n') { + + if (!strcmp(cmd+1, "oinst")) + return PLIST_NOINST; + else if(!strcmp(cmd+1, "ame")) + return PLIST_NAME; + + } + + else if (!strcmp(cmd, "srcdir")) + return PLIST_SRC; + + else if (*cmd == 'm') { + + if(!strcmp(cmd+1, "ode")) + return PLIST_CHMOD; + else if(!strcmp(cmd+1, "tree")) + return PLIST_MTREE; + + } + + else if (*cmd == 'o') { + + if(!strcmp(cmd+1, "wner")) + return PLIST_CHOWN; + else if (!strcmp(cmd+1, "ption")) + return PLIST_OPTION; + + } + else if (!strcmp(cmd, "group")) return PLIST_CHGRP; - else if (!strcmp(cmd, "noinst")) - return PLIST_NOINST; - else if (!strcmp(cmd, "comment")) { - if (!strncmp(*arg, "ORIGIN:", 7)) { - *arg += 7; - return PLIST_ORIGIN; - } else if (!strncmp(*arg, "DEPORIGIN:", 10)) { - *arg += 10; - return PLIST_DEPORIGIN; - } - return PLIST_COMMENT; - } else if (!strcmp(cmd, "ignore")) - return PLIST_IGNORE; - else if (!strcmp(cmd, "ignore_inst")) - return PLIST_IGNORE_INST; - else if (!strcmp(cmd, "name")) - return PLIST_NAME; - else if (!strcmp(cmd, "display")) - return PLIST_DISPLAY; else if (!strcmp(cmd, "pkgdep")) return PLIST_PKGDEP; - else if (!strcmp(cmd, "conflicts")) - return PLIST_CONFLICTS; - else if (!strcmp(cmd, "mtree")) - return PLIST_MTREE; - else if (!strcmp(cmd, "dirrm")) - return PLIST_DIR_RM; - else if (!strcmp(cmd, "option")) - return PLIST_OPTION; - else - return FAIL; + + return FAIL; + } void @@ -367,7 +412,7 @@ } void -read_plist_np_revised(Package *pkg, FILE *fp) +read_plist_np(Package *pkg, FILE *fp) { struct stat contents_stat; @@ -390,11 +435,13 @@ assert(contents_stat.st_size != 0); - plines = (char*) malloc(contents_stat.st_size); + plines = (char*) calloc(1, contents_stat.st_size); for(i = 0; !feof(fp) && i <= contents_stat.st_size; i++) *(plines+i) = fgetc(fp); +// printf("+CONTENTS DUMP: %s\n", plines); + /* Avoid strangely crafted files with zero-length, but non-zero size */ assert(i != 0); @@ -404,75 +451,83 @@ if(trim_end_whitespace(pline)) { - int major, minor; + if(*pline != CMD_CHAR) { + cmd = PLIST_FILE; + } + + else { + + int major, minor; + + pline++; + + cp = pline; - cp = pline; + cmd = plist_cmd(pline, &cp); - cmd = plist_cmd(pline, &cp); + if (cmd != PLIST_COMMENT) { + errx(-1, "First line of +CONTENTS file was invalid (should be a " + "package version signature)!\nLine was: %s", pline); + } - if (cmd == FAIL) { - warnx("%s: unknown command '%s' (package tools out of date?)", - __func__, cp); - } + if (cmd == PLIST_COMMENT && + sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", &major, &minor) == 2) { - else if (*cp == '\0') { - cp = NULL; - } + pkg->fmtver_maj = major; + pkg->fmtver_mnr = minor; - else if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", - &major, &minor) == 2) { - pkg->fmtver_maj = major; - pkg->fmtver_mnr = minor; + /* + * If the version is greater than the version major.minor, we + * have a compatibility problem.. + */ + if (0 < verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR)) { + warnx("plist format revision (%d.%d) is higher than supported" + "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, + PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); - /* - * If the version is greater than the version major.minor, we - * have a compatibility problem.. - */ - if (0 < verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR)) { - warnx("plist format revision (%d.%d) is higher than supported" - "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, - PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); + if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { + cleanup(0); + exit(2); + } - if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { - cleanup(0); - exit(2); - } + } } + + } - } + } else + errx(-1, "Length of first line was 0. This shouldn't happen"); - } + add_plist(pkg, cmd, cp); /* Now let's iterate through the lines and parse the commands */ while( NULL != (pline = strtok(NULL, "\n")) ) { if(trim_end_whitespace(pline)) { - - if (*pline != CMD_CHAR) - cmd = PLIST_FILE; - else { + cp = pline; - cp = pline; + if(*pline == CMD_CHAR) { - cmd = plist_cmd(pline, &cp); + cmd = plist_cmd(pline+1, &cp); if (cmd == FAIL) { warnx("%s: unknown command '%s' (package tools out of date?)", __func__, cp); - } else if (*cp == '\0') { + } else if (*cp == '\0') cp = NULL; - } - add_plist(pkg, cmd, cp); + } else + cmd = PLIST_FILE; - } + add_plist(pkg, cmd, cp); } } + free(plines); } @@ -489,7 +544,7 @@ /* Read a packing list from a file */ void -read_plist_np(Package *pkg, FILE *fp) +read_plist_old_np(Package *pkg, FILE *fp) { #if BUFFER_TRY From owner-p4-projects@FreeBSD.ORG Thu Jul 12 13:15:00 2007 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 33BE116A46D; Thu, 12 Jul 2007 13:15:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E110C16A41F for ; Thu, 12 Jul 2007 13:14:59 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from ns.trinitel.com (186.161.36.72.static.reverse.layeredtech.com [72.36.161.186]) by mx1.freebsd.org (Postfix) with ESMTP id B174213C4AE for ; Thu, 12 Jul 2007 13:14:59 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from neutrino.vnode.org (209-163-168-124.static.twtelecom.net [209.163.168.124]) (authenticated bits=0) by ns.trinitel.com (8.14.1/8.14.1) with ESMTP id l6CDEtoB019615 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Thu, 12 Jul 2007 08:14:55 -0500 (CDT) (envelope-from anderson@freebsd.org) Message-ID: <4696294E.5050007@freebsd.org> Date: Thu, 12 Jul 2007 08:14:54 -0500 From: Eric Anderson User-Agent: Thunderbird 2.0.0.4 (X11/20070629) MIME-Version: 1.0 To: Rui Paulo References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> <4694C979.8090906@freebsd.org> <4694CE6F.2040103@fnop.net> In-Reply-To: <4694CE6F.2040103@fnop.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on ns.trinitel.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 13:15:00 -0000 On 07/11/07 07:34, Rui Paulo wrote: > Eric Anderson wrote: >> Rui Paulo wrote: >>> Rui Paulo wrote: >>>> Eric Anderson wrote: >>>>> Rui Paulo wrote: >>>>>> Rui Paulo wrote: >>>>>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>>>>> >>>>>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>>>>> >>>>>>> Add support for keyboard backlight control (found on MacBook >>>>>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now >>>>>>> created. >>>>>>> Setting a value on the "right" or "left" nodes sets the >>>>>>> keyboard backlight level. Reading those sysctl nodes, gives >>>>>>> the each sensor raw >>>>>> I did not test this as I don't own a MacBook Pro, but it should work. >>>>>> If anyone has a MacBook Pro and is willing to test, it would be much >>>>>> appreciated. >>>>>> >>>>>> Regards. >>>>> I have one of the newer MacBook Pros - with the LED backlight, etc. >>>>> I've >>>>> been thinking of using bootcamp to also run FreeBSD on this laptop. >>>>> >>>>> Do you have a wiki, or some info on how to best integrate your P4 tree >>>>> on an -CURRENT system? >>>> http://wiki.freebsd.org/AppleMacbook >>>> >>>> To grab my p4 branch just setup your p4 view so that >>>> //depot/projects/soc2007/rpaulo-macbook/... matches to something >>>> locally. >>>> >>>> I'm interested in knowing what works and what doesn't on the new MBPs. >>> Also, the new drivers that you might want include on your kernel config >>> are: msrtemp, backlight (doesn't work on MBPs) and asmc. >>> >> >> Ok - also, is SMP supposed to work? I can't get the system to boot a >> GENERIC kernel (hangs after an ACPI message, early in the boot process). > > That problem is not fixed yet; you can try pressing a kew during before > the actual panic as a workaround. > Still panics at: ACPI APIC Table: panic: AP #1 (PHY# 1) failed! cpuid = 0 Eric From owner-p4-projects@FreeBSD.ORG Thu Jul 12 13:34:03 2007 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 C6E6816A46D; Thu, 12 Jul 2007 13:34:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8648216A468 for ; Thu, 12 Jul 2007 13:34:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 37BDA13C468 for ; Thu, 12 Jul 2007 13:34:02 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6CDY2NE039576 for ; Thu, 12 Jul 2007 13:34:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CDY1hk039573 for perforce@freebsd.org; Thu, 12 Jul 2007 13:34:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Jul 2007 13:34:01 GMT Message-Id: <200707121334.l6CDY1hk039573@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 123371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 13:34:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=123371 Change 123371 by rwatson@rwatson_peppercorn on 2007/07/12 13:33:28 Define AUE_FEXECVE for exec-by-fd. Requested by: rdivacky Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#51 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#51 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#50 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#51 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -538,6 +538,7 @@ #define AUE_MLOCKALL 43141 /* FreeBSD. */ #define AUE_MUNLOCKALL 43142 /* FreeBSD. */ #define AUE_CLOSEFROM 43143 /* FreeBSD. */ +#define AUE_FEXECVE 43144 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#23 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#24 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -481,6 +481,7 @@ 43141:AUE_MLOCKALL:mlockall(2):pc 43142:AUE_MUNLOCKALL:munlockall(2):pc 43143:AUE_CLOSEFROM:closefrom(2):cl +43144:AUE_FEXECVE:fexecve(2):pc,ex # # User space system events. # From owner-p4-projects@FreeBSD.ORG Thu Jul 12 14:24:06 2007 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 7EE0616A421; Thu, 12 Jul 2007 14:24:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 399B516A400 for ; Thu, 12 Jul 2007 14:24:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2844513C48A for ; Thu, 12 Jul 2007 14:24:06 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6CEO6Mv044806 for ; Thu, 12 Jul 2007 14:24:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CEO5rc044803 for perforce@freebsd.org; Thu, 12 Jul 2007 14:24:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Jul 2007 14:24:05 GMT Message-Id: <200707121424.l6CEO5rc044803@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 123375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 14:24:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123375 Change 123375 by rwatson@rwatson_peppercorn on 2007/07/12 14:23:29 Update configure to 1.0alpha15. Since the auto* tools appear broken on all my FreeBSD boxes, manually update the version string in configure, for which I will surely later be punished, but need to get this release out. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#32 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#33 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0alpha14. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0alpha15. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0alpha14' -PACKAGE_STRING='OpenBSM 1.0alpha14' +PACKAGE_VERSION='1.0alpha15' +PACKAGE_STRING='OpenBSM 1.0alpha15' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0alpha14 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0alpha15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0alpha14:";; + short | recursive ) echo "Configuration of OpenBSM 1.0alpha15:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0alpha14 +OpenBSM configure 1.0alpha15 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0alpha14, which was +It was created by OpenBSM $as_me 1.0alpha15, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0alpha14 + VERSION=1.0alpha15 cat >>confdefs.h <<_ACEOF @@ -23479,7 +23479,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0alpha14, which was +This file was extended by OpenBSM $as_me 1.0alpha15, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23542,7 +23542,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0alpha14 +OpenBSM config.status 1.0alpha15 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" From owner-p4-projects@FreeBSD.ORG Thu Jul 12 14:28:12 2007 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 0A76516A46B; Thu, 12 Jul 2007 14:28:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B4BED16A468 for ; Thu, 12 Jul 2007 14:28:11 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A430D13C45E for ; Thu, 12 Jul 2007 14:28:11 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CESBi2045010 for ; Thu, 12 Jul 2007 14:28:11 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CESBSj045007 for perforce@freebsd.org; Thu, 12 Jul 2007 14:28:11 GMT (envelope-from taleks@FreeBSD.org) Date: Thu, 12 Jul 2007 14:28:11 GMT Message-Id: <200707121428.l6CESBSj045007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 14:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=123376 Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 added new module httpfs to emulate file system. pxe_http: changed request header for partial getting to correct format, add pxe_get() and pxe_exists() to be used from httpfs module. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#9 edit .. //depot/projects/soc2007/taleks-pxe_http/httpfs.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/httpfs.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#3 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#9 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= pxe_conv.c pxe_isr.S pxe_mem.c pxe_buffer.c pxe_await.c pxe_arp.c pxe_ip.c pxe_mutex.c \ pxe_core.c pxe_icmp.c pxe_udp.c pxe_filter.c pxe_dns.c pxe_dhcp.c pxe_segment.c pxe_tcp.c pxe_sock.c \ - pxe_connection.c pxe_http.c + pxe_connection.c pxe_http.c httpfs.c CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica \ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#5 (text+ko) ==== @@ -78,11 +78,14 @@ * must be big enough to store size bytes. */ int -pxe_fetch(char *server_name, char *filename, uint32_t from, uint32_t size, void *where) +pxe_fetch(char *server_name, char *filename, uint32_t from, uint32_t size) { PXE_IPADDR server; - printf("pxe_fetch(): fetching http://%s:80/%s\n", server_name, filename); + printf("pxe_fetch(): fetching http://%s:80/%s (%d - %d)\n", + server_name, filename, from, from + size + ); + server.ip = pxe_gethostbyname(server_name); if (server.ip == 0) { @@ -104,11 +107,11 @@ } if ( (from == 0) && (size == 0) ) { - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\n\r\n", + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, server_name ); } else { - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: %d-%d\r\nConnection: Close\r\n\r\n", + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: bytes=%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, server_name, from, from + size ); } @@ -142,7 +145,6 @@ continue; http_data[count + result] = '\0'; -/* printf("%s", http_data); */ /* end of reply */ found = strstr(&http_data[count], "\r\n\r\n"); @@ -167,10 +169,6 @@ } /* calculating body data offset*/ -/* result = (found - http_data) + 4; */ -/* result = count - result; /* result = size of retirieved part of body */ -/* count = (found - http_data) + 4; */ -/* pxe_memcpy(&http_data[count], http_data, result); */ printf("pxe_fetch(): response %d, length = %d\n", parse_data.code, parse_data.size); delay(2000000); @@ -211,3 +209,230 @@ return (1); } + +/* pxe_get() - gets portion of file + * in: + * hh - descriptor of file to read data from + * size - size of part to read starting at from offset + * out: + * -1 - failed + * >=0 - actual bytes read + */ +int +pxe_get(PXE_HTTP_HANDLE *hh, uint32_t size, void *buffer) +{ + +#ifdef PXE_DEBUG + printf("pxe_get(): 0x%x:%s:%d-%d to 0x%x\n", + hh->ip, hh->filename, hh->offset, hh->offset + size, hh->buf + ); +#endif + + int socket = pxe_socket(); + + int result = pxe_connect(socket, hh->ip, 80, PXE_TCP_PROTOCOL); + + if (result == -1) { +#ifdef PXE_DEBUG + printf("pxe_get(): failed to connect.\n"); +#endif + return (-1); + } + + /* hoping that buffer is big enough */ + sprintf(hh->buf, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: bytes=%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", + hh->filename, hh->servername, hh->offset, hh->offset + size + ); + + int len = strlen(hh->buf); + + if (len != pxe_send(socket, hh->buf, len)) { + printf("pxe_get(): failed to send request.\n"); + pxe_close(socket); + return (-1); + } + + if (pxe_flush(socket) == -1) { + printf("pxe_get(): failed to push request.\n"); + pxe_close(socket); + return (-1); + } + + int count = 0; + char *found = NULL; + char ch = 0; + + /* retrieve header */ + while (count < hh->bufsize) { + result = pxe_recv(socket, &hh->buf[count], hh->bufsize - count); + + if (result == -1) { + break; + } + + if (result == 0) + continue; + + /* searching end of reply header */ + /* found = strnstr(&hh->buf[count], "\r\n\r\n", result); */ + + ch = hh->buf[count + result]; + found = strstr(&hh->buf[count], "\r\n\r\n"); + hh->buf[count + result] = ch; + + count += result; + + if (found != NULL) + break; + } + + if (found == NULL) { /* haven't found end of header */ + pxe_close(socket); + return (-1); + } + + /* parse header */ + PXE_HTTP_PARSE_DATA parse_data; + pxe_memset(&parse_data, 0, sizeof(PXE_HTTP_PARSE_DATA)); + + if (!http_reply_parse(hh->buf, count, &parse_data)) { + pxe_close(socket); + return (-1); + } + + if ( (parse_data.code < 200) || + (parse_data.code >= 300) ) + { + printf("pxe_get(): failed to get (status: %d).\n", parse_data.code); + pxe_close(socket); + return (-1); + } + + /* update counter, substruct header size */ + count -= (found - http_data) + 4; + + /* process body data */ + if (count > size) { /* sanity check, never must be */ + count = size; + printf("pxe_get(): warning, received more then needed\n"); + } + + pxe_memcpy(hh->buf, buffer, count); + + while (count < size) { + result = pxe_recv(socket, buffer + count, size - count); + + if (result == -1) { + break; + } + + if (result == 0) + continue; + + count += result; + } + + pxe_close(socket); + +#ifdef PXE_DEBUG + printf("\npxe_get(): %d of %d byte(s) received.\n", count, size); +#endif + + if (count > size) { /* sanity check, never must be */ + count = size; + printf("pxe_get(): warning, received more then needed\n"); + } + + return (count); +} + +/* pxe_exists() - checks if file exists and gets it's size + * in: + * hh - descriptor of file to read data from + * out: + * 0 - failed, not exists + * 1 - ok, file exists + */ +int +pxe_exists(PXE_HTTP_HANDLE *hh) +{ + int socket = pxe_socket(); + + int result = pxe_connect(socket, hh->ip, 80, PXE_TCP_PROTOCOL); + + if (result == -1) { + return (0); + } + + /* hoping that buffer is big enough */ + sprintf(hh->buf, "HEAD /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", + hh->filename, hh->servername + ); + + int len = strlen(hh->buf); + + if (len != pxe_send(socket, hh->buf, len)) { + printf("pxe_exists(): failed to send request.\n"); + pxe_close(socket); + return (0); + } + + if (pxe_flush(socket) == -1) { + printf("pxe_exists(): failed to push request.\n"); + pxe_close(socket); + return (0); + } + + int count = 0; + char *found = NULL; + char ch = 0; + + /* retrieve header */ + while (count < hh->bufsize) { + result = pxe_recv(socket, &hh->buf[count], hh->bufsize - count); + + if (result == -1) { + break; + } + + if (result == 0) + continue; + + /* searching end of reply header */ + /* found = strnstr(&hh->buf[count], "\r\n\r\n", result); */ + ch = hh->buf[count + result]; + found = strstr(&hh->buf[count], "\r\n\r\n"); + hh->buf[count + result] = ch; + + count += result; + + if (found != NULL) + break; + } + + pxe_close(socket); + + if (found == NULL) { /* haven't found end of header */ + return (0); + } + + /* parse header */ + PXE_HTTP_PARSE_DATA parse_data; + pxe_memset(&parse_data, 0, sizeof(PXE_HTTP_PARSE_DATA)); + + if (!http_reply_parse(hh->buf, count, &parse_data)) { + return (0); + } + + if ( (parse_data.code < 200) || + (parse_data.code >= 300) ) + { + printf("pxe_exists(): failed to get header (status: %d).\n", parse_data.code); + + return (0); + } + + hh->size = parse_data.size; + + return (1); +} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#3 (text+ko) ==== @@ -1,10 +1,32 @@ #ifndef PXE_HTTP_INCLUDED #define PXE_HTTP_INCLUDED +#include #include #define PXE_MAX_HTTP_HDRLEN 1024 -int pxe_fetch(char *server, char *filename, uint32_t from, uint32_t size, void* where); +/* testing function, outputs received data to screen */ +int pxe_fetch(char *server, char *filename, uint32_t from, uint32_t size); + +typedef struct pxe_http_handle { + + char *filename; /* filename including path on server */ + char *servername; /* server name */ + + char *buf; /* buffer for creating requests */ + uint16_t bufsize; /* size of buffer */ + + uint32_t ip; /* web server ip */ + off_t offset; /* current offset in bytes from neginning of file */ + + size_t size; /* file size if known */ +} PXE_HTTP_HANDLE; + +/* gets requested data from server */ +int pxe_get(PXE_HTTP_HANDLE *hh, uint32_t size, void *buffer); + +/* checks if file exists and fills filesize if known */ +int pxe_exists(PXE_HTTP_HANDLE *hh); #define PXE_HTTP_SIZE_UNKNOWN 0xffffffff From owner-p4-projects@FreeBSD.ORG Thu Jul 12 15:03:39 2007 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 39DF516A468; Thu, 12 Jul 2007 15:03:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C2DBA16A400; Thu, 12 Jul 2007 15:03:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 1DB0913C448; Thu, 12 Jul 2007 15:03:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l6CF3ZtL094421; Thu, 12 Jul 2007 11:03:35 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Thu, 12 Jul 2007 11:03:32 -0400 User-Agent: KMail/1.9.6 References: <200707041342.l64Dgm6H071641@repoman.freebsd.org> In-Reply-To: <200707041342.l64Dgm6H071641@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707121103.32541.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 12 Jul 2007 11:03:35 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3643/Thu Jul 12 09:25:30 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00, UPPERCASE_25_50 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 15:03:39 -0000 On Wednesday 04 July 2007 09:42:48 am Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122854 > > Change 122854 by rdivacky@rdivacky_witten on 2007/07/04 13:42:23 > > vrele() before Giant unlock. Use VFS_UNLOCK_GIANT macro. Reuse "vfslocked" > variable where possible, elsewhere introduce "vfslocked1" varibale. > > Suggested by: jhb dvfslocked would be preferable to vfslocked1, and more consistent with other places in the kernel with multiple vfslocked variables. > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#43 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#43 (text+ko) ==== > > @@ -1164,9 +1164,9 @@ > fdclose(fdp, fp, indx, td); > fdrop(fp, td); > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -1272,9 +1272,9 @@ > return (error); > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1354,9 +1354,9 @@ > } > } > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked1); > } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > @@ -1419,9 +1419,9 @@ > AUDIT_ARG(mode, mode); > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1477,9 +1477,9 @@ > out: > #endif > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked1); > } > vput(nd.ni_dvp); > vn_finished_write(mp); > @@ -1602,9 +1602,9 @@ > error = kern_get_at(td, fd2, &ldvp); > if (error && !kern_absolute_path(path2, segflg)) { > if (pdvp) { > - if (VFS_NEEDSGIANT(pdvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(pdvp->v_mount); > vrele(pdvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -1662,14 +1662,14 @@ > > out: > if (pdvp) { > - if (VFS_NEEDSGIANT(pdvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(pdvp->v_mount); > vrele(pdvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > if (ldvp) { > - if (VFS_NEEDSGIANT(ldvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(ldvp->v_mount); > vrele(ldvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -1737,9 +1737,9 @@ > AUDIT_ARG(text, syspath); > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path2, segflg)) > @@ -1793,9 +1793,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > if (segflg != UIO_SYSSPACE) > uma_zfree(namei_zone, syspath); > @@ -1911,9 +1911,9 @@ > > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1972,9 +1972,9 @@ > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked1); > } > if (vp == nd.ni_dvp) > vrele(vp); > @@ -2228,9 +2228,9 @@ > td->td_ucred = cred; > crfree(tmpcred); > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -2447,9 +2447,9 @@ > *sbp = sb; > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -2514,9 +2514,9 @@ > *sbp = sb; > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -2743,9 +2743,9 @@ > td->td_retval[0] = count - auio.uio_resid; > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -2993,9 +2993,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -3045,9 +3045,9 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > > return (error); > @@ -3192,9 +3192,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -3253,9 +3253,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -3443,9 +3443,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > return (error); > } > @@ -3835,9 +3835,9 @@ > error = kern_get_at(td, newfd, &todvp); > if (error && !kern_absolute_path(new, pathseg)) { > if (frdvp) { > - if (VFS_NEEDSGIANT(frdvp->v_mount)) > - mtx_unlock(&Giant); > + fvfslocked = VFS_NEEDSGIANT(frdvp->v_mount); > vrele(frdvp); > + VFS_UNLOCK_GIANT(fvfslocked); > } > return (error); > } > @@ -3947,14 +3947,14 @@ > return (0); > out2: > if (frdvp) { > - if (VFS_NEEDSGIANT(frdvp->v_mount)) > - mtx_unlock(&Giant); > + fvfslocked = VFS_NEEDSGIANT(frdvp->v_mount); > vrele(frdvp); > + VFS_UNLOCK_GIANT(fvfslocked); > } > if (todvp) { > - if (VFS_NEEDSGIANT(todvp->v_mount)) > - mtx_unlock(&Giant); > + tvfslocked = VFS_NEEDSGIANT(todvp->v_mount); > vrele(todvp); > + VFS_UNLOCK_GIANT(tvfslocked); > } > return (error); > } > @@ -4013,9 +4013,9 @@ > AUDIT_ARG(mode, mode); > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, segflg)) > @@ -4076,9 +4076,9 @@ > out: > #endif > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked1); > } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > @@ -4125,9 +4125,9 @@ > > restart: > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + vfslocked = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -4183,9 +4183,9 @@ > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(vp); > if (dvp) { > - if (VFS_NEEDSGIANT(dvp->v_mount)) > - mtx_unlock(&Giant); > + int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); > vrele(dvp); > + VFS_UNLOCK_GIANT(vfslocked1); > } > if (nd.ni_dvp == vp) > vrele(nd.ni_dvp); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Jul 12 15:16:15 2007 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 E864D16A46C; Thu, 12 Jul 2007 15:16:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0B3616A468 for ; Thu, 12 Jul 2007 15:16:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8FFE013C45A for ; Thu, 12 Jul 2007 15:16:13 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6CFGDxw050423 for ; Thu, 12 Jul 2007 15:16:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CFGCZU050420 for perforce@freebsd.org; Thu, 12 Jul 2007 15:16:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Jul 2007 15:16:12 GMT Message-Id: <200707121516.l6CFGCZU050420@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 123380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 15:16:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=123380 Change 123380 by rwatson@rwatson_peppercorn on 2007/07/12 15:16:10 Add more *at(2) system call event identifiers. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#52 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#52 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#51 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#52 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -539,6 +539,14 @@ #define AUE_MUNLOCKALL 43142 /* FreeBSD. */ #define AUE_CLOSEFROM 43143 /* FreeBSD. */ #define AUE_FEXECVE 43144 /* FreeBSD. */ +#define AUE_FACCESSAT 43145 /* FreeBSD. */ +#define AUE_FCHMODAT 43146 /* FreeBSD. */ +#define AUE_LINKAT 43147 /* FreeBSD. */ +#define AUE_MKDIRAT 43148 /* FreeBSD. */ +#define AUE_MKFIFOAT 43149 /* FreeBSD. */ +#define AUE_MKNODAT 43150 /* FreeBSD. */ +#define AUE_READLINKAT 43151 /* FreeBSD. */ +#define AUE_SYMLINKAT 43152 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#24 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#25 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -482,6 +482,14 @@ 43142:AUE_MUNLOCKALL:munlockall(2):pc 43143:AUE_CLOSEFROM:closefrom(2):cl 43144:AUE_FEXECVE:fexecve(2):pc,ex +43145:AUE_FACCESSAT:faccessat(2):fa +43146:AUE_FCHMODAT:fchmodat(2):fm +43147:AUE_LINKAT:linkat(2):fc +43148:AUE_MKDIRAT:mkdirat(2):fc +43149:AUE_MKFIFOAT:mkfifoat(2):fc +43150:AUE_MKNODAT:mknodat(2):fc +43151:AUE_READLINKAT:readlinkat(2):fr +43152:AUE_SYMLINKAT:symlinkat(2):fc # # User space system events. # From owner-p4-projects@FreeBSD.ORG Thu Jul 12 15:17:15 2007 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 8D26F16A473; Thu, 12 Jul 2007 15:17:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A25816A46E for ; Thu, 12 Jul 2007 15:17:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 58D7413C4C8 for ; Thu, 12 Jul 2007 15:17:15 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6CFHFkp050480 for ; Thu, 12 Jul 2007 15:17:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CFHFWO050477 for perforce@freebsd.org; Thu, 12 Jul 2007 15:17:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Jul 2007 15:17:15 GMT Message-Id: <200707121517.l6CFHFWO050477@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 123381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 15:17:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123381 Change 123381 by rwatson@rwatson_peppercorn on 2007/07/12 15:17:11 Further history updates. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#54 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#54 (text+ko) ==== @@ -4,7 +4,8 @@ - Restore the behavior of printing the string/text specified while auditing arg32 tokens. - Synchronized audit event list to Solaris, picking up the *at(2) system call - definitions, now required for FreeBSD and Linux. + definitions, now required for FreeBSD and Linux. Added additional events + for *at(2) system calls not present in Solaris. OpenBSM 1.0 alpha 14 @@ -292,4 +293,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#53 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#54 $ From owner-p4-projects@FreeBSD.ORG Thu Jul 12 16:18:10 2007 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 7EC0B16A474; Thu, 12 Jul 2007 16:18:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 395F916A46D; Thu, 12 Jul 2007 16:18:10 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from mojo.ru (mojo.ru [84.252.152.63]) by mx1.freebsd.org (Postfix) with ESMTP id B02ED13C484; Thu, 12 Jul 2007 16:18:09 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from [192.168.0.16] (nc-76-4-28-21.dhcp.embarqhsd.net [76.4.28.21]) (authenticated bits=0) by mojo.ru (8.12.11.20060308/8.12.10) with ESMTP id l6CGI7GA005193 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 12 Jul 2007 20:18:11 +0400 Message-ID: <46965433.6050207@FreeBSD.org> Date: Thu, 12 Jul 2007 12:17:55 -0400 From: "Constantine A. Murenin" Organization: Google Summer of Code 2007 Student @ The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.7.5) Gecko/20041217 X-Accept-Language: en-gb, en-gb-oed, en, en-us, ru, ru-ru, ru-su MIME-Version: 1.0 To: Alexey Tarasov References: <200707121428.l6CESBSj045007@repoman.freebsd.org> In-Reply-To: <200707121428.l6CESBSj045007@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Shteryana Shopova , Perforce Change Reviews , "Constantine A. Murenin" Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 16:18:10 -0000 On 12/07/2007 10:28, Alexey Tarasov wrote: > http://perforce.freebsd.org/chv.cgi?CH=123376 > > Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 > ... > @@ -104,11 +107,11 @@ > } > > if ( (from == 0) && (size == 0) ) { > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\n\r\n", > + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name > ); > } else { > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: %d-%d\r\nConnection: Close\r\n\r\n", > + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: bytes=%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name, from, from + size > ); > } You might want to change long lines like these to something as follows: if ( (from == 0) && (size == 0) ) sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\n" "Connection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, server_name); else sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\n" "Range: bytes=%d-%d\r\n" "Connection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, server_name, from, from + size); Also note that ");" should not appear on a line by itself, if I'm reading style(9) correctly. Removing curly brackets is optional in this case, because lines are somewhat long, but personally, I do like them removed, too. :) Cheers, Constantine. From owner-p4-projects@FreeBSD.ORG Thu Jul 12 16:27:12 2007 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 D3AC716A468; Thu, 12 Jul 2007 16:27:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E6D616A400 for ; Thu, 12 Jul 2007 16:27:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7F0EE13C45B for ; Thu, 12 Jul 2007 16:27:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CGRBCk062781 for ; Thu, 12 Jul 2007 16:27:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CGRBs0062769 for perforce@freebsd.org; Thu, 12 Jul 2007 16:27:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 12 Jul 2007 16:27:11 GMT Message-Id: <200707121627.l6CGRBs0062769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 123389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 16:27:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=123389 Change 123389 by rdivacky@rdivacky_witten on 2007/07/12 16:26:54 s/vfslocked1/dvfslocked/ Suggested by: jhb Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#46 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#46 (text+ko) ==== @@ -1354,9 +1354,9 @@ } } if (dvp) { - int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); + int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked1); + VFS_UNLOCK_GIANT(dvfslocked); } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -1477,9 +1477,9 @@ out: #endif if (dvp) { - int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); + int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked1); + VFS_UNLOCK_GIANT(dvfslocked); } vput(nd.ni_dvp); vn_finished_write(mp); @@ -1972,9 +1972,9 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (dvp) { - int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); + int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked1); + VFS_UNLOCK_GIANT(dvfslocked); } if (vp == nd.ni_dvp) vrele(vp); @@ -4109,9 +4109,9 @@ out: #endif if (dvp) { - int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); + int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked1); + VFS_UNLOCK_GIANT(dvfslocked); } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -4216,9 +4216,9 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); if (dvp) { - int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); + int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); vrele(dvp); - VFS_UNLOCK_GIANT(vfslocked1); + VFS_UNLOCK_GIANT(dvfslocked); } if (nd.ni_dvp == vp) vrele(nd.ni_dvp); From owner-p4-projects@FreeBSD.ORG Thu Jul 12 16:31:27 2007 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 D2AC716A421; Thu, 12 Jul 2007 16:31:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB18B16A476 for ; Thu, 12 Jul 2007 16:31:26 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe12.swip.net [212.247.155.97]) by mx1.freebsd.org (Postfix) with ESMTP id 1A96D13C459 for ; Thu, 12 Jul 2007 16:31:25 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [212.17.141.53] (account mc467741@c2i.net HELO [10.150.81.62]) by mailfe12.swip.net (CommuniGate Pro SMTP 5.1.10) with ESMTPA id 373309223; Thu, 12 Jul 2007 18:31:21 +0200 From: Hans Petter Selasky To: "Constantine A. Murenin" Date: Thu, 12 Jul 2007 18:31:22 +0200 User-Agent: KMail/1.9.5 References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> In-Reply-To: <46965433.6050207@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707121831.22913.hselasky@c2i.net> Cc: Shteryana Shopova , Perforce Change Reviews , Alexey Tarasov Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 16:31:27 -0000 On Thursday 12 July 2007 18:17, Constantine A. Murenin wrote: > On 12/07/2007 10:28, Alexey Tarasov wrote: > > http://perforce.freebsd.org/chv.cgi?CH=123376 > > > > Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 > > ... > > > @@ -104,11 +107,11 @@ > > } > > > > if ( (from == 0) && (size == 0) ) { > > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: > > Close\r\n\r\n", + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: > > %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, > > server_name > > ); > > } else { > > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: > > %d-%d\r\nConnection: Close\r\n\r\n", + sprintf(http_data, "GET /%s > > HTTP/1.1\r\nHost: %s\r\nRange: bytes=%d-%d\r\nConnection: > > Close\r\nUser-Agent: pxe_http/0\r\n\r\n", filename, server_name, from, > > from + size > > ); > > } > > You might want to change long lines like these to something as follows: > > if ( (from == 0) && (size == 0) ) > sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\n" > "Connection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name); > else > sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\n" > "Range: bytes=%d-%d\r\n" > "Connection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name, from, from + size); > > Also note that ");" should not appear on a line by itself, if I'm reading > style(9) correctly. > > Removing curly brackets is optional in this case, because lines are > somewhat long, but personally, I do like them removed, too. :) > And, don't use "sprintf". Use "snprintf" instead. --HPS From owner-p4-projects@FreeBSD.ORG Thu Jul 12 18:45:20 2007 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 4877816A474; Thu, 12 Jul 2007 18:45:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C310616A400 for ; Thu, 12 Jul 2007 18:45:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B026213C4B7 for ; Thu, 12 Jul 2007 18:45:19 +0000 (UTC) (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.8/8.13.8) with ESMTP id l6CIjJoU086571 for ; Thu, 12 Jul 2007 18:45:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CIi0o1086456 for perforce@freebsd.org; Thu, 12 Jul 2007 18:44:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Jul 2007 18:44:00 GMT Message-Id: <200707121844.l6CIi0o1086456@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 123395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 18:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=123395 Change 123395 by rwatson@rwatson_zoo on 2007/07/12 18:43:15 Integrate TrustedBSD base branch from FreeBSD CVS: - sed now a build tool - !i4b; i4b includes moved to MI from MD directories - !ng_h4 - !umapfs - !kame IPSEC - !wicontrol - FAST_IPSEC -> IPSEC, IPv6 support added - pf upgrade - large-scale net80211 upgrade - hostapd 0.5.8 - wpa_supplicant 0.5.8 - environmental variable APIs reworked - diff 2.8.7 - less 406 - major library versions bump for 7 - libarchive 2.2.3 - !IPX over IP tunnels - if_nxge - SUSER_ALLOWJAIL, SUSER_RUID removed - Further priv(9) cleanup throughout the tree. - SCTP in GENERIC - Coda fixes - devfs/pts/devdrn fixes - fcntl, advisory locking mpsafe - IPv4 multicast filtering rewritten - security.audit sysctl hierarchy - audit_arg_auditinfo_addr and other OpenBSM 1.0a15-ish changes to the kernel - MAC checks for setaudit_addr() - mac_bsdextended cleanup - 64-bit system call alignment changes - PAM account hooks in cron, etc. - Lots and lots of other cleanups, etc, in preparation for 7 Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#87 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#26 integrate .. //depot/projects/trustedbsd/base/UPDATING#84 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#27 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/AUTHORS#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/diff/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/THANKS#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/analyze.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/bootstrap#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/config.hin#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/configure#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/configure.in#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/context.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/diagmeet.note#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/diff.c#4 delete .. //depot/projects/trustedbsd/base/contrib/diff/diff.h#3 delete .. //depot/projects/trustedbsd/base/contrib/diff/diff.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/diff3.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/dir.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/doc/version.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/ed.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/exgettext#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/ifdef.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/install-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/io.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/basename.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/error.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/error.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/exit.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/regex.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/regex.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/man/cmp.1#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/man/diff.1#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/man/diff3.1#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/normal.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/prepend_args.c#3 delete .. //depot/projects/trustedbsd/base/contrib/diff/prepend_args.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/sdiff.c#3 delete .. //depot/projects/trustedbsd/base/contrib/diff/side.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/analyze.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/cmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/context.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/diff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/diff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/diff3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/dir.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/ed.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/io.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/normal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/side.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/system.h#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/src/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/diff/stamp-h.in#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/system.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/util.c#4 delete .. //depot/projects/trustedbsd/base/contrib/diff/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/xmalloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/beacon.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/beacon.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/build_config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/des.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_wired.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_i.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_identity.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_md5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_peap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostap_common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.eap_user#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/includes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/md4.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/milenage.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/milenage.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/mlme.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/mlme.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/os.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/os_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/preauth.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/preauth.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha256.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sha256.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/tls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_none.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wme.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wme.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/NEWS#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/cmdbuf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/command.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/forwback.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.man#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.nro#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.nro#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/main.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/optfunc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/screen.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/search.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/version.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/netcat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/filter.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/filter.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/ftp-proxy.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/ftp-proxy.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/getline.c#3 delete .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/util.c#4 delete .. //depot/projects/trustedbsd/base/contrib/pf/ftp-proxy/util.h#3 delete .. //depot/projects/trustedbsd/base/contrib/pf/libevent/buffer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/evbuffer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/event-internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/event.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/event.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/evsignal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/kqueue.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/log.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/log.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/poll.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/select.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/libevent/signal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#9 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#11 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.os.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pflog.4#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#10 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/parse.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pf_print_state.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_altq.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_optimize.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_osfp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_parser.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_parser.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_radix.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pfctl/pfctl_table.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pidfile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pidfile.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/privsep.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/pf/tftp-proxy/filter.c#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/tftp-proxy/filter.h#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/tftp-proxy/tftp-proxy.8#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/tftp-proxy/tftp-proxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_ssid.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defconfig#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/drivers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_aka.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_fast.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gtc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_i.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_leap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_md5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_otp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_testing.txt#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_test.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/l2_packet.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth_test.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_none.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/todo.txt#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_cli.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_passphrase.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#52 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#69 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#23 integrate .. //depot/projects/trustedbsd/base/etc/group#11 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#18 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#44 integrate .. //depot/projects/trustedbsd/base/etc/namedb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/trustedbsd/base/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/trustedbsd/base/etc/namedb/make-localhost#4 delete .. //depot/projects/trustedbsd/base/etc/namedb/master/Makefile#1 branch .. //depot/projects/trustedbsd/base/etc/namedb/master/empty.db#1 branch .. //depot/projects/trustedbsd/base/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/trustedbsd/base/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/trustedbsd/base/etc/namedb/named.conf#11 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#12 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/atrun#1 branch .. //depot/projects/trustedbsd/base/etc/pam.d/cron#1 branch .. //depot/projects/trustedbsd/base/etc/pam.d/imap#6 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/pop3#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sendmail#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.resume#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.suspend#5 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#63 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#12 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/diff.1#6 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff3/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/sdiff/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sdiff/sdiff.1#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/trustedbsd/base/include/Makefile#61 integrate .. //depot/projects/trustedbsd/base/include/arpa/inet.h#11 integrate .. //depot/projects/trustedbsd/base/include/histedit.h#6 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#26 integrate .. //depot/projects/trustedbsd/base/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#28 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_fd.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_memory.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_by_name.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/SYS.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/SYS.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/sys/sbrk.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#30 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/SYS.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/SYS.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_sys_calls.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sourcefilter.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/sourcefilter.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/quad/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_unix.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/SYS.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fseek.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fseek.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#18 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getenv.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#36 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/putenv.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/stdlib/setenv.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ftruncate.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/lseek.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/modstat.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/pread.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/pwrite.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_delete.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/truncate.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_accept_sec_context.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_status.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_name.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_indicate_mechs.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_dump_policy.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_get_policylen.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/pfkey.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/pfkey_dump.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/policy_parse.y#4 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/policy_token.l#5 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/test-policy.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_amd64.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_i386.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_private.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.8#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.c#10 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_log.c#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#21 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/Makefile#3 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/atrun.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/atrun.man#4 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftp-proxy/Makefile#3 delete .. //depot/projects/trustedbsd/base/libexec/pppoed/pppoed.c#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/libexec/tftp-proxy/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#20 integrate .. //depot/projects/trustedbsd/base/release/i386/fixit_crunch.conf#9 integrate .. //depot/projects/trustedbsd/base/release/scripts/src-install.sh#4 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#22 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#39 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/af_ipx.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#50 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#36 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.h#12 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#26 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifmedia.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/libipf/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#53 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#48 integrate .. //depot/projects/trustedbsd/base/sbin/mknod/mknod.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#27 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#30 integrate .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/Makefile#4 delete .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/mount_umapfs.8#10 delete .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/mount_umapfs.c#8 delete .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/trustedbsd/base/sbin/pfctl/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#29 integrate .. //depot/projects/trustedbsd/base/sbin/ping6/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/ping6/ping6.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/trustedbsd/base/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/trustedbsd/base/sbin/setkey/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/parse.y#2 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/setkey.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/test-policy.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/token.l#3 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#32 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#24 integrate .. //depot/projects/trustedbsd/base/share/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/FAQ#5 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/Overview#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/i4brunppp/i4brunppp.c#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#80 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#24 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bce.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwohci.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ieee80211.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ip.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/msk.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nxge.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#19 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rum.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tty.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ucom.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhid.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ural.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#27 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#26 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#45 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#71 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/tmpfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/xfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#34 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ieee80211_ioctl.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/lock.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/locking.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/priv.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/selrecord.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/suser.9#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#15 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#7 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#22 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#24 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#43 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#35 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#22 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#16 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/intr.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#18 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pte.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#38 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/common/main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_console.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_net.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/openfirm.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/openfirm.h#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#19 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#36 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#66 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#16 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#23 integrate .. //depot/projects/trustedbsd/base/sys/coda/00READ#2 delete .. //depot/projects/trustedbsd/base/sys/coda/cnode.h#11 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda.h#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_psdev.c#15 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#11 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.h#5 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#32 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#57 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#37 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#90 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#119 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#41 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.arm#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#74 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#40 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#63 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#52 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sun4v#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#41 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#50 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#85 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#37 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#38 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_cbq.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.c#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#20 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#21 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_norm.c#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_osfp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pfvar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#56 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpiio.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#18 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 12 19:18:16 2007 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 834E216A469; Thu, 12 Jul 2007 19:18:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 40F1A16A400 for ; Thu, 12 Jul 2007 19:18:16 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 19D8E13C43E for ; Thu, 12 Jul 2007 19:18:16 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CJIFfY094949 for ; Thu, 12 Jul 2007 19:18:15 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CJIFkI094946 for perforce@freebsd.org; Thu, 12 Jul 2007 19:18:15 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 12 Jul 2007 19:18:15 GMT Message-Id: <200707121918.l6CJIFkI094946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 123399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 19:18:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123399 Change 123399 by rpaulo@rpaulo_epsilon on 2007/07/12 19:18:01 For some reason, moused confuses sysmouse after attaching to the HID version of the MacBook Bluetooth device. For now, blacklist the product id of the Bluetooth controller (in HID mode) inside ums(4). Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#13 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#7 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#8 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#16 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#13 (text+ko) ==== @@ -198,6 +198,9 @@ if (err) return (UMATCH_NONE); + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE) + return (UMATCH_NONE); + if (id->bInterfaceClass == UICLASS_HID && id->bInterfaceSubClass == UISUBCLASS_BOOT && id->bInterfaceProtocol == UIPROTO_MOUSE) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#7 (text+ko) ==== @@ -111,6 +111,10 @@ /* Devices that need special handling of the Fn key */ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_INTKBTP, ANY, { UQ_KBD_FNKEY } }, + + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HID, + ANY, { UQ_MS_IGNORE } }, + { 0, 0, 0, { 0 } } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#8 (text+ko) ==== @@ -58,6 +58,7 @@ #define UQ_MS_BAD_CLASS 0x00020000 /* doesn't identify properly */ #define UQ_MS_LEADING_BYTE 0x40000 /* mouse sends an unknown leading byte. */ #define UQ_KBD_FNKEY 0x00080000 /* device needs special handling for the Fn key */ +#define UQ_MS_IGNORE 0x00100000 /* device should be ignored by ums */ }; extern const struct usbd_quirks usbd_no_quirk; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#16 (text+ko) ==== @@ -823,6 +823,7 @@ /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse +product APPLE BLUETOOTH_HID 0x1000 Bluetooth (HID mode) product APPLE SPEAKERS 0x1101 Speakers product APPLE IPOD 0x1201 iPod product APPLE IPOD2G 0x1202 iPod 2G From owner-p4-projects@FreeBSD.ORG Thu Jul 12 19:41:46 2007 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 E755D16A46D; Thu, 12 Jul 2007 19:41:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF29116A468 for ; Thu, 12 Jul 2007 19:41:45 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9F10513C4C1 for ; Thu, 12 Jul 2007 19:41:45 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CJfjnY097063 for ; Thu, 12 Jul 2007 19:41:45 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CJfjl6097058 for perforce@freebsd.org; Thu, 12 Jul 2007 19:41:45 GMT (envelope-from thioretic@FreeBSD.org) Date: Thu, 12 Jul 2007 19:41:45 GMT Message-Id: <200707121941.l6CJfjl6097058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 19:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=123400 Change 123400 by thioretic@thioretic on 2007/07/12 19:41:00 TODO: bus_generic_* and resource_* stuff , cleanups, including proper naming :) (probably they should go first), locking and IO requests processing stuff. DONE: device_set_driver semantics. ALSO: my thoughts about drv_compat_ctrl_driver should now be more obvious. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#12 edit .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#13 edit .. //depot/projects/soc2007/thioretic_gidl/sys/bus.h#6 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#12 (text+ko) ==== @@ -107,10 +107,6 @@ # a driver not just process, but also produce and destroy an io request. # Inportant note: from above-said one can see, that since now newbus # won't be a tree, it will be a graph! - # New logic: - # probe/attach: the dev->driver is set to drv_compat(driver) to be - # probed and attached. - # detach: will detach DRV_LOWEST driver and all filters consequently. # As for functional devices (let's call like this all drivers with # DR_REQDEV flag set), the following scenario looks reasonable: # @@ -132,4 +128,11 @@ # device_set_driver_softc(). # All these return softc of a specified driver for a device. Old functions # (those without '_driver_') return softc of DRV_LOWEST driver (as expected). - + a.1.5 device_set_driver semantics + SOLUTION: add DS_RAW state value && add per-pdrv_compat state + FILE(S) AFFECTED: kern/subr_bus.c, sys/bus.h + # As now device hosts many drivers, dev->driver should point to currently + # probed/attached/.. driver. If driver to be set to is DR_LOWEST not equal + # to that already in stack or is NULL, the whole driver configuration is + # destroyed. Device won't process any i/o requests till its state is set + # to DS_ALIVE (i.e. there is no DS_RAW or other drivers in stack). ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#13 (text+ko) ==== @@ -87,6 +87,7 @@ void *softc; #define DF_EXTERNALSOFTC 1 /* softc not allocated by us */ int flags; + device_state_t state; TAILQ_ENTRY(pdrv_compat) link; }; @@ -953,133 +954,181 @@ return((level>DR_LOWEST & leveldrivers[level]))) \ + continue; \ + TAILQ_FOREACH (pdc, &(dev->drivers[level]), link){ \ + func(pdc->pdriver->memb, __VA_ARGS__); \ + } \ + } + + +FUNC(int, PREFIX, probe, device_t dev){ + FOR_RAW_DRIVER(DEVICE_PROBE, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, identify, driver_t *driver, device_t parent){ + FOR_RAW_DRIVER(DEVICE_IDENTIFY, dev->driver->pdriver->driver, parent); +} + +FUNC(int, PREFIX, attach, device_t dev){ + FOR_RAW_DRIVER(DEVICE_ATTACH, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, detach, device_t dev){ + FOR_RAW_DRIVER(DEVICE_DETACH, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, shutdown, device_t parent){ + FOR_RAW_DRIVER(DEVICE_SHUTDOWN, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, suspend, device_t dev){ + FOR_RAW_DRIVER(DEVICE_SUSPEND, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, resume, device_t dev){ + FOR_RAW_DRIVER(DEVICE_RESUME, dev->driver->pdriver->topology_ops); +} + +FUNC(int, PREFIX, quiesce, device_t dev){ + FOR_RAW_DRIVER(DEVICE_QUIESCE, dev->driver->pdriver->topology_ops); +} -static int drv_compat_ctrl_probe (device_t dev); -static int drv_compat_ctrl_identify (driver_t *driver, device_t parent); -static int drv_compat_ctrl_attach (device_t dev); -static int drv_compat_ctrl_detach (device_t dev); -static int drv_compat_ctrl_shutdown (device_t dev); -static int drv_compat_ctrl_suspend (device_t dev); -static int drv_compat_ctrl_resume (device_t dev); -static int drv_compat_ctrl_quiesce (device_t dev); -static void* drv_compat_ctrl_info (device_t dev); +FUNC(void *, PREFIX, info, driver_t *driver, device_t parent){ + FOR_ALL_BUT_RAW_DRIVER(DEVICE_INFO, topology_ops); +} + /** * bus control multiplexing entries */ static int drv_compat_ctrl_print_child (device_t dev, - device_t child); + device_t child); static void drv_compat_ctrl_probe_nomatch (device_t dev, - device_t child); + device_t child); static int drv_compat_ctrl_read_ivar (device_t dev, - device_t child, - int index, - uintptr_t *result); + device_t child, + int index, + uintptr_t *result); static int drv_compat_ctrl_write_ivar (device_t dev, - device_t child, - int index, - uintptr_t value); + device_t child, + int index, + uintptr_t value); static void drv_compat_ctrl_child_detached (device_t dev, - device_t child); + device_t child); static void drv_compat_ctrl_driver_added (device_t dev, - driver_t *driver); + driver_t *driver); static device_t drv_compat_ctrl_add_child (device_t dev, - int order, - const char* name, - int unit); + int order, + const char* name, + int unit); static struct_resource * drv_compat_ctrl_alloc_resource (device_t dev, - device_t child, - int type, - int *rid, - u_long start, - u_long end, - u_long count, - u_int flags); + device_t child, + int type, + int *rid, + u_long start, + u_long end, + u_long count, + u_int flags); static int drv_compat_ctrl_activate_resource (device_t dev, - device_t child, - int type, - int rid, - struct resource *r); + device_t child, + int type, + int rid, + struct resource *r); static int drv_compat_ctrl_deactivate_resource (device_t dev, - device_t child, - int type, - int rid, - struct resource *r); + device_t child, + int type, + int rid, + struct resource *r); static int drv_compat_ctrl_release_resource (device_t dev, - device_t child, - int type, - int rid, - struct resource *res); + device_t child, + int type, + int rid, + struct resource *res); static int drv_compat_ctrl_setup_intr (device_t dev, - device_t child, - struct resource *irq, - int flags, - driver_intr_t *intr, - void *arg, - void **cookiep); + device_t child, + struct resource *irq, + int flags, + driver_intr_t *intr, + void *arg, + void **cookiep); static int drv_compat_ctrl_teardown_intr (device_t dev, - device_t child, - struct resource *irq, - void *cookie); + device_t child, + struct resource *irq, + void *cookie); static int drv_compat_ctrl_set_resource (device_t dev, - device_t child, - int type, - int rid, - u_long start, - u_long count); + device_t child, + int type, + int rid, + u_long start, + u_long count); static int drv_compat_ctrl_get_resource (device_t dev, - device_t child, - int type, - int rid, - u_long *startp, - u_long *countp); + device_t child, + int type, + int rid, + u_long *startp, + u_long *countp); static void drv_compat_ctrl_delete_resource (device_t dev, - device_t child, - int type, - int rid); + device_t child, + int type, + int rid); static struct resource_list * drv_compat_ctrl_get_resource_list (device_t dev, - device_t child); + device_t child); static int drv_compat_ctrl_child_present (device_t dev, - device_t child); + device_t child); static int drv_compat_ctrl_child_pnpinfo_str (device_t dev, - device_t child, - char *buf, - size_t buflen); + device_t child, + char *buf, + size_t buflen); static int -drv_compat_ctrl_child_location_str (device_t dev, - device_t child, - char *buf, - size_t buflen); +drv_compat_ctrl_child_location_str (device_t dev, + device_t child, + char *buf, + size_t buflen); static int -drv_compat_ctrl_config_intr (device_t dev, - int irq, - enum intr_trigger trig, - enum intr_polarity pol); +drv_compat_ctrl_config_intr (device_t dev, + int irq, + enum intr_trigger trig, + enum intr_polarity pol); static void -drv_compat_ctrl_hinted_child (device_t dev, - const char *dname, - int dunit); +drv_compat_ctrl_hinted_child (device_t dev, + const char *dname, + int dunit); static device_method_t drv_compat_ctrl_methods[] = { DEVMETHOD(device_probe, drv_compat_ctrl_probe), @@ -1889,7 +1938,7 @@ drv_compat_t drvc; int level; - device_set_driver (dev, dl->driver); + device_set_driver (dev, drvc->driver); if (DEVICE_PROBE(dev)<=0){ drvc = dev->driver; level = drv_compat_flags2idx(drvc->flags); @@ -2053,7 +2102,7 @@ } static int -device_add_to_dev_list (device_t addwhat, pdevice_list_t *addwhere){ +device_add_to_dev_list (device_t addwhat, pdevice_list_t *addwhere, int incr_refs){ pdevice *pd; TAILQ_FOREACH (pd, addwhere, link){ if (pd->device_ptr == addwhat) @@ -2066,7 +2115,8 @@ pd->device_ptr = addwhat; TAILQ_INSERT_TAIL(addwhere, pd, link); - pd->device_ptr->refs++; + if (incr_refs) + pd->device_ptr->refs++; bus_data_generation_update(); return (1); @@ -2079,7 +2129,8 @@ */ int device_add_existing_child (device_t dev, device_t child){ - device_add_to_dev_list (child, &(dev->children)); + device_add_to_dev_list (child, &(dev->children), TRUE); + device_add_to_dev_list (dev, &(child->parents), FALSE); } /** * @brief Add a new parent, which is a device, that already exists @@ -2088,7 +2139,8 @@ */ int device_add_existing_parent (device_t dev, device_t parent){ - device_add_to_dev_list (parent, &(dev->parents)); + device_add_to_dev_list (parent, &(dev->parents), FALSE); + device_add_to_dev_list (dev, &(parent->children), TRUE); } @@ -2149,6 +2201,8 @@ } child->device_ptr->refs++; + device_add_existing_parent (child->device_ptr, dev); + bus_data_generation_update(); return (child); } @@ -2162,27 +2216,32 @@ pdevice *grand; pdevice *pd; pdevice_list_t *list; + device_t child, parent; PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev))); + if (direction==PARENTS) + return (destroy_recurse (devtodel, dev, CHILDREN)); + /* remove children first */ - list = (direction == CHILDREN) ? &devtodel->children : &devtodel->parents; - if (--devtodel->refs) goto deleteself; - while ( (grand = TAILQ_FIRST(list)) ) { + if (devtodel->refs>1) goto deletefromparents; + while ( (grand = TAILQ_FIRST(&devtodel->children)) ) { error = destroy_recurse(devtodel, grand->device_ptr, direction); if (error) return (error); + TAILQ_REMOVE (&devtodel->children, grand, link) free (grand); } - if ((error = device_detach(devtodel)) != 0) +/*!!!*/ if ((error = device_detach(devtodel)) != 0) return (error); if (devtodel->devclass) devclass_delete_device(devtodel->devclass, devtodel); -deletefromparent: - TAILQ_FOREACH_SAFE(pd, list, link){ - if (pd->device_ptr == devtodel){ - TAILQ_REMOVE(list, devtodel, link); +deletefromparents: + TAILQ_FOREACH_SAFE(pd, &devtodel->parents, link){ + if (pd->device_ptr == dev){ + TAILQ_REMOVE(&devtodel->parents, pd, link); + devtodel->refs--; free (pd); break; } @@ -2205,7 +2264,7 @@ } void -device_add_existing_parent (device_t dev, device_t parent){ +device_delete_existing_parent (device_t dev, device_t parent){ destroy_recurse (dev, parent, PARENTS); } @@ -2983,6 +3042,25 @@ return (error); } +static int +device_destroy_configuration (device_t dev){ + int level, error; + pdrv_compat *pdrvc; + + for (level = DRV_TOPMOST; level>= DRV_LOWEST; level--){ + if (TAILQ_EMPTY(&(dev->drivers[level]))) + continue; + while(pdrvc = TAILQ_FIRST(&(dev->drivers[level]))){ + pdrvc->state = DS_RAW; + if(error = device_detach(dev)) + return(error); + TAILQ_REMOVE(&(dev->drivers[level]), pdrvc, link); + free(pdrvc); + + } + } +} + /** * @brief Set the driver of a device * @@ -2994,30 +3072,42 @@ device_set_driver(device_t dev, driver_t *driver) /*TODO*/ { drv_compat_t drvc; - pdrv_compat *drvctmp; + pdrv_compat *pdrvc; uint32_t flags; int level; if (dev->state >= DS_ATTACHED) return (EBUSY); - drvc = drv_compat_find_driver (driver); + if (driver != NULL){ + drvc = drv_compat_find_driver (driver); + + drv_compat_get_flags(driver, &flags); + level = drv_compat_flags2idx(flags); - TAILQ_FOREACH(drvctmp, &(dev->drivers[level]), link){ - if (drvctmp->pdriver == drvc) - break; + TAILQ_FOREACH(pdrvc, &(dev->drivers[level]), link){ + if (pdrvc->pdriver == drvc) + break; + } + if (pdrvc){ + pdrvc->state = DS_RAW; + return (0); + } } - if (!drvctmp){ - + if(driver == NULL || level == DRV_LOWEST){ + if(!device_destroy_configuration(dev)) + return (EBUSY); } - dev->driver = drvctmp; - dev->driver_level = level; + pdrvc = malloc (sizeof(struct pdrv_compat), M_BUS, M_NOWAIT|M_ZERO); + pdrvc->pdriver = drvc; + pdrvc->state = DS_RAW; + + TAILQ_INSERT_TAIL (&(dev->drivers[level]), pdrvc); - /* - if (dev->driver == driver) - return (0); + dev->driver = pdrvc; +// dev->driver_level = level; if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) { free(dev->softc, M_BUS_SC); @@ -3030,7 +3120,9 @@ if (!dev->softc) { //kobj_delete((kobj_t) dev, 0); //kobj_init((kobj_t) dev, &null_class); - dev->driver = NULL; + //dev->driver = NULL; + TAILQ_REMOVE(&(dev->drivers[level]), pdrvc, link); + free (pdrvc); return (ENOMEM); } } @@ -3141,9 +3233,10 @@ } else { drvc = dev->driver; dev->devclass = devclass_find (DRIVERNAME(drvc->driver)); - level = drv_compat_flags2idx(drvc->flags); - TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); - dev->driver = NULL; + //level = drv_compat_flags2idx(drvc->flags); + + //TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); + //dev->driver = NULL; } dev->state = DS_ATTACHED; devadded(dev); ==== //depot/projects/soc2007/thioretic_gidl/sys/bus.h#6 (text+ko) ==== @@ -47,6 +47,7 @@ * @brief State of the device. */ typedef enum device_state { + DS_RAW, DS_NOTPRESENT, /**< @brief not probed or probe failed */ DS_ALIVE, /**< @brief probe succeeded */ DS_ATTACHED, /**< @brief attach method called */ From owner-p4-projects@FreeBSD.ORG Thu Jul 12 21:16:51 2007 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 A9ADF16A46E; Thu, 12 Jul 2007 21:16:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C4DF16A469 for ; Thu, 12 Jul 2007 21:16:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B15413C4C6 for ; Thu, 12 Jul 2007 21:16:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CLGpDZ021009 for ; Thu, 12 Jul 2007 21:16:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CLGinH021003 for perforce@freebsd.org; Thu, 12 Jul 2007 21:16:44 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 12 Jul 2007 21:16:44 GMT Message-Id: <200707122116.l6CLGinH021003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 123405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 21:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=123405 Change 123405 by kmacy@parmacvm:opentoe_parvm on 2007/07/12 21:16:19 IFC Affected files ... .. //depot/projects/opentoe/Makefile.inc1#5 integrate .. //depot/projects/opentoe/ObsoleteFiles.inc#12 integrate .. //depot/projects/opentoe/UPDATING#12 integrate .. //depot/projects/opentoe/contrib/hostapd/COPYING#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/opentoe/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/opentoe/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/hostapd/Makefile#2 integrate .. //depot/projects/opentoe/contrib/hostapd/README#2 integrate .. //depot/projects/opentoe/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/aes.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/aes.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ap.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/beacon.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/beacon.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/build_config.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/common.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/config.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/config.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/defconfig#2 integrate .. //depot/projects/opentoe/contrib/hostapd/defs.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/des.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/opentoe/contrib/hostapd/driver.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/opentoe/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/opentoe/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/opentoe/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/includes.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/md4.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/md5.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/md5.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/milenage.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/milenage.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/mlme.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/mlme.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/os.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/os_none.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/preauth.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/preauth.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/radius.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/radius.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/sha256.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/sha256.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/tls.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/version.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/wme.c#1 branch .. //depot/projects/opentoe/contrib/hostapd/wme.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/opentoe/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/opentoe/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/opentoe/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/opentoe/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/opentoe/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/opentoe/lib/libarchive/Makefile#8 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/opentoe/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/opentoe/notes.txt#1 add .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/opentoe/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/opentoe/share/man/man4/wi.4#3 integrate .. //depot/projects/opentoe/share/man/man9/taskqueue.9#2 integrate .. //depot/projects/opentoe/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/opentoe/sys/coda/00READ#2 delete .. //depot/projects/opentoe/sys/coda/cnode.h#2 integrate .. //depot/projects/opentoe/sys/coda/coda.h#2 integrate .. //depot/projects/opentoe/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/opentoe/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/opentoe/sys/coda/coda_venus.c#2 integrate .. //depot/projects/opentoe/sys/coda/coda_venus.h#2 integrate .. //depot/projects/opentoe/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/opentoe/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/opentoe/sys/conf/NOTES#10 integrate .. //depot/projects/opentoe/sys/conf/files#13 integrate .. //depot/projects/opentoe/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/opentoe/sys/conf/kmod.mk#4 integrate .. //depot/projects/opentoe/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/opentoe/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#21 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#25 integrate .. //depot/projects/opentoe/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/opentoe/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/opentoe/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/opentoe/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/opentoe/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/opentoe/sys/dev/isp/isp.c#6 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/opentoe/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/opentoe/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/opentoe/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/opentoe/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/opentoe/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/opentoe/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/opentoe/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/opentoe/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/opentoe/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/opentoe/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/opentoe/sys/fs/coda/README#1 branch .. //depot/projects/opentoe/sys/fs/coda/TODO#1 branch .. //depot/projects/opentoe/sys/fs/coda/cnode.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/opentoe/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/opentoe/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/opentoe/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/opentoe/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/opentoe/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/opentoe/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/opentoe/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_exec.c#6 integrate .. //depot/projects/opentoe/sys/kern/kern_resource.c#6 integrate .. //depot/projects/opentoe/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/opentoe/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/opentoe/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/opentoe/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/opentoe/sys/netinet/udp_var.h#3 integrate .. //depot/projects/opentoe/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/opentoe/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/opentoe/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/opentoe/sys/sys/lock_profile.h#6 integrate .. //depot/projects/opentoe/sys/sys/sysent.h#4 integrate .. //depot/projects/opentoe/sys/vm/vm_page.c#5 integrate .. //depot/projects/opentoe/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/opentoe/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/opentoe/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/opentoe/usr.bin/kdump/kdump.c#4 integrate .. //depot/projects/opentoe/usr.sbin/dconschat/dconschat.c#4 integrate .. //depot/projects/opentoe/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/hostapd_cli/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/l2_packet.c#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/wpa_cli/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/wpa_passphrase/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate .. //depot/projects/opentoe/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/opentoe/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -967,6 +967,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/opentoe/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.105 2007/07/12 00:02:12 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -59,6 +59,10 @@ OLD_FILES+=usr/include/fs/umapfs/umap.h OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz OLD_DIRS+=usr/include/fs/umapfs +# 20070618: Removal of the PROTO.localhost* files +OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=etc/namedb/PROTO.localhost.rev +OLD_FILES+=etc/namedb/make-localhost # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/opentoe/UPDATING#12 (text+ko) ==== @@ -46,7 +46,7 @@ cards should be configured using ifconfig(8), see the man page for more information. -20060612: +20070612: The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver instead of the nve(4) driver. Please update your configuration accordingly. @@ -887,4 +887,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.502 2007/07/06 06:35:50 yongari Exp $ +$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $ ==== //depot/projects/opentoe/contrib/hostapd/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/opentoe/contrib/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,9 +1,136 @@ ChangeLog for hostapd -2006-02-08 - v0.4.8 +2007-05-28 - v0.5.8 + * updated driver_devicescape.c to build with the current + wireless-dev.git tree and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed EAP-MSCHAPv2 server to use a space between S and M parameters + in Success Request [Bug 203] + * added support for sending EAP-AKA Notifications in error cases + * RADIUS server: added support for processing duplicate messages + (retransmissions from RADIUS client) by replying with the previous + reply + +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PSK bit ordering of the Flags field + * fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs + by reading wpa_psk_file [Bug 181] + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * fixed IPv6 connection to RADIUS accounting server + +2006-11-24 - v0.5.6 + * added support for configuring and controlling multiple BSSes per + radio interface (bss= in hostapd.conf); this is only + available with Devicescape and test driver interfaces + * fixed PMKSA cache update in the end of successful RSN + pre-authentication + * added support for dynamic VLAN configuration (i.e., selecting VLAN-ID + for each STA based on RADIUS Access-Accept attributes); this requires + VLAN support from the kernel driver/802.11 stack and this is + currently only available with Devicescape and test driver interfaces + * driver_madwifi: fixed configuration of unencrypted modes (plaintext + and IEEE 802.1X without WEP) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM) + * hlr_auc_gw: added support for reading per-IMSI Milenage keys and + parameters from a text file to make it possible to implement proper + GSM/UMTS authentication server for multiple SIM/USIM cards using + EAP-SIM/EAP-AKA + * fixed session timeout processing with drivers that do not use + ieee802_11.c (e.g., madwifi) + +2006-08-27 - v0.5.5 + * added 'hostapd_cli new_sta ' command for adding a new STA into + hostapd (e.g., to initialize wired network authentication based on an + external signal) + * fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when + using WPA2 even if PMKSA caching is not used + * added -P argument for hostapd to write the current process + id into a file + * added support for RADIUS Authentication Server MIB (RFC 2619) + +2006-06-20 - v0.5.4 + * fixed nt_password_hash build [Bug 144] + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * fixed a segmentation fault when RSN pre-authentication was completed + successfully [Bug 152] + +2006-04-27 - v0.5.3 + * do not build nt_password_hash and hlr_auc_gw by default to avoid + requiring a TLS library for a successful build; these programs can be + build with 'make nt_password_hash' and 'make hlr_auc_gw' + * added a new configuration option, eapol_version, that can be used to + set EAPOL version to 1 (default is 2) to work around broken client + implementations that drop EAPOL frames which use version number 2 + [Bug 89] + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * fixed EAP-MSCHAPv2 message length validation + +2006-03-19 - v0.5.2 * fixed stdarg use in hostapd_logger(): if both stdout and syslog logging was enabled, hostapd could trigger a segmentation fault in vsyslog on some CPU -- C library combinations + * moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external + program to make it easier to use for implementing real SS7 gateway; + eap_sim_db is not anymore used as a file name for GSM authentication + triplets; instead, it is path to UNIX domain socket that will be used + to communicate with the external gateway program (e.g., hlr_auc_gw) + * added example HLR/AuC gateway implementation, hlr_auc_gw, that uses + local information (GSM authentication triplets from a text file and + hardcoded AKA authentication data); this can be used to test EAP-SIM + and EAP-AKA + * added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw + to make it possible to test EAP-AKA with real USIM cards (this is + disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw + to enable this) + * driver_madwifi: added support for getting station RSN IE from + madwifi-ng svn r1453 and newer; this fixes RSN that was apparently + broken with earlier change (r1357) in the driver + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed WPA message 3/4 not to encrypt Key Data field (WPA IE) + [Bug 125] + * added ap_max_inactivity configuration parameter + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (test_socket=DIR:/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * added support for EAP methods to use callbacks to external programs + by buffering a pending request and processing it after the EAP method + is ready to continue + * improved EAP-SIM database interface to allow external request to GSM + HLR/AuC without blocking hostapd process + * added support for using EAP-SIM pseudonyms and fast re-authentication + * added support for EAP-AKA in the integrated EAP authenticator + * added support for matching EAP identity prefixes (e.g., "1"*) in EAP + user database to allow EAP-SIM/AKA selection without extra roundtrip + for EAP-Nak negotiation + * added support for storing EAP user password as NtPasswordHash instead + of plaintext password when using MSCHAP or MSCHAPv2 for + authentication (hash:<16-octet hex value>); added nt_password_hash + tool for hashing password to generate NtPasswordHash 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * driver_wired: fixed EAPOL sending to optionally use PAE group address ==== //depot/projects/opentoe/contrib/hostapd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,12 +1,17 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-Xlist,v 1.3 2007/07/09 16:24:41 sam Exp $ .cvsignore driver.c driver_bsd.c +driver_devicescape.c driver_madwifi.c driver_prism54.c l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c l2_packet_pcap.c +l2_packet_winpcap.c +nt_password_hash.c +os_win32.c prism54.h priv_netlink.h wireless_copy.h ==== //depot/projects/opentoe/contrib/hostapd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $ +$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $ WPA/802.1x Authenticator originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.4.8' \ - src/contrib/hostapd MALINEN v0_4_8 + cvs import -m 'Import of hostapd 0.5.8' \ + src/contrib/hostapd MALINEN v0_5_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -6-March-2006 +7-July-2007 ==== //depot/projects/opentoe/contrib/hostapd/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ CC=gcc DIR_WPA_SUPPLICANT=. -DIR_HOSTAP=. ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g @@ -11,18 +10,41 @@ CFLAGS += -DHOSTAPD_DUMP_STATE # Include directories for CVS version -CFLAGS += -I. -I$(DIR_HOSTAP) -I../utils -I$(DIR_WPA_SUPPLICANT) +CFLAGS += -I. -I../utils -I$(DIR_WPA_SUPPLICANT) # Uncomment following line and set the path to your kernel tree include # directory if your C library does not include all header files. # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o \ +-include .config + +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +ifdef CONFIG_NATIVE_WINDOWS +CFLAGS += -DCONFIG_NATIVE_WINDOWS +LIBS += -lws2_32 +endif + +OBJS = hostapd.o eloop.o ieee802_1x.o eapol_sm.o radius.o md5.o rc4.o md4.o \ common.o ieee802_11.o config.o ieee802_11_auth.o accounting.o \ sta_info.o radius_client.o sha1.o wpa.o aes_wrap.o ctrl_iface.o \ - driver_conf.o + driver_conf.o os_$(CONFIG_OS).o preauth.o pmksa_cache.o beacon.o \ + hw_features.o wme.o ap_list.o reconfig.o \ + mlme.o vlan_init.o ieee802_11h.o + +HOBJS=hlr_auc_gw.o common.o os_$(CONFIG_OS).o milenage.o aes_wrap.o --include .config +CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX ifdef CONFIG_IAPP CFLAGS += -DCONFIG_IAPP @@ -34,6 +56,15 @@ CONFIG_L2_PACKET=y endif +ifdef CONFIG_PEERKEY +CFLAGS += -DCONFIG_PEERKEY +endif + +ifdef CONFIG_IEEE80211W +CFLAGS += -DCONFIG_IEEE80211W +NEED_SHA256=y +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS += driver.o @@ -55,6 +86,11 @@ OBJS += driver_prism54.o endif +ifdef CONFIG_DRIVER_DEVICESCAPE +CFLAGS += -DCONFIG_DRIVER_DEVICESCAPE +OBJS += driver_devicescape.o +endif + ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS += driver_bsd.o @@ -70,7 +106,6 @@ ifdef CONFIG_L2_PACKET ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP ifdef CONFIG_L2_FREEBSD LIBS += -lpcap OBJS += $(DIR_WPA_SUPPLICANT)/l2_packet_freebsd.o @@ -122,9 +157,21 @@ ifdef CONFIG_EAP_SIM CFLAGS += -DEAP_SIM -OBJS += eap_sim.o $(DIR_WPA_SUPPLICANT)/eap_sim_common.o -# Example EAP-SIM interface for GSM authentication. This can be replaced with -# another file implementating the interface specified in eap_sim_db.h. +OBJS += eap_sim.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_AKA +CFLAGS += -DEAP_AKA +OBJS += eap_aka.o +CONFIG_EAP_SIM_COMMON=y +endif + +ifdef CONFIG_EAP_SIM_COMMON +OBJS += $(DIR_WPA_SUPPLICANT)/eap_sim_common.o +# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be +# replaced with another file implementating the interface specified in +# eap_sim_db.h. OBJS += eap_sim_db.o endif @@ -138,6 +185,25 @@ OBJS += eap_psk.o $(DIR_WPA_SUPPLICANT)/eap_psk_common.o endif +ifdef CONFIG_EAP_SAKE +CFLAGS += -DEAP_SAKE +OBJS += eap_sake.o $(DIR_WPA_SUPPLICANT)/eap_sake_common.o +endif + +ifdef CONFIG_EAP_GPSK +CFLAGS += -DEAP_GPSK +OBJS += eap_gpsk.o $(DIR_WPA_SUPPLICANT)/eap_gpsk_common.o +ifdef CONFIG_EAP_GPSK_SHA256 +CFLAGS += -DEAP_GPSK_SHA256 +NEED_SHA256=y +endif +endif + +ifdef CONFIG_EAP_VENDOR_TEST +CFLAGS += -DEAP_VENDOR_TEST +OBJS += eap_vendor_test.o +endif + ifdef CONFIG_EAP_TLV CFLAGS += -DEAP_TLV OBJS += eap_tlv.o @@ -145,15 +211,34 @@ ifdef CONFIG_EAP CFLAGS += -DEAP_SERVER -OBJS += eap.o eap_identity.o +OBJS += eap.o eap_methods.o eap_identity.o +endif + +ifndef CONFIG_TLS +CONFIG_TLS=openssl endif ifdef TLS_FUNCS # Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS) CFLAGS += -DEAP_TLS_FUNCS -OBJS += eap_tls_common.o $(DIR_WPA_SUPPLICANT)/tls_openssl.o +OBJS += eap_tls_common.o +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_openssl.o LIBS += -lssl -lcrypto LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/tls_gnutls.o +LIBS += -lgnutls -lgcrypt -lgpg-error +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +ifdef CONFIG_GNUTLS_EXTRA +CFLAGS += -DCONFIG_GNUTLS_EXTRA +LIBS += -lgnutls-extra +endif +NEED_CRYPTO=y else OBJS += $(DIR_WPA_SUPPLICANT)/tls_none.o endif @@ -163,10 +248,60 @@ endif ifdef MS_FUNCS +OBJS += $(DIR_WPA_SUPPLICANT)/ms_funcs.o +NEED_CRYPTO=y +endif + +ifdef NEED_CRYPTO ifndef TLS_FUNCS +ifeq ($(CONFIG_TLS), openssl) LIBS += -lcrypto +LIBS_p += -lcrypto +LIBS_h += -lcrypto +endif +ifeq ($(CONFIG_TLS), gnutls) +LIBS += -lgcrypt +LIBS_p += -lgcrypt +LIBS_h += -lgcrypt +endif +endif +ifeq ($(CONFIG_TLS), openssl) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto.o +CONFIG_INTERNAL_SHA256=y +endif +ifeq ($(CONFIG_TLS), gnutls) +OBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +OBJS_p += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o +HOBJS += $(DIR_WPA_SUPPLICANT)/crypto_gnutls.o >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 12 23:42:54 2007 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 C9A6C16A473; Thu, 12 Jul 2007 23:42:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8795B16A421 for ; Thu, 12 Jul 2007 23:42:53 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 773C513C487 for ; Thu, 12 Jul 2007 23:42:53 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CNgrHA037511 for ; Thu, 12 Jul 2007 23:42:53 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CNgrjB037508 for perforce@freebsd.org; Thu, 12 Jul 2007 23:42:53 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 12 Jul 2007 23:42:53 GMT Message-Id: <200707122342.l6CNgrjB037508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 23:42:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=123409 Change 123409 by gcooper@optimus-revised_pkgtools on 2007/07/12 23:42:51 -Fixed bug (was incrementing one too many in file read). -Removed old read_plist(..) function. -Swapped around some checks in plist_cmd(..). -Removed some debug statements. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#6 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#6 (text+ko) ==== @@ -375,9 +375,6 @@ } - else if (!strcmp(cmd, "srcdir")) - return PLIST_SRC; - else if (*cmd == 'm') { if(!strcmp(cmd+1, "ode")) @@ -396,6 +393,8 @@ } + else if (!strcmp(cmd, "srcdir")) + return PLIST_SRC; else if (!strcmp(cmd, "group")) return PLIST_CHGRP; else if (!strcmp(cmd, "pkgdep")) @@ -423,81 +422,76 @@ int cmd; - int i = 0; + unsigned int i = 0; pkg->fmtver_maj = 1; - pkg->fmtver_mnr = 0; + pkg->fmtver_mnr = 2; pkg->origin = NULL; - if(fstat( fileno(fp), &contents_stat )) { + if(fstat( fileno(fp), &contents_stat )) err(-1, "Could not fstat +CONTENTS file"); - } + /* Empty file -- don't attempt to process */ assert(contents_stat.st_size != 0); - plines = (char*) calloc(1, contents_stat.st_size); + plines = (char*) malloc(contents_stat.st_size); - for(i = 0; !feof(fp) && i <= contents_stat.st_size; i++) + for(i = 0; !feof(fp) && i < contents_stat.st_size; i++) *(plines+i) = fgetc(fp); // printf("+CONTENTS DUMP: %s\n", plines); /* Avoid strangely crafted files with zero-length, but non-zero size */ - assert(i != 0); + assert(0 != i); + /* Just in case file doesn't have EOF */ *(plines+i) = '\0'; pline = strtok(plines, "\n"); - if(trim_end_whitespace(pline)) { + if(0 == trim_end_whitespace(pline)) + errx(-1, "Length of first line was 0. This shouldn't happen"); - if(*pline != CMD_CHAR) { - cmd = PLIST_FILE; - } + cp = pline; - else { + if(*pline != CMD_CHAR) + cmd = PLIST_FILE; + else { - int major, minor; + int major, minor; - pline++; + cmd = plist_cmd(pline+1, &cp); - cp = pline; - - cmd = plist_cmd(pline, &cp); - - if (cmd != PLIST_COMMENT) { - errx(-1, "First line of +CONTENTS file was invalid (should be a " + if (cmd != PLIST_COMMENT) { + errx(-1, "First line of +CONTENTS file was invalid (should be a " "package version signature)!\nLine was: %s", pline); - } + } - if (cmd == PLIST_COMMENT && - sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", &major, &minor) == 2) { + if (cmd == PLIST_COMMENT && + sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", &major, &minor) == 2) { - pkg->fmtver_maj = major; - pkg->fmtver_mnr = minor; + pkg->fmtver_maj = major; + pkg->fmtver_mnr = minor; - /* - * If the version is greater than the version major.minor, we - * have a compatibility problem.. - */ - if (0 < verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR)) { - warnx("plist format revision (%d.%d) is higher than supported" - "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, - PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); + /* + * If the version is greater than the version major.minor, we + * have a compatibility problem.. + */ + if (0 < verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR)) { + warnx("plist format revision (%d.%d) is higher than supported" + "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, + PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); - if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { - cleanup(0); - exit(2); - } - - } + if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { + cleanup(0); + exit(2); + } } } - } else - errx(-1, "Length of first line was 0. This shouldn't happen"); + } add_plist(pkg, cmd, cp); @@ -518,7 +512,9 @@ } else if (*cp == '\0') cp = NULL; - } else + } else if (*cp == '\0') + cp = NULL; + else cmd = PLIST_FILE; add_plist(pkg, cmd, cp); @@ -542,110 +538,6 @@ return len; } -/* Read a packing list from a file */ -void -read_plist_old_np(Package *pkg, FILE *fp) -{ - -#if BUFFER_TRY - -#define MAX_BUFFER_LINES 20 - - char pline[MAX_BUFFER_LINES][FILENAME_MAX]; - - int i = -1; - int j = -1; - -#else - char pline[FILENAME_MAX]; -#endif - - char *cp; - int cmd, len, major, minor; - - pkg->fmtver_maj = 1; - pkg->fmtver_mnr = 0; - pkg->origin = NULL; - -#if BUFFER_TRY - - while (i) { - - for(i = 0; i < MAX_BUFFER_LINES && fgets(pline[i], FILENAME_MAX, fp); i++) ; - - if(!i) - break; - - for(j = 0; j < i; j++) { - - len = strlen(pline[j]); - - while(len && isspace(pline[j][len-1])) - pline[j][--len] = '\0'; - if(!len) - continue; - cp = pline[j]; - -#else - - while (fgets(pline, FILENAME_MAX, fp)) { - len = strlen(pline); - - while (len && isspace(pline[len - 1])) - pline[--len] = '\0'; - if (!len) - continue; - cp = pline; - -#endif - - if (cp[0] != CMD_CHAR) { - cmd = PLIST_FILE; - goto bottom; - } - -#if BUFFER_TRY - cmd = plist_cmd(pline[j] + 1, &cp); -#else - cmd = plist_cmd(pline + 1, &cp); -#endif - - if (cmd == FAIL) { - warnx("%s: unknown command '%s' (package tools out of date?)", - __func__, cp); - goto bottom; - } - if (*cp == '\0') { - cp = NULL; - goto bottom; - } - if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", - &major, &minor) == 2) { - pkg->fmtver_maj = major; - pkg->fmtver_mnr = minor; - if (verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR) <= 0) - goto bottom; - - warnx("plist format revision (%d.%d) is higher than supported" - "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, - PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); - if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { - cleanup(0); - exit(2); - } - } - -bottom: - add_plist(pkg, cmd, cp); -#if BUFFER_TRY - - } -#endif - - } - -} - void write_plist(Package *pkg, FILE *fp) { From owner-p4-projects@FreeBSD.ORG Thu Jul 12 23:45:58 2007 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 696F816A421; Thu, 12 Jul 2007 23:45:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C60816A46E for ; Thu, 12 Jul 2007 23:45:58 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 14C1513C45D for ; Thu, 12 Jul 2007 23:45:58 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CNjvko037684 for ; Thu, 12 Jul 2007 23:45:57 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CNjveq037681 for perforce@freebsd.org; Thu, 12 Jul 2007 23:45:57 GMT (envelope-from gcooper@FreeBSD.org) Date: Thu, 12 Jul 2007 23:45:57 GMT Message-Id: <200707122345.l6CNjveq037681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 23:45:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123410 Change 123410 by gcooper@optimus-revised_pkgtools on 2007/07/12 23:45:20 Removed debug statement. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/extract.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/extract.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jul 13 00:06:27 2007 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 47EAF16A474; Fri, 13 Jul 2007 00:06:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFF4216A46B for ; Fri, 13 Jul 2007 00:06:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2CD6513C44B for ; Fri, 13 Jul 2007 00:06:24 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6D06OV0040783 for ; Fri, 13 Jul 2007 00:06:24 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6D06NPV040780 for perforce@freebsd.org; Fri, 13 Jul 2007 00:06:23 GMT (envelope-from gcooper@FreeBSD.org) Date: Fri, 13 Jul 2007 00:06:23 GMT Message-Id: <200707130006.l6D06NPV040780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 00:06:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=123411 Change 123411 by gcooper@optimus-revised_pkgtools on 2007/07/13 00:06:05 Not sure why but existing file never made it to the depot.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#2 (text+ko) ==== @@ -268,6 +268,10 @@ { char cmd[FILENAME_MAX]; + static struct timespec before, after, time_diff; + + clock_gettime(CLOCK_REALTIME, &before); + if (fname[0] == '/') snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to); else @@ -276,6 +280,15 @@ cleanup(0); errx(2, "%s: could not perform '%s'", __func__, cmd); } + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "copy_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + } void @@ -283,6 +296,10 @@ { char cmd[FILENAME_MAX]; + static struct timespec before, after, time_diff; + + clock_gettime(CLOCK_REALTIME, &before); + if (fname[0] == '/') snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to); else @@ -291,6 +308,15 @@ cleanup(0); errx(2, "%s: could not perform '%s'", __func__, cmd); } + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "move_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + } /* @@ -306,16 +332,22 @@ { char cmd[FILENAME_MAX * 3]; + static struct timespec before, after, time_diff; + + clock_gettime(CLOCK_REALTIME, &before); + if (!to) { /* If absolute path, use it */ if (*fname == '/') dir = "/"; + snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -", dir, fname); } else snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s", fname, dir); + #ifdef DEBUG printf("Using '%s' to copy trees.\n", cmd); #endif @@ -323,16 +355,33 @@ cleanup(0); errx(2, "%s: could not perform '%s'", __func__, cmd); } + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "copy_heirarchy", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + } /* Unpack a tar file */ int unpack(const char *pkg, const char *flist) { + + static struct timespec before, after, time_diff; + + clock_gettime(CLOCK_REALTIME, &before); + const char *comp, *cp; char suff[80]; - comp = ""; + int ret_code = 0; + + comp = "-j"; + /* * Figure out by a crude heuristic whether this or not this is probably * compressed and whichever compression utility was used (gzip or bzip2). @@ -341,25 +390,27 @@ cp = strrchr(pkg, '.'); if (cp) { strcpy(suff, cp + 1); - if (strchr(suff, 'z') || strchr(suff, 'Z')) { - if (strchr(suff, 'b')) - comp = "-j"; - else - comp = "-z"; + if ((strchr(suff, 'z') || strchr(suff, 'Z')) && !strchr(suff, 'b')) { + comp = "-z"; } } } - else -#if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 - comp = "-j"; -#else - comp = "-z"; -#endif + if (vsystem("/usr/bin/tar -xp %s -f '%s' %s", comp, pkg, flist ? flist : "")) { warnx("tar extract of %s failed!", pkg); - return 1; + ret_code = 1; } - return 0; + + clock_gettime(CLOCK_REALTIME, &after); + + time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; + + time_diff.tv_sec = after.tv_sec - before.tv_sec; + + printf( "(%s) Difference: %3.20lf secs\n", "unpack", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); + + return ret_code; + } /* From owner-p4-projects@FreeBSD.ORG Fri Jul 13 00:18:40 2007 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 0516316A46C; Fri, 13 Jul 2007 00:18:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AE62516A468 for ; Fri, 13 Jul 2007 00:18:39 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9E1E213C469 for ; Fri, 13 Jul 2007 00:18:39 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6D0IdlF041762 for ; Fri, 13 Jul 2007 00:18:39 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6D0Id62041759 for perforce@freebsd.org; Fri, 13 Jul 2007 00:18:39 GMT (envelope-from gcooper@FreeBSD.org) Date: Fri, 13 Jul 2007 00:18:39 GMT Message-Id: <200707130018.l6D0Id62041759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 00:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123412 Change 123412 by gcooper@optimus-revised_pkgtools on 2007/07/13 00:17:43 Need to sync up virtual machine with server's copy of profile scripts. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jul 13 00:29:33 2007 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 6AB3C16A46E; Fri, 13 Jul 2007 00:29:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03DD516A469; Fri, 13 Jul 2007 00:29:33 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 677EB13C484; Fri, 13 Jul 2007 00:29:32 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 83220690DC6; Fri, 13 Jul 2007 01:24:04 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 43B8D690DD9; Fri, 13 Jul 2007 01:24:04 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO autolearn=ham version=3.1.7 Received: from epsilon.local (87-196-20-86.net.novis.pt [87.196.20.86]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 8EE5C690DC6; Fri, 13 Jul 2007 01:24:03 +0100 (WEST) Message-ID: <4696C765.90404@fnop.net> Date: Fri, 13 Jul 2007 01:29:25 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Eric Anderson References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> <4694C979.8090906@freebsd.org> <4694CE6F.2040103@fnop.net> <4696294E.5050007@freebsd.org> In-Reply-To: <4696294E.5050007@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 00:29:33 -0000 Eric Anderson wrote: > On 07/11/07 07:34, Rui Paulo wrote: >> Eric Anderson wrote: >>> Rui Paulo wrote: >>>> Rui Paulo wrote: >>>>> Eric Anderson wrote: >>>>>> Rui Paulo wrote: >>>>>>> Rui Paulo wrote: >>>>>>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>>>>>> >>>>>>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>>>>>> >>>>>>>> Add support for keyboard backlight control (found on MacBook >>>>>>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now >>>>>>>> created. >>>>>>>> Setting a value on the "right" or "left" nodes sets the >>>>>>>> keyboard backlight level. Reading those sysctl nodes, gives >>>>>>>> the each sensor raw >>>>>>> I did not test this as I don't own a MacBook Pro, but it should >>>>>>> work. >>>>>>> If anyone has a MacBook Pro and is willing to test, it would be much >>>>>>> appreciated. >>>>>>> >>>>>>> Regards. >>>>>> I have one of the newer MacBook Pros - with the LED backlight, etc. >>>>>> I've >>>>>> been thinking of using bootcamp to also run FreeBSD on this laptop. >>>>>> >>>>>> Do you have a wiki, or some info on how to best integrate your P4 >>>>>> tree >>>>>> on an -CURRENT system? >>>>> http://wiki.freebsd.org/AppleMacbook >>>>> >>>>> To grab my p4 branch just setup your p4 view so that >>>>> //depot/projects/soc2007/rpaulo-macbook/... matches to something >>>>> locally. >>>>> >>>>> I'm interested in knowing what works and what doesn't on the new MBPs. >>>> Also, the new drivers that you might want include on your kernel config >>>> are: msrtemp, backlight (doesn't work on MBPs) and asmc. >>>> >>> >>> Ok - also, is SMP supposed to work? I can't get the system to boot a >>> GENERIC kernel (hangs after an ACPI message, early in the boot process). >> >> That problem is not fixed yet; you can try pressing a kew during before >> the actual panic as a workaround. >> > > > Still panics at: > > ACPI APIC Table: > panic: AP #1 (PHY# 1) failed! > cpuid = 0 Ok. Try pressing the power button. Does that work? -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Fri Jul 13 00:40:07 2007 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 CBED616A469; Fri, 13 Jul 2007 00:40:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8694016A421 for ; Fri, 13 Jul 2007 00:40:06 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7560E13C45D for ; Fri, 13 Jul 2007 00:40:06 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6D0e6aR045043 for ; Fri, 13 Jul 2007 00:40:06 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6D0e6Or045040 for perforce@freebsd.org; Fri, 13 Jul 2007 00:40:06 GMT (envelope-from gcooper@FreeBSD.org) Date: Fri, 13 Jul 2007 00:40:06 GMT Message-Id: <200707130040.l6D0e6Or045040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 123413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 00:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=123413 Change 123413 by gcooper@optimus-revised_pkgtools on 2007/07/13 00:39:14 Fix for run_prof.sh (now allows you to run script from anywhere instead of from prof_scripts directory). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#4 (text+ko) ==== @@ -7,13 +7,10 @@ fi ITERATIONS=500 -LOG_DIR="/store/motonoad0/profile_logs" +LOG_DIR="/store/motonoad0/new_profile_logs" PACKAGE_DIR="/usr/ports/packages/All" -echo "Please change LOG_DIR's value" -exit -1; - -SCRIPT_DIR=$PWD +SCRIPT_DIR=`realpath $0 | perl -e '$pwd=$ENV{PWD}; print "$1/\n" if =~ /(.+)\/[^\/]+$/;'` [ ! -d "$LOG_DIR" ] && mkdir -p $LOG_DIR From owner-p4-projects@FreeBSD.ORG Fri Jul 13 01:46:13 2007 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 B88B916A494; Fri, 13 Jul 2007 01:46:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F58916A4FA for ; Fri, 13 Jul 2007 01:46:12 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from ns.trinitel.com (186.161.36.72.static.reverse.layeredtech.com [72.36.161.186]) by mx1.freebsd.org (Postfix) with ESMTP id AE3F313CCD4 for ; Fri, 13 Jul 2007 01:40:29 +0000 (UTC) (envelope-from anderson@freebsd.org) Received: from neutrino.vnode.org (r74-193-81-203.pfvlcmta01.grtntx.tl.dh.suddenlink.net [74.193.81.203]) (authenticated bits=0) by ns.trinitel.com (8.14.1/8.14.1) with ESMTP id l6D1eOCR003236 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Thu, 12 Jul 2007 20:40:25 -0500 (CDT) (envelope-from anderson@freebsd.org) Message-ID: <4696D803.8050201@freebsd.org> Date: Thu, 12 Jul 2007 20:40:19 -0500 From: Eric Anderson User-Agent: Thunderbird 2.0.0.4 (X11/20070629) MIME-Version: 1.0 To: Rui Paulo References: <200707090212.l692ClZQ011342@repoman.freebsd.org> <46919A1B.8050909@fnop.net> <46923893.5090404@freebsd.org> <46923B2B.9050204@fnop.net> <46929EB9.9080804@fnop.net> <4694C979.8090906@freebsd.org> <4694CE6F.2040103@fnop.net> <4696294E.5050007@freebsd.org> <4696C765.90404@fnop.net> In-Reply-To: <4696C765.90404@fnop.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on ns.trinitel.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 01:46:14 -0000 On 07/12/07 19:29, Rui Paulo wrote: > Eric Anderson wrote: >> On 07/11/07 07:34, Rui Paulo wrote: >>> Eric Anderson wrote: >>>> Rui Paulo wrote: >>>>> Rui Paulo wrote: >>>>>> Eric Anderson wrote: >>>>>>> Rui Paulo wrote: >>>>>>>> Rui Paulo wrote: >>>>>>>>> http://perforce.freebsd.org/chv.cgi?CH=123168 >>>>>>>>> >>>>>>>>> Change 123168 by rpaulo@rpaulo_epsilon on 2007/07/09 02:12:16 >>>>>>>>> >>>>>>>>> Add support for keyboard backlight control (found on MacBook >>>>>>>>> Pros). dev.asmc.N.light.{left,right} sysctl tree is now >>>>>>>>> created. >>>>>>>>> Setting a value on the "right" or "left" nodes sets the >>>>>>>>> keyboard backlight level. Reading those sysctl nodes, gives >>>>>>>>> the each sensor raw >>>>>>>> I did not test this as I don't own a MacBook Pro, but it should >>>>>>>> work. >>>>>>>> If anyone has a MacBook Pro and is willing to test, it would be much >>>>>>>> appreciated. >>>>>>>> >>>>>>>> Regards. >>>>>>> I have one of the newer MacBook Pros - with the LED backlight, etc. >>>>>>> I've >>>>>>> been thinking of using bootcamp to also run FreeBSD on this laptop. >>>>>>> >>>>>>> Do you have a wiki, or some info on how to best integrate your P4 >>>>>>> tree >>>>>>> on an -CURRENT system? >>>>>> http://wiki.freebsd.org/AppleMacbook >>>>>> >>>>>> To grab my p4 branch just setup your p4 view so that >>>>>> //depot/projects/soc2007/rpaulo-macbook/... matches to something >>>>>> locally. >>>>>> >>>>>> I'm interested in knowing what works and what doesn't on the new MBPs. >>>>> Also, the new drivers that you might want include on your kernel config >>>>> are: msrtemp, backlight (doesn't work on MBPs) and asmc. >>>>> >>>> Ok - also, is SMP supposed to work? I can't get the system to boot a >>>> GENERIC kernel (hangs after an ACPI message, early in the boot process). >>> That problem is not fixed yet; you can try pressing a kew during before >>> the actual panic as a workaround. >>> >> >> Still panics at: >> >> ACPI APIC Table: >> panic: AP #1 (PHY# 1) failed! >> cpuid = 0 > > Ok. Try pressing the power button. Does that work? > If I hold it down, it powers the machine off - otherwise nothing. Eric From owner-p4-projects@FreeBSD.ORG Fri Jul 13 02:09:56 2007 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 B0A6C16A408; Fri, 13 Jul 2007 02:09:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69B4916A400 for ; Fri, 13 Jul 2007 02:09:56 +0000 (UTC) (envelope-from glorgster@gmail.com) Received: from wr-out-0506.google.com (wr-out-0506.google.com [64.233.184.225]) by mx1.freebsd.org (Postfix) with ESMTP id 250BA13C4B6 for ; Fri, 13 Jul 2007 02:09:56 +0000 (UTC) (envelope-from glorgster@gmail.com) Received: by wr-out-0506.google.com with SMTP id i23so266851wra for ; Thu, 12 Jul 2007 19:09:55 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; b=L8ck30ME8kiFI+g3yZHj4wM+zTwqOEuLfpgx/r1k7gPudSW61hRLEy7jq3fmlYybZgWIUk1Dp1VALwd3bdCrm7qPMOnXAJdk5wLJugpfKcF+qhBo0B3XpkxIyb8hmuFaKSkd+wQwZysnpObJD2F/k4KxEL51NWU1bPYIJberduI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; b=gRHtZu3usKI8bgoOK09Cy/uKCWMnhrCaJ3UyEfd5MlwnH9jWdysBtrxoJZ76d1qbDyChIHdAzEUzfkPxmOUpSNguFHbdcWGNuvUUS5FqkT39CQsKRZr2weiAuEr0CyXcScyQPtmDoKsueFBh0UZEUGNuXb8zOk3xenIl8ohm7S0= Received: by 10.142.245.10 with SMTP id s10mr93774wfh.1184290838170; Thu, 12 Jul 2007 18:40:38 -0700 (PDT) Received: by 10.143.35.15 with HTTP; Thu, 12 Jul 2007 18:40:38 -0700 (PDT) Message-ID: Date: Fri, 13 Jul 2007 12:40:38 +1100 From: "Alexey Tarasov" To: "Hans Petter Selasky" In-Reply-To: <200707121831.22913.hselasky@c2i.net> MIME-Version: 1.0 References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> <200707121831.22913.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Shteryana Shopova , Perforce Change Reviews , "Constantine A. Murenin" Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 02:09:57 -0000 > http://perforce.freebsd.org/chv.cgi?CH=123376 > > Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 > > @@ -104,11 +107,11 @@ > } > > if ( (from == 0) && (size == 0) ) { > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\n\r\n", > + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name > ); > } else { > - sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: %d-%d\r\nConnection: Close\r\n\r\n", > + sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: bytes=%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > filename, server_name, from, from + size > ); > } > You might want to change long lines like these to something as follows: Ok, I'll make lines shorter. I've not found strict rule in style(9) for ");" at the end of multiple lines of parameters in function call, and thought my variant is more simple for reading. Same intention is in using curly brackets in complex single statement in if-else block. Well, it's not big problem, I may correct this on next submits. > And, don't use "sprintf". Use "snprintf" instead. As for snprintf(), I'm also wanted to make it safer, but according to man and header file - libstand have no such function. Same for strnstr(). I'm thinking about skipping sprintf() with many parameters while generating header and writing directly to socket, in such case will be more function calls and checks, but only one of them (Range field, that always has predictable size smaller then default buffer size) will use sprintf(). Best regards, Alexey From owner-p4-projects@FreeBSD.ORG Fri Jul 13 03:07:06 2007 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 E8C6216A404; Fri, 13 Jul 2007 03:07:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A0D116A400 for ; Fri, 13 Jul 2007 03:07:05 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 89F9413C441 for ; Fri, 13 Jul 2007 03:07:05 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6D375lp004708 for ; Fri, 13 Jul 2007 03:07:05 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6D374x4004705 for perforce@freebsd.org; Fri, 13 Jul 2007 03:07:04 GMT (envelope-from loafier@FreeBSD.org) Date: Fri, 13 Jul 2007 03:07:04 GMT Message-Id: <200707130307.l6D374x4004705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 123415 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 03:07:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123415 Change 123415 by loafier@chrisdsoc on 2007/07/13 03:06:03 Integegrate sound driver.. Affected files ... .. //depot/projects/soc2007/loafier_busalloc/dev/sound/pci/atiixp.c#2 integrate Differences ... ==== //depot/projects/soc2007/loafier_busalloc/dev/sound/pci/atiixp.c#2 (text+ko) ==== @@ -63,7 +63,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.18 2007/06/14 11:13:37 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.19 2007/07/09 20:41:23 ariff Exp $"); #define ATI_IXP_DMA_RETRY_MAX 100 @@ -74,6 +74,9 @@ #define ATI_IXP_BLK_MIN 32 #define ATI_IXP_BLK_ALIGN (~(ATI_IXP_BLK_MIN - 1)) +#define ATI_IXP_CHN_RUNNING 0x00000001 +#define ATI_IXP_CHN_SUSPEND 0x00000002 + struct atiixp_dma_op { volatile uint32_t addr; volatile uint16_t status; @@ -93,7 +96,8 @@ uint32_t blksz, blkcnt; uint32_t ptr, prevptr; uint32_t fmt; - int caps_32bit, dir, active; + uint32_t flags; + int caps_32bit, dir; }; struct atiixp_info { @@ -654,7 +658,7 @@ uint32_t sz, delta; volatile uint32_t ptr; - if (ch->active == 0) + if (!(ch->flags & ATI_IXP_CHN_RUNNING)) return (0); sz = ch->blksz * ch->blkcnt; @@ -672,7 +676,8 @@ return (1); } -#define atiixp_chan_active(sc) ((sc)->pch.active + (sc)->rch.active) +#define atiixp_chan_active(sc) (((sc)->pch.flags | (sc)->rch.flags) & \ + ATI_IXP_CHN_RUNNING) static void atiixp_poll_callback(void *arg) @@ -754,19 +759,19 @@ atiixp_poll_callback, sc); } } - ch->active = 1; + ch->flags |= ATI_IXP_CHN_RUNNING; break; case PCMTRIG_STOP: case PCMTRIG_ABORT: atiixp_disable_dma(ch); atiixp_flush_dma(ch); - ch->active = 0; + ch->flags &= ~ATI_IXP_CHN_RUNNING; if (sc->polling != 0) { if (atiixp_chan_active(sc) == 0) { callout_stop(&sc->poll_timer); sc->poll_ticks = 1; } else { - if (sc->pch.active != 0) + if (sc->pch.flags & ATI_IXP_CHN_RUNNING) ch = &sc->pch; else ch = &sc->rch; @@ -874,9 +879,11 @@ return; } - if ((status & ATI_REG_ISR_OUT_STATUS) && sc->pch.active != 0) + if ((status & ATI_REG_ISR_OUT_STATUS) && + (sc->pch.flags & ATI_IXP_CHN_RUNNING)) trigger |= 1; - if ((status & ATI_REG_ISR_IN_STATUS) && sc->rch.active != 0) + if ((status & ATI_REG_ISR_IN_STATUS) && + (sc->rch.flags & ATI_IXP_CHN_RUNNING)) trigger |= 2; #if 0 @@ -1332,10 +1339,14 @@ atiixp_unlock(sc); /* stop everything */ - if (sc->pch.active != 0) + if (sc->pch.flags & ATI_IXP_CHN_RUNNING) { atiixp_chan_trigger(NULL, &sc->pch, PCMTRIG_STOP); - if (sc->rch.active != 0) + sc->pch.flags |= ATI_IXP_CHN_SUSPEND; + } + if (sc->rch.flags & ATI_IXP_CHN_RUNNING) { atiixp_chan_trigger(NULL, &sc->rch, PCMTRIG_STOP); + sc->rch.flags |= ATI_IXP_CHN_SUSPEND; + } /* power down aclink and pci bus */ atiixp_lock(sc); @@ -1374,14 +1385,18 @@ if (sc->pch.channel != NULL) { if (sc->pch.fmt != 0) atiixp_chan_setformat(NULL, &sc->pch, sc->pch.fmt); - if (sc->pch.active != 0) + if (sc->pch.flags & ATI_IXP_CHN_SUSPEND) { + sc->pch.flags &= ~ATI_IXP_CHN_SUSPEND; atiixp_chan_trigger(NULL, &sc->pch, PCMTRIG_START); + } } if (sc->rch.channel != NULL) { if (sc->rch.fmt != 0) atiixp_chan_setformat(NULL, &sc->rch, sc->rch.fmt); - if (sc->rch.active != 0) + if (sc->rch.flags & ATI_IXP_CHN_SUSPEND) { + sc->rch.flags &= ~ATI_IXP_CHN_SUSPEND; atiixp_chan_trigger(NULL, &sc->rch, PCMTRIG_START); + } } /* enable interrupts */ From owner-p4-projects@FreeBSD.ORG Fri Jul 13 05:13:18 2007 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 8AD3F16A408; Fri, 13 Jul 2007 05:13:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E296416A401 for ; Fri, 13 Jul 2007 05:13:17 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe03.swip.net [212.247.154.65]) by mx1.freebsd.org (Postfix) with ESMTP id 7FDFD13C48D for ; Fri, 13 Jul 2007 05:13:17 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [212.17.141.53] (account mc467741@c2i.net HELO [10.150.48.142]) by mailfe03.swip.net (CommuniGate Pro SMTP 5.1.10) with ESMTPA id 552062280; Fri, 13 Jul 2007 07:13:13 +0200 From: Hans Petter Selasky To: Rui Paulo Date: Fri, 13 Jul 2007 07:13:14 +0200 User-Agent: KMail/1.9.5 References: <200707121918.l6CJIFkI094946@repoman.freebsd.org> In-Reply-To: <200707121918.l6CJIFkI094946@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707130713.14525.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 05:13:19 -0000 On Thursday 12 July 2007 21:18, Rui Paulo wrote: > http://perforce.freebsd.org/chv.cgi?CH=123399 > > Change 123399 by rpaulo@rpaulo_epsilon on 2007/07/12 19:18:01 > > For some reason, moused confuses sysmouse after attaching to the > HID version of the MacBook Bluetooth device. > For now, blacklist the product id of the Bluetooth controller > (in HID mode) inside ums(4). You plan to remove this Quirk at some point? I personally don't like all these quirks. Could you provide a "udesc_dump" from your MacBook and all its devices, so that we can have a look? --HPS From owner-p4-projects@FreeBSD.ORG Fri Jul 13 06:09:29 2007 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 9BA4316A406; Fri, 13 Jul 2007 06:09:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 45F0A16A401; Fri, 13 Jul 2007 06:09:29 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from relay02.kiev.sovam.com (relay02.kiev.sovam.com [62.64.120.197]) by mx1.freebsd.org (Postfix) with ESMTP id CF1E113C494; Fri, 13 Jul 2007 06:09:28 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from [89.162.146.170] (helo=skuns.kiev.zoral.com.ua) by relay02.kiev.sovam.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1I9C55-000Eif-Vn; Fri, 13 Jul 2007 06:44:37 +0300 Received: from deviant.kiev.zoral.com.ua (root@[10.1.1.148]) by skuns.kiev.zoral.com.ua (8.14.1/8.14.1) with ESMTP id l6D3iQWm014833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Jul 2007 06:44:26 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.1/8.14.1) with ESMTP id l6D3iQQ9036815; Fri, 13 Jul 2007 06:44:26 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.1/8.14.1/Submit) id l6D3iPr7036814; Fri, 13 Jul 2007 06:44:26 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 13 Jul 2007 06:44:25 +0300 From: Kostik Belousov To: Alexey Tarasov Message-ID: <20070713034425.GH2200@deviant.kiev.zoral.com.ua> References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> <200707121831.22913.hselasky@c2i.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZgsjCHEQV+PhxuqO" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: ClamAV version 0.90.3, clamav-milter version 0.90.3 on skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=failed version=3.2.1 X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on skuns.kiev.zoral.com.ua X-Scanner-Signature: 6dc4245230f22f3abb357b69a6da667e X-DrWeb-checked: yes X-SpamTest-Envelope-From: kostikbel@gmail.com X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 1217 [July 12 2007] X-SpamTest-Info: helo_type=3 X-SpamTest-Method: none X-SpamTest-Rate: 0 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release Cc: Shteryana Shopova , "Constantine A. Murenin" , Perforce Change Reviews , Hans Petter Selasky Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 06:09:30 -0000 --ZgsjCHEQV+PhxuqO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 13, 2007 at 12:40:38PM +1100, Alexey Tarasov wrote: > >http://perforce.freebsd.org/chv.cgi?CH=3D123376 > > > >Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 > > > >@@ -104,11 +107,11 @@ > > } > > > > if ( (from =3D=3D 0) && (size =3D=3D 0) ) { > >- sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: > %s\r\nConnection: Close\r\n\r\n", > >+ sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: > %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > > filename, server_name > > ); > > } else { > >- sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: > %d-%d\r\nConnection: Close\r\n\r\n", > >+ sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: > bytes=3D%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > > filename, server_name, from, from + size > > ); > > } >=20 > >You might want to change long lines like these to something as follows: > Ok, I'll make lines shorter. > I've not found strict rule in style(9) for ");" at the end of multiple li= nes > of parameters in function call, and thought my variant is more simple for > reading. Same intention is in using curly brackets in complex single > statement in if-else block. Well, it's not big problem, I may correct this > on next submits. >=20 > >And, don't use "sprintf". Use "snprintf" instead. > As for snprintf(), I'm also wanted to make it safer, but according to man > and header file - libstand have no such function. Same for strnstr(). > I'm thinking about skipping sprintf() with many parameters while generati= ng > header and writing directly to socket, in such case will be more function > calls and checks, but only one of them (Range field, that always has > predictable size smaller then default buffer size) will use sprintf(). Nobody will object if you add the functions to libstand. --ZgsjCHEQV+PhxuqO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGlvUYC3+MBN1Mb4gRAmpKAKCGMCAZowDUEfz7K+vZ9PxdSjZXeACgtJww W4gO0rvjnCo3yh1W0HIg0yw= =x41T -----END PGP SIGNATURE----- --ZgsjCHEQV+PhxuqO-- From owner-p4-projects@FreeBSD.ORG Fri Jul 13 07:24:39 2007 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 32F9116A404; Fri, 13 Jul 2007 07:24:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E7F0716A402 for ; Fri, 13 Jul 2007 07:24:38 +0000 (UTC) (envelope-from shteryana@gmail.com) Received: from wa-out-1112.google.com (wa-out-1112.google.com [209.85.146.178]) by mx1.freebsd.org (Postfix) with ESMTP id BAAED13C48E for ; Fri, 13 Jul 2007 07:24:38 +0000 (UTC) (envelope-from shteryana@gmail.com) Received: by wa-out-1112.google.com with SMTP id j37so503981waf for ; Fri, 13 Jul 2007 00:24:38 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=Ys5sHv0ZWfo/kUf3i4Z0AYoqOhj46r9qfrP/zRKeNcY+0pqW+YxhGXdpv/eRdFgUX7AGAJZ9xY+bA7k0aPdxhyzW4pqbs6NcsgQKty9RKuGbIQgftUX8F4SV2seyfrKtCCfJT/uwG18yahcpTNNn8c8/aNqbuq01pfoVCpsmuCk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=lfBLd7azgjbU+CbwJNnofD9F2/XXbsQfnPtPzo9vExs1oTOBdrPHld/iRCSti4L69ZZU+y3jrUBtEcWqlhQFNsjAqhb/cSIsjEWTDnfcqCuI3TrnofKZsilCbvopvcNWjhc5pmducK+f4PmBGcTfva3wz7vL/nz49dqKVILvm3E= Received: by 10.115.111.1 with SMTP id o1mr1347384wam.1184309950305; Thu, 12 Jul 2007 23:59:10 -0700 (PDT) Received: by 10.114.60.6 with HTTP; Thu, 12 Jul 2007 23:59:10 -0700 (PDT) Message-ID: <61b573980707122359y43bb9ec4gf76892e619cc8599@mail.gmail.com> Date: Fri, 13 Jul 2007 09:59:10 +0300 From: "Shteryana Shopova" Sender: shteryana@gmail.com To: "Alexey Tarasov" In-Reply-To: <20070713034425.GH2200@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> <200707121831.22913.hselasky@c2i.net> <20070713034425.GH2200@deviant.kiev.zoral.com.ua> X-Google-Sender-Auth: 4e57a8c3e9890798 Cc: Kostik Belousov , "Constantine A. Murenin" , Perforce Change Reviews , Hans Petter Selasky Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syrinx@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 07:24:39 -0000 style(9) says: Many of the style rules are implicit in the examples. ;) IMO it is a good idea to try to keep to the rules while coding. Also all code lines should (must ;)) contain 80 characters max. cheers, Shteryana On 7/13/07, Kostik Belousov wrote: > On Fri, Jul 13, 2007 at 12:40:38PM +1100, Alexey Tarasov wrote: > > >http://perforce.freebsd.org/chv.cgi?CH=123376 > > > > > >Change 123376 by taleks@taleks_th on 2007/07/12 14:27:18 > > > > > >@@ -104,11 +107,11 @@ > > > } > > > > > > if ( (from == 0) && (size == 0) ) { > > >- sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: > > %s\r\nConnection: Close\r\n\r\n", > > >+ sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: > > %s\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > > > filename, server_name > > > ); > > > } else { > > >- sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: > > %d-%d\r\nConnection: Close\r\n\r\n", > > >+ sprintf(http_data, "GET /%s HTTP/1.1\r\nHost: %s\r\nRange: > > bytes=%d-%d\r\nConnection: Close\r\nUser-Agent: pxe_http/0\r\n\r\n", > > > filename, server_name, from, from + size > > > ); > > > } > > > > >You might want to change long lines like these to something as follows: > > Ok, I'll make lines shorter. > > I've not found strict rule in style(9) for ");" at the end of multiple lines > > of parameters in function call, and thought my variant is more simple for > > reading. Same intention is in using curly brackets in complex single > > statement in if-else block. Well, it's not big problem, I may correct this > > on next submits. > > > > >And, don't use "sprintf". Use "snprintf" instead. > > As for snprintf(), I'm also wanted to make it safer, but according to man > > and header file - libstand have no such function. Same for strnstr(). > > I'm thinking about skipping sprintf() with many parameters while generating > > header and writing directly to socket, in such case will be more function > > calls and checks, but only one of them (Range field, that always has > > predictable size smaller then default buffer size) will use sprintf(). > Nobody will object if you add the functions to libstand. > > From owner-p4-projects@FreeBSD.ORG Fri Jul 13 08:29:14 2007 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 5FC6016A406; Fri, 13 Jul 2007 08:29:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 335CC16A400 for ; Fri, 13 Jul 2007 08:29:14 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2120913C481 for ; Fri, 13 Jul 2007 08:29:14 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6D8TE1Z043808 for ; Fri, 13 Jul 2007 08:29:14 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6D8TDdd043805 for perforce@freebsd.org; Fri, 13 Jul 2007 08:29:13 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 13 Jul 2007 08:29:13 GMT Message-Id: <200707130829.l6D8TDdd043805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 08:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=123427 Change 123427 by lulf@lulf_carrot on 2007/07/13 08:28:46 - Finish first testscript Affected files ... .. //depot/projects/soc2007/lulf/testscripts/test_raid5.sh#2 edit Differences ... ==== //depot/projects/soc2007/lulf/testscripts/test_raid5.sh#2 (text+ko) ==== @@ -14,9 +14,9 @@ echo "drive d3 device ${DEV3}" >> ${TMPFILE}; echo "volume test" >> ${TMPFILE}; echo "plex org raid5 493k" >> ${TMPFILE}; - echo "sd drive d1 len 2m" >> ${TMPFILE}; - echo "sd drive d2 len 2m" >> ${TMPFILE}; - echo "sd drive d3 len 2m" >> ${TMPFILE}; + echo "sd drive d1 len 8m" >> ${TMPFILE}; + echo "sd drive d2 len 8m" >> ${TMPFILE}; + echo "sd drive d3 len 8m" >> ${TMPFILE}; echo "Creating configuration..."; gvinum create $TMPFILE; echo "... Done:"; @@ -25,18 +25,18 @@ function raid5_init { echo "Initializing volume..." gvinum start test - sleep 4 + sleep 8 echo "... Done" } echo "1. Data initialization" create_raid5_config raid5_init -`dd if=/dev/zero of=zerofile bs=512 count=4196 > /dev/null 2> /dev/null` +`dd if=/dev/zero of=zerofile bs=512 count=8192 > /dev/null 2> /dev/null` # XXX: Bit of a hack, but we don't have any way to tell that it's up. echo "Reading volume..." -`dd if=/dev/gvinum/test of=testfile bs=512 count=4196 > /dev/null 2> /dev/null` +`dd if=/dev/gvinum/test of=testfile bs=512 count=8192 > /dev/null 2> /dev/null` echo "... Done" echo "Comparing with correct initalized data" RESULT=`diff testfile zerofile` @@ -50,19 +50,20 @@ echo "Done" gvinum resetconfig ## XXX: Input NO FUTURE +sleep 2 # Test 2 Data consistency echo "2. Data consistency" echo "Generating testdata" -dd if=/dev/random of=testdata bs=512 count=4196 > /dev/null &> /dev/null +dd if=/dev/random of=testdata bs=512 count=8192 > /dev/null &> /dev/null create_raid5_config raid5_init gvinum setstate -f stale test.p0.s0 echo "Writing testdata to degraded volume" -dd if=testdata of=/dev/gvinum/test bs=512 count=4196 > /dev/null &> /dev/null +dd if=testdata of=/dev/gvinum/test bs=512 count=8192 > /dev/null &> /dev/null echo "Reading back data from degraded volume" -dd if=/dev/gvinum/test of=testout1 bs=512 count=4196 > /dev/null &> /dev/null +dd if=/dev/gvinum/test of=testout1 bs=512 count=8192 > /dev/null &> /dev/null echo "Comparing" RESULT=`diff testdata testout1` if [ "$RESULT" == "" ]; then @@ -74,9 +75,9 @@ echo "Starting rebuild" gvinum start test -sleep 10 +sleep 15 echo "Reading back data from rebuilt volume" -dd if=/dev/gvinum/test of=testout2 bs=512 count=4196 > /dev/null &> /dev/null +dd if=/dev/gvinum/test of=testout2 bs=512 count=8192 > /dev/null &> /dev/null echo "Comparing" RESULT=`diff testdata testout2` if [ "$RESULT" == "" ]; then @@ -88,7 +89,7 @@ echo "Setting another subdisk stale" gvinum setstate -f stale test.p0.s1 echo "Reading back data from degraded volume" -dd if=/dev/gvinum/test of=testout3 bs=512 count=4196 > /dev/null &> /dev/null +dd if=/dev/gvinum/test of=testout3 bs=512 count=8192 > /dev/null &> /dev/null echo "Comparing" RESULT=`diff testdata testout3` if [ "$RESULT" == "" ]; then @@ -97,6 +98,35 @@ echo "Fail: degraded read is not correct!" ((NUMFAILED += 1)) fi +gvinum resetconfig +sleep 2 + +# Test online RAID-5 rebuild. +echo "3. Online RAID-5 rebuild" +echo "Generating testdata" +dd if=/dev/random of=testdata bs=512 count=8192 > /dev/null &> /dev/null +create_raid5_config +raid5_init +gvinum setstate -f stale test.p0.s0 +echo "Start writing testdata to degraded volume" +dd if=testdata of=/dev/gvinum/test bs=512 count=8192 > /dev/null &> /dev/null & +sleep 1 +echo "Start rebuild of volume" +gvinum start test +echo "Wait for 20 seconds" +sleep 20 +echo "Reading back data from rebuilt volume" +dd if=/dev/gvinum/test of=testout4 bs=512 count=8192 > /dev/null &> /dev/null +echo "Comparing" +RESULT=`diff testdata testout4` +if [ "$RESULT" == "" ]; then + echo "Pass: online-written data is consistent!" +else + echo "Fail: online-written data is inconsistent!" + echo $RESULT + ((NUMFAILED += 1)) +fi +gvinum resetconfig echo "Cleaning up" rm zerofile From owner-p4-projects@FreeBSD.ORG Fri Jul 13 08:57:50 2007 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 39DB816A404; Fri, 13 Jul 2007 08:57:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03C6416A402 for ; Fri, 13 Jul 2007 08:57:50 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E728313C4A5 for ; Fri, 13 Jul 2007 08:57:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6D8vntt054393 for ; Fri, 13 Jul 2007 08:57:49 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6D8vnLb054390 for perforce@freebsd.org; Fri, 13 Jul 2007 08:57:49 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 13 Jul 2007 08:57:49 GMT Message-Id: <200707130857.l6D8vnLb054390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 08:57:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123429 Change 123429 by lulf@lulf_carrot on 2007/07/13 08:57:15 - Add testscript for mirrors. - A few corrections for raid5 testscript. Affected files ... .. //depot/projects/soc2007/lulf/TODO#5 edit .. //depot/projects/soc2007/lulf/testscripts/test_mirror.sh#1 add .. //depot/projects/soc2007/lulf/testscripts/test_raid5.sh#3 edit Differences ... ==== //depot/projects/soc2007/lulf/TODO#5 (text+ko) ==== @@ -155,3 +155,7 @@ 22. Add a raid5 command to create a raid5 array the same way that is done with concat/mirror/stripe + +23. Make sure unequal plexes cannot be mirrored. + +23. Create patches. ==== //depot/projects/soc2007/lulf/testscripts/test_raid5.sh#3 (text+ko) ==== @@ -7,19 +7,19 @@ NUMFAILED=0 function create_raid5_config { - tempfoo=`basename $0`; - TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1; - echo "drive d1 device ${DEV1}" >> ${TMPFILE}; - echo "drive d2 device ${DEV2}" >> ${TMPFILE}; - echo "drive d3 device ${DEV3}" >> ${TMPFILE}; - echo "volume test" >> ${TMPFILE}; - echo "plex org raid5 493k" >> ${TMPFILE}; - echo "sd drive d1 len 8m" >> ${TMPFILE}; - echo "sd drive d2 len 8m" >> ${TMPFILE}; - echo "sd drive d3 len 8m" >> ${TMPFILE}; - echo "Creating configuration..."; - gvinum create $TMPFILE; - echo "... Done:"; + tempfoo=`basename $0` + TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || exit 1 + echo "drive d1 device ${DEV1}" >> ${TMPFILE} + echo "drive d2 device ${DEV2}" >> ${TMPFILE} + echo "drive d3 device ${DEV3}" >> ${TMPFILE} + echo "volume test" >> ${TMPFILE} + echo "plex org raid5 493k" >> ${TMPFILE} + echo "sd drive d1 len 8m" >> ${TMPFILE} + echo "sd drive d2 len 8m" >> ${TMPFILE} + echo "sd drive d3 len 8m" >> ${TMPFILE} + echo "Creating configuration..." + gvinum create $TMPFILE + echo "... Done:" } function raid5_init { @@ -131,6 +131,7 @@ echo "Cleaning up" rm zerofile rm testfile +rm testdata rm testout1 rm testout2 rm testout3 From owner-p4-projects@FreeBSD.ORG Fri Jul 13 10:45:29 2007 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 2D10A16A40A; Fri, 13 Jul 2007 10:45:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9FA5116A406 for ; Fri, 13 Jul 2007 10:45:28 +0000 (UTC) (envelope-from glorgster@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.231]) by mx1.freebsd.org (Postfix) with ESMTP id 4161913C49D for ; Fri, 13 Jul 2007 10:45:27 +0000 (UTC) (envelope-from glorgster@gmail.com) Received: by nz-out-0506.google.com with SMTP id l8so371180nzf for ; Fri, 13 Jul 2007 03:45:27 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; b=kAFqEOdJ0tPsPHH8uYpxUUYFFUZU/4ro5XNVsuuBdQ2MCaEzSsH9Oa7iMm8noIaFw/M6Nhip6lJNgvhipt93HS9GC/VvUs4WmEFarVDdWcD5Cu9GhTZcbyk7ZpZ3zNrhcW15Lu8FQr4yS8cSZgWOgXyCB51nwwDAZZBgsTVsfME= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:references; b=AtH7VNzcaekpWe9ZQ+fZv3qcHSm9ZFP+ig69vjc+djppTRBDHngp6VYnua+m6dsrAOf2ko9Q3rqQFIFEOnnjSvhlLtQuYnY9AwMiWK4DN4qOLzA0N7VLaINOlnNfH5BtgPv5WHjGhNjHvXJgdLnEDqy2tdCultphPWPdypMrHyc= Received: by 10.142.110.3 with SMTP id i3mr117848wfc.1184323526955; Fri, 13 Jul 2007 03:45:26 -0700 (PDT) Received: by 10.143.35.15 with HTTP; Fri, 13 Jul 2007 03:45:26 -0700 (PDT) Message-ID: Date: Fri, 13 Jul 2007 21:45:26 +1100 From: "Alexey Tarasov" To: "Kostik Belousov" In-Reply-To: <20070713034425.GH2200@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> <200707121831.22913.hselasky@c2i.net> <20070713034425.GH2200@deviant.kiev.zoral.com.ua> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Shteryana Shopova , "Constantine A. Murenin" , Perforce Change Reviews , Hans Petter Selasky Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 10:45:29 -0000 On 7/13/07, Kostik Belousov wrote:> Nobody will object if you add the functions to libstand. Hm, you're right. I'll add snprintf() this evening. On 7/13/07, Shteryana Shopova wrote: > IMO it is a good idea to try to keep to the rules while coding. Also > all code lines should (must ;)) contain 80 characters max. I'm trying, but large screen gives illusion that lines are short :) Well, as I said earlier, I'll recheck all code again for style problems in next submits. I hope this will be last issue with style. Best regards, Alexey From owner-p4-projects@FreeBSD.ORG Fri Jul 13 11:17:43 2007 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 702A016A403; Fri, 13 Jul 2007 11:17:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CB1816A400 for ; Fri, 13 Jul 2007 11:17:43 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B37113C48D for ; Fri, 13 Jul 2007 11:17:43 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DBHhEG067779 for ; Fri, 13 Jul 2007 11:17:43 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DBHgma067776 for perforce@freebsd.org; Fri, 13 Jul 2007 11:17:42 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 13 Jul 2007 11:17:42 GMT Message-Id: <200707131117.l6DBHgma067776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 11:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=123432 Change 123432 by anchie@anchie_malimis on 2007/07/13 11:16:45 IPSec virtualization (ESP algorithm only). Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#6 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#16 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#4 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#6 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#3 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#5 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#3 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#5 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#5 edit .. //depot/projects/vimage/src/sys/netipsec/key_debug.h#2 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#4 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#1 add .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#3 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#3 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#2 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#4 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#19 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#6 (text+ko) ==== @@ -62,6 +62,8 @@ #include #include #include +#include +#include #endif /*IPSEC*/ extern struct protosw inetsw[]; @@ -94,7 +96,9 @@ ip_ipsec_fwd(struct mbuf *m) { #ifdef IPSEC + INIT_VNET_IPSEC(curvnet); INIT_VNET_INET(curvnet); + INIT_VNET_IPSEC(curvnet); struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; @@ -138,8 +142,10 @@ * 1 = drop packet, 0 = continue processing packet. */ int + INIT_VNET_IPSEC(curvnet); ip_ipsec_input(struct mbuf *m) { + INIT_VNET_IPSEC(curvnet); struct ip *ip = mtod(m, struct ip *); #ifdef IPSEC struct m_tag *mtag; ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#16 (text+ko) ==== @@ -90,6 +90,7 @@ #ifdef IPSEC #include #include +#include #endif /*IPSEC*/ #include @@ -236,6 +237,7 @@ #ifdef INET6 INIT_VNET_INET6(curvnet); #endif + INIT_VNET_IPSEC(curvnet); struct tcphdr *th; struct ip *ip = NULL; struct ipovly *ipov; @@ -468,7 +470,7 @@ } else #endif /* INET6 */ if (inp != NULL && ipsec4_in_reject(m, inp)) { - ipsec4stat.in_polvio++; + V_ipsec4stat.in_polvio++; goto dropunlock; } #endif /* IPSEC */ ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#14 (text+ko) ==== @@ -84,6 +84,7 @@ #ifdef IPSEC #include +#include #endif #include @@ -508,6 +509,7 @@ struct sockaddr_in *udp_in) { INIT_VNET_INET(inp->inp_vnet); + INIT_VNET_IPSEC(inp->inp_vnet); struct sockaddr *append_sa; struct socket *so; struct mbuf *opts = 0; @@ -520,7 +522,7 @@ #ifdef IPSEC /* check AH/ESP integrity. */ if (ipsec4_in_reject(n, inp)) { - ipsec4stat.in_polvio++; + V_ipsec4stat.in_polvio++; m_freem(n); return; } ==== //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#4 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include #include +#include #ifdef IPSEC_DEBUG #include #else @@ -103,6 +104,7 @@ { #ifdef IPSEC INIT_VNET_INET6(curvnet); + INIT_VNET_IPSEC(curvnet); struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; @@ -149,6 +151,7 @@ { #ifdef IPSEC + INIT_VNET_IPSEC(curvnet); struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#6 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_vimage.h" #include #include @@ -53,6 +54,7 @@ #include #include #include +#include #include #include @@ -66,6 +68,7 @@ #include #include #include +#include #include #ifdef INET6 @@ -91,18 +94,27 @@ #include #include +#include #include #include +#ifndef VIMAGE #ifdef IPSEC_DEBUG int ipsec_debug = 1; #else int ipsec_debug = 0; #endif +#endif +static int vnet_ipsec_iattach(void *); +#ifdef VIMAGE +static int vnet_ipsec_idetach(void *); +#endif + /* NB: name changed so netstat doesn't use it */ +#ifndef VIMAGE struct ipsecstat ipsec4stat; int ip4_ah_offsetmask = 0; /* maybe IP_DF? */ int ip4_ipsec_dfbit = 0; /* DF bit on encap. 0: clear 1: set 2: copy */ @@ -112,7 +124,7 @@ int ip4_ah_net_deflev = IPSEC_LEVEL_USE; struct secpolicy ip4_def_policy; int ip4_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ -int ip4_esp_randpad = -1; +int ip4_esp_randpad; /* * Crypto support requirements: * @@ -121,52 +133,57 @@ * 0 take anything */ int crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; +#endif SYSCTL_DECL(_net_inet_ipsec); /* net.inet.ipsec */ -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_POLICY, - def_policy, CTLFLAG_RW, &ip4_def_policy.policy, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_ESP_TRANSLEV, esp_trans_deflev, - CTLFLAG_RW, &ip4_esp_trans_deflev, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_ESP_NETLEV, esp_net_deflev, - CTLFLAG_RW, &ip4_esp_net_deflev, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_AH_TRANSLEV, ah_trans_deflev, - CTLFLAG_RW, &ip4_ah_trans_deflev, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEF_AH_NETLEV, ah_net_deflev, - CTLFLAG_RW, &ip4_ah_net_deflev, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ipsec, IPSECCTL_DEF_POLICY, + def_policy, CTLFLAG_RW, ip4_def_policy.policy, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_DEF_ESP_TRANSLEV, + esp_trans_deflev, CTLFLAG_RW, ip4_esp_trans_deflev, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_DEF_ESP_NETLEV, + esp_net_deflev, CTLFLAG_RW, ip4_esp_net_deflev, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_DEF_AH_TRANSLEV, + ah_trans_deflev, CTLFLAG_RW, ip4_ah_trans_deflev, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_DEF_AH_NETLEV, + ah_net_deflev, CTLFLAG_RW, ip4_ah_net_deflev, 0, ""); SYSCTL_INT(_net_inet_ipsec, IPSECCTL_AH_CLEARTOS, ah_cleartos, CTLFLAG_RW, &ah_cleartos, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_AH_OFFSETMASK, - ah_offsetmask, CTLFLAG_RW, &ip4_ah_offsetmask, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DFBIT, - dfbit, CTLFLAG_RW, &ip4_ipsec_dfbit, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_ECN, - ecn, CTLFLAG_RW, &ip4_ipsec_ecn, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_DEBUG, - debug, CTLFLAG_RW, &ipsec_debug, 0, ""); -SYSCTL_INT(_net_inet_ipsec, IPSECCTL_ESP_RANDPAD, - esp_randpad, CTLFLAG_RW, &ip4_esp_randpad, 0, ""); -SYSCTL_INT(_net_inet_ipsec, OID_AUTO, - crypto_support, CTLFLAG_RW, &crypto_support,0, ""); -SYSCTL_STRUCT(_net_inet_ipsec, OID_AUTO, - ipsecstats, CTLFLAG_RD, &ipsec4stat, ipsecstat, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ipsec, IPSECCTL_AH_OFFSETMASK, + ah_offsetmask, CTLFLAG_RW, ip4_ah_offsetmask, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_DFBIT, + dfbit, CTLFLAG_RW, ip4_ipsec_dfbit, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_ECN, + ecn, CTLFLAG_RW, ip4_ipsec_ecn, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ipsec, IPSECCTL_DEBUG, + debug, CTLFLAG_RW, ipsec_debug, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, IPSECCTL_ESP_RANDPAD, + esp_randpad, CTLFLAG_RW, ip4_esp_randpad, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, OID_AUTO, + crypto_support, CTLFLAG_RW, crypto_support,0, ""); +SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ipsec, OID_AUTO, + ipsecstats, CTLFLAG_RD, ipsec4stat, ipsecstat, ""); #ifdef REGRESSION /* * When set to 1, IPsec will send packets with the same sequence number. * This allows to verify if the other side has proper replay attacks detection. */ +#ifndef VIMAGE int ipsec_replay = 0; -SYSCTL_INT(_net_inet_ipsec, OID_AUTO, test_replay, CTLFLAG_RW, &ipsec_replay, 0, - "Emulate replay attack"); +#endif +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, OID_AUTO, test_replay, + CTLFLAG_RW, ipsec_replay, 0, "Emulate replay attack"); /* * When set 1, IPsec will send packets with corrupted HMAC. * This allows to verify if the other side properly detects modified packets. */ +#ifndef VIMAGE int ipsec_integrity = 0; -SYSCTL_INT(_net_inet_ipsec, OID_AUTO, test_integrity, CTLFLAG_RW, - &ipsec_integrity, 0, "Emulate man-in-the-middle attack"); +#endif +SYSCTL_V_INT(V_NET, vnet_ipsec,_net_inet_ipsec, OID_AUTO, test_integrity, + CTLFLAG_RW, &ipsec_integrity, 0, "Emulate man-in-the-middle attack"); #endif #ifdef INET6 @@ -185,8 +202,12 @@ SYSCTL_OID(_net_inet6_ipsec6, IPSECCTL_STATS, stats, CTLFLAG_RD, 0,0, compat_ipsecstats_sysctl, "S", ""); #endif /* COMPAT_KAME */ +/* XXX SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEF_POLICY, def_policy, CTLFLAG_RW, &ip4_def_policy.policy, 0, ""); +*/ +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet6_ipsec6, IPSECCTL_DEF_POLICY, + def_policy, CTLFLAG_RW, ip4_def_policy.policy, 0, ""); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEF_ESP_TRANSLEV, esp_trans_deflev, CTLFLAG_RW, &ip6_esp_trans_deflev, 0, ""); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEF_ESP_NETLEV, esp_net_deflev, @@ -197,14 +218,32 @@ CTLFLAG_RW, &ip6_ah_net_deflev, 0, ""); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ECN, ecn, CTLFLAG_RW, &ip6_ipsec_ecn, 0, ""); -SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_DEBUG, - debug, CTLFLAG_RW, &ipsec_debug, 0, ""); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet6_ipsec6, IPSECCTL_DEBUG, + debug, CTLFLAG_RW, ipsec_debug, 0, ""); SYSCTL_INT(_net_inet6_ipsec6, IPSECCTL_ESP_RANDPAD, esp_randpad, CTLFLAG_RW, &ip6_esp_randpad, 0, ""); SYSCTL_STRUCT(_net_inet6_ipsec6, IPSECCTL_STATS, ipsecstats, CTLFLAG_RD, &ipsec6stat, ipsecstat, ""); #endif /* INET6 */ +#ifdef VIMAGE +struct vnet_ipsec vnet_ipsec_0; + +struct vnet_symmap vnet_ipsec_symmap[] = { + VNET_SYMMAP_END +}; + +static struct vnet_modinfo vnet_ipsec_modinfo = { + .id = VNET_MOD_IPSEC, + .name = "ipsec", + .symmap = NULL, + .i_attach = vnet_ipsec_iattach, + .i_detach = vnet_ipsec_idetach +}; + +MALLOC_DEFINE(M_IPSEC, "ipsec", "IPSEC instance"); +#endif + static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); #ifdef INET6 static int ipsec6_setspidx_in6pcb __P((struct mbuf *, struct in6pcb *pcb)); @@ -232,12 +271,13 @@ static struct secpolicy * key_allocsp_default(const char* where, int tag) { + INIT_VNET_IPSEC(curvnet); struct secpolicy *sp; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, printf("DP key_allocsp_default from %s:%u\n", where, tag)); - sp = &ip4_def_policy; + sp = &V_ip4_def_policy; if (sp->policy != IPSEC_POLICY_DISCARD && sp->policy != IPSEC_POLICY_NONE) { ipseclog((LOG_INFO, "fixed system default policy: %d->%d\n", @@ -301,6 +341,7 @@ struct inpcb *inp; int *error; { + INIT_VNET_IPSEC(curvnet); struct inpcbpolicy *pcbsp = NULL; struct secpolicy *currsp = NULL; /* policy on socket */ struct secpolicy *sp; @@ -411,6 +452,7 @@ int flag; int *error; { + INIT_VNET_IPSEC(curvnet); struct secpolicyindex spidx; struct secpolicy *sp; @@ -446,6 +488,7 @@ int *error; struct inpcb *inp; { + INIT_VNET_IPSEC(curvnet); struct secpolicy *sp; *error = 0; @@ -455,7 +498,7 @@ sp = ipsec_getpolicybysock(m, dir, inp, error); if (sp == NULL) { IPSEC_ASSERT(*error != 0, ("getpolicy failed w/o error")); - ipsec4stat.ips_out_inval++; + V_ipsec4stat.ips_out_inval++; return NULL; } IPSEC_ASSERT(*error == 0, ("sp w/ error set to %u", *error)); @@ -465,7 +508,7 @@ printf("%s: invalid policy %u\n", __func__, sp->policy); /* fall thru... */ case IPSEC_POLICY_DISCARD: - ipsec4stat.ips_out_polvio++; + V_ipsec4stat.ips_out_polvio++; *error = -EINVAL; /* packet is discarded by caller */ break; case IPSEC_POLICY_BYPASS: @@ -517,6 +560,7 @@ struct mbuf *m; struct in6pcb *pcb; { + //INIT_VNET_IPSEC(curvnet); struct secpolicyindex *spidx; int error; @@ -560,6 +604,7 @@ struct secpolicyindex *spidx; int needport; { + INIT_VNET_IPSEC(curvnet); struct ip *ip = NULL; struct ip ipbuf; u_int v; @@ -753,6 +798,7 @@ struct secpolicyindex *spidx; int needport; { + INIT_VNET_IPSEC(curvnet); int off, nxt; struct tcphdr th; struct udphdr uh; @@ -869,6 +915,7 @@ struct socket *so; struct inpcbpolicy **pcb_sp; { + INIT_VNET_IPSEC(curvnet); struct inpcbpolicy *new; /* sanity check. */ @@ -1012,6 +1059,7 @@ size_t len; int priv; { + INIT_VNET_IPSEC(curvnet); struct sadb_x_policy *xpl; struct secpolicy *newsp = NULL; int error; @@ -1058,6 +1106,7 @@ struct secpolicy *pcb_sp; struct mbuf **mp; { + INIT_VNET_IPSEC(curvnet); /* sanity check. */ if (pcb_sp == NULL || mp == NULL) @@ -1084,6 +1133,7 @@ size_t len; int priv; { + INIT_VNET_IPSEC(curvnet); struct sadb_x_policy *xpl; struct secpolicy **pcb_sp; @@ -1118,6 +1168,7 @@ size_t len; struct mbuf **mp; { + INIT_VNET_IPSEC(curvnet); struct sadb_x_policy *xpl; struct secpolicy *pcb_sp; @@ -1177,6 +1228,7 @@ size_t len; int priv; { + INIT_VNET_IPSEC(curvnet); struct sadb_x_policy *xpl; struct secpolicy **pcb_sp; @@ -1211,6 +1263,7 @@ size_t len; struct mbuf **mp; { + INIT_VNET_IPSEC(curvnet); struct sadb_x_policy *xpl; struct secpolicy *pcb_sp; @@ -1269,6 +1322,7 @@ ipsec_get_reqlevel(isr) struct ipsecrequest *isr; { + INIT_VNET_IPSEC(curvnet); u_int level = 0; u_int esp_trans_deflev, esp_net_deflev; u_int ah_trans_deflev, ah_net_deflev; @@ -1283,7 +1337,7 @@ #define IPSEC_CHECK_DEFAULT(lev) \ (((lev) != IPSEC_LEVEL_USE && (lev) != IPSEC_LEVEL_REQUIRE \ && (lev) != IPSEC_LEVEL_UNIQUE) \ - ? (ipsec_debug \ + ? (V_ipsec_debug \ ? log(LOG_INFO, "fixed system default level " #lev ":%d->%d\n",\ (lev), IPSEC_LEVEL_REQUIRE) \ : 0), \ @@ -1295,10 +1349,10 @@ switch (((struct sockaddr *)&isr->sp->spidx.src)->sa_family) { #ifdef INET case AF_INET: - esp_trans_deflev = IPSEC_CHECK_DEFAULT(ip4_esp_trans_deflev); - esp_net_deflev = IPSEC_CHECK_DEFAULT(ip4_esp_net_deflev); - ah_trans_deflev = IPSEC_CHECK_DEFAULT(ip4_ah_trans_deflev); - ah_net_deflev = IPSEC_CHECK_DEFAULT(ip4_ah_net_deflev); + esp_trans_deflev = IPSEC_CHECK_DEFAULT(V_ip4_esp_trans_deflev); + esp_net_deflev = IPSEC_CHECK_DEFAULT(V_ip4_esp_net_deflev); + ah_trans_deflev = IPSEC_CHECK_DEFAULT(V_ip4_ah_trans_deflev); + ah_net_deflev = IPSEC_CHECK_DEFAULT(V_ip4_ah_net_deflev); break; #endif #ifdef INET6 @@ -1373,6 +1427,7 @@ int ipsec_in_reject(struct secpolicy *sp, struct mbuf *m) { + INIT_VNET_IPSEC(curvnet); struct ipsecrequest *isr; int need_auth; @@ -1448,6 +1503,7 @@ struct mbuf *m; struct inpcb *inp; { + INIT_VNET_IPSEC(curvnet); struct secpolicy *sp; int error; int result; @@ -1466,7 +1522,7 @@ if (sp != NULL) { result = ipsec_in_reject(sp, m); if (result) - ipsec4stat.ips_in_polvio++; + V_ipsec4stat.ips_in_polvio++; KEY_FREESP(&sp); } else { result = 0; /* XXX should be panic ? @@ -1523,6 +1579,7 @@ static size_t ipsec_hdrsiz(struct secpolicy *sp) { + INIT_VNET_IPSEC(curvnet); struct ipsecrequest *isr; size_t siz; @@ -1585,6 +1642,7 @@ u_int dir; struct inpcb *inp; { + INIT_VNET_IPSEC(curvnet); struct secpolicy *sp; int error; size_t size; @@ -1623,6 +1681,7 @@ u_int dir; struct in6pcb *in6p; { + INIT_VNET_IPSEC(curvnet); struct secpolicy *sp; int error; size_t size; @@ -1724,6 +1783,7 @@ u_int32_t seq; struct secasvar *sav; { + INIT_VNET_IPSEC(curvnet); struct secreplay *replay; u_int32_t diff; int fr; @@ -1932,9 +1992,71 @@ static void ipsec_attach(void) { - SECPOLICY_LOCK_INIT(&ip4_def_policy); - ip4_def_policy.refcnt = 1; /* NB: disallow free */ +#ifdef VIMAGE + vnet_mod_register(&vnet_ipsec_modinfo); +#else + vnet_ipsec_iattach(NULL); +#endif +} + +static int +vnet_ipsec_iattach(unused) + void *unused; +{ +#ifdef VIMAGE + struct vnet_ipsec *vnet_ipsec; + + if (curvnet == &vnet_0) { + vnet_ipsec = &vnet_ipsec_0; + } else { + vnet_ipsec = malloc(sizeof(struct vnet_ipsec), + M_IPSEC, M_NOWAIT | M_ZERO); + if (vnet_ipsec == NULL) + panic("couldn't allocate memory for vnet_ipsec"); + } + curvnet->mod_data[vnet_ipsec_modinfo.id] = vnet_ipsec; + vnet_ipsec->parent_vnet = curvnet; +#endif + + #ifdef IPSEC_DEBUG + V_ipsec_debug = 1; + #else + V_ipsec_debug = 0; + #endif + + SECPOLICY_LOCK_INIT(&V_ip4_def_policy); + V_ip4_def_policy.refcnt = 1; /* NB: disallow free */ + + V_ip4_ah_offsetmask = 0; /* maybe IP_DF? */ + V_ip4_ipsec_dfbit = 0; /* DF bit on encap. 0: clear 1: set 2: copy */ + V_ip4_esp_trans_deflev = IPSEC_LEVEL_USE; + V_ip4_esp_net_deflev = IPSEC_LEVEL_USE; + V_ip4_ah_trans_deflev = IPSEC_LEVEL_USE; + V_ip4_ah_net_deflev = IPSEC_LEVEL_USE; + V_ip4_ipsec_ecn = 0; + + V_ip4_esp_randpad = -1; + V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; + V_ipsec_replay = 0; + V_ipsec_integrity = 0; + + return 0; +} + +/* XXX finish this! */ +#ifdef VIMAGE +static int +vnet_ipsec_idetach(unused) + void *unused; +{ + INIT_VNET_IPSEC(curvnet); + + curvnet->mod_data[vnet_ipsec_modinfo.id] = NULL; + free((caddr_t)vnet_ipsec, M_IPSEC); + + return 0; } +#endif SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL) ==== //depot/projects/vimage/src/sys/netipsec/ipsec.h#3 (text+ko) ==== @@ -345,9 +345,9 @@ extern int ip4_esp_randpad; extern int crypto_support; -#define ipseclog(x) do { if (ipsec_debug) log x; } while (0) +#define ipseclog(x) do { if (V_ipsec_debug) log x; } while (0) /* for openbsd compatibility */ -#define DPRINTF(x) do { if (ipsec_debug) printf x; } while (0) +#define DPRINTF(x) do { if (V_ipsec_debug) printf x; } while (0) extern struct ipsecrequest *ipsec_newisr(void); extern void ipsec_delisr(struct ipsecrequest *); ==== //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#5 (text+ko) ==== @@ -90,6 +90,7 @@ #include #include +#include #include #include @@ -109,12 +110,13 @@ static int ipsec_common_input(struct mbuf *m, int skip, int protoff, int af, int sproto) { + INIT_VNET_IPSEC(curvnet); union sockaddr_union dst_address; struct secasvar *sav; u_int32_t spi; int error; - IPSEC_ISTAT(sproto, espstat.esps_input, ahstat.ahs_input, + IPSEC_ISTAT(sproto, V_espstat.esps_input, ahstat.ahs_input, ipcompstat.ipcomps_input); IPSEC_ASSERT(m != NULL, ("null packet")); @@ -123,18 +125,18 @@ sproto == IPPROTO_IPCOMP, ("unexpected security protocol %u", sproto)); - if ((sproto == IPPROTO_ESP && !esp_enable) || + if ((sproto == IPPROTO_ESP && !V_esp_enable) || (sproto == IPPROTO_AH && !ah_enable) || (sproto == IPPROTO_IPCOMP && !ipcomp_enable)) { m_freem(m); - IPSEC_ISTAT(sproto, espstat.esps_pdrops, ahstat.ahs_pdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_pdrops, ahstat.ahs_pdrops, ipcompstat.ipcomps_pdrops); return EOPNOTSUPP; } if (m->m_pkthdr.len - skip < 2 * sizeof (u_int32_t)) { m_freem(m); - IPSEC_ISTAT(sproto, espstat.esps_hdrops, ahstat.ahs_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); DPRINTF(("%s: packet too small\n", __func__)); return EINVAL; @@ -180,7 +182,7 @@ default: DPRINTF(("%s: unsupported protocol family %u\n", __func__, af)); m_freem(m); - IPSEC_ISTAT(sproto, espstat.esps_nopf, ahstat.ahs_nopf, + IPSEC_ISTAT(sproto, V_espstat.esps_nopf, ahstat.ahs_nopf, ipcompstat.ipcomps_nopf); return EPFNOSUPPORT; } @@ -191,7 +193,7 @@ DPRINTF(("%s: no key association found for SA %s/%08lx/%u\n", __func__, ipsec_address(&dst_address), (u_long) ntohl(spi), sproto)); - IPSEC_ISTAT(sproto, espstat.esps_notdb, ahstat.ahs_notdb, + IPSEC_ISTAT(sproto, V_espstat.esps_notdb, ahstat.ahs_notdb, ipcompstat.ipcomps_notdb); m_freem(m); return ENOENT; @@ -201,7 +203,7 @@ DPRINTF(("%s: attempted to use uninitialized SA %s/%08lx/%u\n", __func__, ipsec_address(&dst_address), (u_long) ntohl(spi), sproto)); - IPSEC_ISTAT(sproto, espstat.esps_noxform, ahstat.ahs_noxform, + IPSEC_ISTAT(sproto, V_espstat.esps_noxform, ahstat.ahs_noxform, ipcompstat.ipcomps_noxform); KEY_FREESAV(&sav); m_freem(m); @@ -278,6 +280,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int protoff, struct m_tag *mt) { + INIT_VNET_IPSEC(curvnet); int prot, af, sproto; struct ip *ip; struct m_tag *mtag; @@ -306,7 +309,7 @@ /* Sanity check */ if (m == NULL) { DPRINTF(("%s: null mbuf", __func__)); - IPSEC_ISTAT(sproto, espstat.esps_badkcr, ahstat.ahs_badkcr, + IPSEC_ISTAT(sproto, V_espstat.esps_badkcr, ahstat.ahs_badkcr, ipcompstat.ipcomps_badkcr); KEY_FREESAV(&sav); return EINVAL; @@ -318,7 +321,7 @@ DPRINTF(("%s: processing failed for SA %s/%08lx\n", __func__, ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTAT(sproto, espstat.esps_hdrops, ahstat.ahs_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = ENOBUFS; goto bad; @@ -340,7 +343,7 @@ struct ip ipn; if (m->m_pkthdr.len - skip < sizeof(struct ip)) { - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = EINVAL; @@ -371,7 +374,7 @@ ipsp_address(saidx->dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTAT(sproto, espstat.esps_pdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_pdrops, ahstat.ahs_pdrops, ipcompstat.ipcomps_pdrops); error = EACCES; @@ -384,7 +387,7 @@ struct ip6_hdr ip6n; if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) { - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = EINVAL; @@ -413,7 +416,7 @@ ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTAT(sproto, espstat.esps_pdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_pdrops, ahstat.ahs_pdrops, ipcompstat.ipcomps_pdrops); error = EACCES; @@ -436,7 +439,7 @@ sizeof(struct tdb_ident), M_NOWAIT); if (mtag == NULL) { DPRINTF(("%s: failed to get tag\n", __func__)); - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = ENOMEM; goto bad; @@ -471,7 +474,7 @@ * Re-dispatch via software interrupt. */ if ((error = netisr_queue(NETISR_IP, m))) { - IPSEC_ISTAT(sproto, espstat.esps_qfull, ahstat.ahs_qfull, + IPSEC_ISTAT(sproto, V_espstat.esps_qfull, ahstat.ahs_qfull, ipcompstat.ipcomps_qfull); DPRINTF(("%s: queue full; proto %u packet dropped\n", @@ -496,6 +499,7 @@ int ipsec6_common_input(struct mbuf **mp, int *offp, int proto) { + INIT_VNET_IPSEC(curvnet); int l = 0; int protoff; struct ip6_ext ip6e; @@ -525,7 +529,7 @@ if (protoff + l != *offp) { DPRINTF(("%s: bad packet header chain, protoff %u, " "l %u, off %u\n", __func__, protoff, l, *offp)); - IPSEC_ISTAT(proto, espstat.esps_hdrops, + IPSEC_ISTAT(proto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); m_freem(*mp); @@ -547,6 +551,7 @@ struct m_tag *mt) { INIT_VNET_INET6(curvnet); + INIT_VNET_IPSEC(curvnet); int prot, af, sproto; struct ip6_hdr *ip6; struct m_tag *mtag; @@ -573,7 +578,7 @@ /* Sanity check */ if (m == NULL) { DPRINTF(("%s: null mbuf", __func__)); - IPSEC_ISTAT(sproto, espstat.esps_badkcr, ahstat.ahs_badkcr, + IPSEC_ISTAT(sproto, V_espstat.esps_badkcr, ahstat.ahs_badkcr, ipcompstat.ipcomps_badkcr); error = EINVAL; goto bad; @@ -587,7 +592,7 @@ __func__, ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTAT(sproto, espstat.esps_hdrops, ahstat.ahs_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = EACCES; goto bad; @@ -606,7 +611,7 @@ struct ip ipn; if (m->m_pkthdr.len - skip < sizeof(struct ip)) { - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = EINVAL; @@ -633,7 +638,7 @@ ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTATsproto, (espstat.esps_pdrops, + IPSEC_ISTATsproto, (V_espstat.esps_pdrops, ahstat.ahs_pdrops, ipcompstat.ipcomps_pdrops); error = EACCES; goto bad; @@ -646,7 +651,7 @@ struct ip6_hdr ip6n; if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) { - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = EINVAL; @@ -675,7 +680,7 @@ ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi))); - IPSEC_ISTAT(sproto, espstat.esps_pdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_pdrops, ahstat.ahs_pdrops, ipcompstat.ipcomps_pdrops); error = EACCES; goto bad; @@ -696,7 +701,7 @@ sizeof(struct tdb_ident), M_NOWAIT); if (mtag == NULL) { DPRINTF(("%s: failed to get tag\n", __func__)); - IPSEC_ISTAT(sproto, espstat.esps_hdrops, + IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, ahstat.ahs_hdrops, ipcompstat.ipcomps_hdrops); error = ENOMEM; goto bad; ==== //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#3 (text+ko) ==== @@ -31,16 +31,19 @@ */ #include "opt_param.h" +#include "opt_vimage.h" #include #include #include #include +#include #include #include #include +#include /* * Make space for a new header of length hlen at skip bytes @@ -53,6 +56,7 @@ struct mbuf * m_makespace(struct mbuf *m0, int skip, int hlen, int *off) { + INIT_VNET_IPSEC(curvnet); struct mbuf *m; unsigned remain; @@ -88,7 +92,7 @@ return (NULL); n->m_next = m->m_next; /* splice new mbuf */ m->m_next = n; - ipsec4stat.ips_mbinserted++; + V_ipsec4stat.ips_mbinserted++; if (hlen <= M_TRAILINGSPACE(m) + remain) { /* * New header fits in the old mbuf if we copy @@ -122,7 +126,7 @@ /* splice in second mbuf */ n2->m_next = n->m_next; n->m_next = n2; - ipsec4stat.ips_mbinserted++; + V_ipsec4stat.ips_mbinserted++; } else { memcpy(mtod(n, caddr_t) + hlen, mtod(m, caddr_t) + skip, remain); @@ -155,6 +159,7 @@ caddr_t m_pad(struct mbuf *m, int n) { + INIT_VNET_IPSEC(curvnet); register struct mbuf *m0, *m1; register int len, pad; caddr_t retval; @@ -227,6 +232,7 @@ int m_striphdr(struct mbuf *m, int skip, int hlen) { + INIT_VNET_IPSEC(curvnet); struct mbuf *m1; int roff; @@ -238,7 +244,7 @@ /* Remove the header and associated data from the mbuf. */ if (roff == 0) { /* The header was at the beginning of the mbuf */ - ipsec4stat.ips_input_front++; + V_ipsec4stat.ips_input_front++; m_adj(m1, hlen); if ((m1->m_flags & M_PKTHDR) == 0) m->m_pkthdr.len -= hlen; @@ -250,7 +256,7 @@ * so first let's remove the remainder of the header from * the beginning of the remainder of the mbuf chain, if any. */ - ipsec4stat.ips_input_end++; + V_ipsec4stat.ips_input_end++; if (roff + hlen > m1->m_len) { /* Adjust the next mbuf by the remainder */ m_adj(m1->m_next, roff + hlen - m1->m_len); @@ -275,7 +281,7 @@ * The header lies in the "middle" of the mbuf; copy * the remainder of the mbuf down over the header. */ - ipsec4stat.ips_input_middle++; + V_ipsec4stat.ips_input_middle++; bcopy(mtod(m1, u_char *) + roff + hlen, mtod(m1, u_char *) + roff, m1->m_len - (roff + hlen)); ==== //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#5 (text+ko) ==== @@ -81,12 +81,14 @@ #include #include #include +#include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 13 11:34:05 2007 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 C0ACE16A403; Fri, 13 Jul 2007 11:34:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5B46316A401 for ; Fri, 13 Jul 2007 11:34:04 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 48E7213C4A5 for ; Fri, 13 Jul 2007 11:34:04 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DBY4og068922 for ; Fri, 13 Jul 2007 11:34:04 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DBY4Pf068919 for perforce@freebsd.org; Fri, 13 Jul 2007 11:34:04 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 13 Jul 2007 11:34:04 GMT Message-Id: <200707131134.l6DBY4Pf068919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 11:34:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123433 Change 123433 by lulf@lulf_carrot on 2007/07/13 11:33:35 - Remove old comments. - Remember to pass the flags to detach command. - Update volume size after attach of subdisk. - Do not allow attach on concatenated plexes. It doesn't really have any use, and it makes checking plex_offset a bit complicated. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#28 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#18 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#28 (text+ko) ==== @@ -246,8 +246,11 @@ return; } p = gv_find_plex(sc, parent); + if (p->org == GV_PLEX_CONCAT) { + gctl_error(req, "attach on concat plex not allowed"); + break; + } s = gv_find_sd(sc, child); - /* XXX: Rename not supported yet. */ gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, *offset, *rename); break; default: @@ -275,14 +278,12 @@ type = gv_object_type(sc, object); switch (type) { case GV_TYPE_PLEX: - /* XXX: Support flags. */ p = gv_find_plex(sc, object); - gv_post_event(sc, GV_EVENT_DETACH_PLEX, p, NULL, 0, 0); + gv_post_event(sc, GV_EVENT_DETACH_PLEX, p, NULL, *flags, 0); break; case GV_TYPE_SD: - /* XXX: Support flags. */ s = gv_find_sd(sc, object); - gv_post_event(sc, GV_EVENT_DETACH_SD, s, NULL, 0, 0); + gv_post_event(sc, GV_EVENT_DETACH_SD, s, NULL, *flags, 0); break; default: gctl_error(req, "invalid object type"); @@ -745,7 +746,8 @@ case GV_EVENT_DETACH_PLEX: printf("VINUM: event 'detach'\n"); p = ev->arg1; - err = gv_detach_plex(p, 0); + flags = ev->arg3; + err = gv_detach_plex(p, flags); if (err) printf("VINUM: error detaching %s: " "error code %d\n", p->name, err); @@ -754,7 +756,8 @@ case GV_EVENT_DETACH_SD: printf("VINUM: event 'detach'\n"); s = ev->arg1; - err = gv_detach_sd(s, 0); + flags = ev->arg3; + err = gv_detach_sd(s, flags); if (err) printf("VINUM: error detaching %s: " "error code %d\n", s->name, err); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#18 (text+ko) ==== @@ -1108,6 +1108,8 @@ snprintf(s->name, GV_MAXSDNAME, "%s.s%d", s->plex, p->sdcount - 1); } + if (p->vol_sc != NULL) + gv_update_vol_size(p->vol_sc, gv_vol_size(p->vol_sc)); gv_save_config(p->vinumconf); /* We don't update the subdisk state since the user might have to * initiate a rebuild/sync first. */ From owner-p4-projects@FreeBSD.ORG Fri Jul 13 11:37:09 2007 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 864A816A404; Fri, 13 Jul 2007 11:37:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4141716A401 for ; Fri, 13 Jul 2007 11:37:09 +0000 (UTC) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1926113C478 for ; Fri, 13 Jul 2007 11:37:09 +0000 (UTC) (envelope-from jkoshy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DBb8Mc069069 for ; Fri, 13 Jul 2007 11:37:08 GMT (envelope-from jkoshy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DBb8vp069066 for perforce@freebsd.org; Fri, 13 Jul 2007 11:37:08 GMT (envelope-from jkoshy@freebsd.org) Date: Fri, 13 Jul 2007 11:37:08 GMT Message-Id: <200707131137.l6DBb8vp069066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkoshy@freebsd.org using -f From: Joseph Koshy To: Perforce Change Reviews Cc: Subject: PERFORCE change 123434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 11:37:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=123434 Change 123434 by jkoshy@jkoshy_soc_pmcgui on 2007/07/13 11:36:48 - Add a README for mprevot@'s PMCGUI project. Affected files ... .. //depot/projects/soc2007/mprevot-pmcgui/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jul 13 12:22:30 2007 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 4134016A4AB; Fri, 13 Jul 2007 12:22:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0290E16A40F; Fri, 13 Jul 2007 12:22:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id A32A613C4A5; Fri, 13 Jul 2007 12:22:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l6DCMJHM003289; Fri, 13 Jul 2007 08:22:24 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: "M. Warner Losh" Date: Fri, 13 Jul 2007 08:08:54 -0400 User-Agent: KMail/1.9.6 References: <200707090405.l69456Mw026331@repoman.freebsd.org> <20070710.112123.-345495745.imp@bsdimp.com> In-Reply-To: <20070710.112123.-345495745.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707130808.55708.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 13 Jul 2007 08:22:25 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3656/Fri Jul 13 07:24:51 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: perforce@freebsd.org, cnst@freebsd.org Subject: Re: PERFORCE change 123172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 12:22:30 -0000 On Tuesday 10 July 2007 01:21:23 pm M. Warner Losh wrote: > In message: <200707090405.l69456Mw026331@repoman.freebsd.org> > "Constantine A. Murenin" writes: > : http://perforce.freebsd.org/chv.cgi?CH=123172 > : > : Change 123172 by cnst@dale on 2007/07/09 04:04:33 > : > : print nameunit before chip name, which wasn't printed > : because on OpenBSD lm produced only one line in dmesg > : > : On OpenBSD: > : lm0 at isa0 port 0x290/8: W83627DHG > : > : Now on FreeBSD: > : lm0 at port 0x290 on isa0 > : lm0: W83627DHG > > You should be setting the device description to W83627DHG if at all > possible. That will result in: > > lm0: at port 0x290 on isa0 Also, in general you should use device_printf(). That is use: device_printf(dev, "%s\n", my_string); rather than: printf("%s: ", device_get_nameunit(dev)); ... printf("%s\n", my_string); This does look like you need to use device_set_desc() in your probe routine though. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Jul 13 12:22:33 2007 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 4570D16A4E1; Fri, 13 Jul 2007 12:22:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0E1A116A4CD; Fri, 13 Jul 2007 12:22:33 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id A055E13C461; Fri, 13 Jul 2007 12:22:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l6DCMJHN003289; Fri, 13 Jul 2007 08:22:27 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Fri, 13 Jul 2007 08:21:58 -0400 User-Agent: KMail/1.9.6 References: <200706281214.l5SCEhFq046327@repoman.freebsd.org> <200706292052.06861.jhb@freebsd.org> <20070702131038.GA31701@freebsd.org> In-Reply-To: <20070702131038.GA31701@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707130822.00255.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 13 Jul 2007 08:22:27 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3656/Fri Jul 13 07:24:51 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 12:22:33 -0000 On Monday 02 July 2007 09:10:38 am Roman Divacky wrote: > On Fri, Jun 29, 2007 at 08:52:06PM -0400, John Baldwin wrote: > > On Thursday 28 June 2007 08:14:43 am Roman Divacky wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=122480 > > > > > > Change 122480 by rdivacky@rdivacky_witten on 2007/06/28 12:14:14 > > > > > > vrele AFTER checking the vp for being on non-MPSAFE FS + some indentation > > > problems that caused bad scoping > > > > > > Noticed by: rwatson (again ;) ) > > > > Umm, no. You need Giant for the vrele(). The proper fix is to use the > > VFS_*_GIANT() macros and use int variables to know if you need to unlock > > Giant or not. > > I dont see an easy and elegant way how to use the VFS_*_GIANT macros. I lock > the giant in kern_get_at() function and unlock in function that calls this one. ie.: > > foo() > { > kern_get_at(...); > ... > if (VFS_NEEDSGIANT) > mtx_unlock(&Giant); > } > > I need to either propagate the vfslocked value from kern_get_at or lock the Giant in the foo() > function. honestly I dont like either much > > what do you suggest? I would lock Giant in foo() if you already have the vnode in foo(). -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Jul 13 12:47:49 2007 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 3EB3816A404; Fri, 13 Jul 2007 12:47:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F0D3D16A414 for ; Fri, 13 Jul 2007 12:47:48 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E119813C4C6 for ; Fri, 13 Jul 2007 12:47:48 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DClm8p083308 for ; Fri, 13 Jul 2007 12:47:48 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DClm4i083305 for perforce@freebsd.org; Fri, 13 Jul 2007 12:47:48 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 13 Jul 2007 12:47:48 GMT Message-Id: <200707131247.l6DClm4i083305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 12:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=123437 Change 123437 by anchie@anchie_malimis on 2007/07/13 12:47:28 Some small fixes. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#7 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#2 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#7 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include #include -#include #endif /*IPSEC*/ extern struct protosw inetsw[]; @@ -96,7 +95,6 @@ ip_ipsec_fwd(struct mbuf *m) { #ifdef IPSEC - INIT_VNET_IPSEC(curvnet); INIT_VNET_INET(curvnet); INIT_VNET_IPSEC(curvnet); struct m_tag *mtag; @@ -142,7 +140,6 @@ * 1 = drop packet, 0 = continue processing packet. */ int - INIT_VNET_IPSEC(curvnet); ip_ipsec_input(struct mbuf *m) { INIT_VNET_IPSEC(curvnet); ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#2 (text+ko) ==== @@ -109,9 +109,9 @@ #define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) #define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) #define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) -#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) -#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) -#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) +#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) +#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) +#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) #define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) #define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) #define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) @@ -122,21 +122,21 @@ #define V_key_spi_trycnt VNET_IPSEC(key_spi_trycnt) #define V_key_spi_minval VNET_IPSEC(key_spi_minval) #define V_key_spi_maxval VNET_IPSEC(key_spi_maxval) -#define V_policy_id VNET_IPSEC(policy_id) +#define V_policy_id VNET_IPSEC(policy_id) #define V_key_int_random VNET_IPSEC(key_int_random) -#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime) -#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count) -#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime) -#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa) -#define V_acq_seq VNET_IPSEC(acq_seq) -#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) +#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime) +#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count) +#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime) +#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa) +#define V_acq_seq VNET_IPSEC(acq_seq) +#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) #define V_saorder_state_any VNET_IPSEC(saorder_state_any) #define V_esp_enable VNET_IPSEC(esp_enable) -#define V_espstat VNET_IPSEC(espstat) +#define V_espstat VNET_IPSEC(espstat) #define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) #define V_ipsec_esp_keymin VNET_IPSEC(ipsec_esp_keymin) #define V_ipsec_esp_auth VNET_IPSEC(ipsec_esp_auth) #define V_ipsec_ah_keymin VNET_IPSEC(ipsec_ah_keymin) #define V_ipip_allow VNET_IPSEC(ipip_allow) -#define V_ipipstat VNET_IPSEC(ipipstat) +#define V_ipipstat VNET_IPSEC(ipipstat) #endif /* !_NETIPSEC_VIPSEC_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Jul 13 13:01:05 2007 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 8E50B16A40F; Fri, 13 Jul 2007 13:01:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F5D316A407 for ; Fri, 13 Jul 2007 13:01:05 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4E8B413C4D1 for ; Fri, 13 Jul 2007 13:01:05 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DD15TI084247 for ; Fri, 13 Jul 2007 13:01:05 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DD15es084243 for perforce@freebsd.org; Fri, 13 Jul 2007 13:01:05 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 13 Jul 2007 13:01:05 GMT Message-Id: <200707131301.l6DD15es084243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 123438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 13:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123438 Change 123438 by anchie@anchie_malimis on 2007/07/13 13:00:13 Remove a stale printf(). Do not schedule key_timehandler() more than once. Affected files ... .. //depot/projects/vimage/src/sys/netipsec/key.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/key.c#6 (text+ko) ==== @@ -7149,8 +7149,6 @@ INIT_VNET_IPSEC(curvnet); int i; - printf(" ---> key_init <---\n"); - V_key_debug_level = 0; V_key_spi_trycnt = 1000; V_key_spi_minval = 0x100; @@ -7201,7 +7199,13 @@ V_ip4_def_policy.refcnt++; /*never reclaim this*/ #ifndef IPSEC_DEBUG2 +#ifdef VIMAGE + if (curvnet == &vnet_0) { +#endif timeout((void *)key_timehandler, (void *)0, hz); +#ifdef VIMAGE + } +#endif #endif /*IPSEC_DEBUG2*/ /* initialize key statistics */ From owner-p4-projects@FreeBSD.ORG Fri Jul 13 13:10:18 2007 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 0AAE016A404; Fri, 13 Jul 2007 13:10:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BC0216A400 for ; Fri, 13 Jul 2007 13:10:17 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8AC8813C494 for ; Fri, 13 Jul 2007 13:10:17 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DDAHhJ085841 for ; Fri, 13 Jul 2007 13:10:17 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DDAHSO085838 for perforce@freebsd.org; Fri, 13 Jul 2007 13:10:17 GMT (envelope-from smilicic@FreeBSD.org) Date: Fri, 13 Jul 2007 13:10:17 GMT Message-Id: <200707131310.l6DDAHSO085838@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 123439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 13:10:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=123439 Change 123439 by smilicic@tanarri_marilith on 2007/07/13 13:09:48 added license statements to files that didn't have them fixed a bug in g_log_access redirecting write requests to log file now works Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 edit .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#7 edit .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.c#2 edit .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.h#2 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 (text+ko) ==== @@ -1,3 +1,29 @@ +/*- + * Copyright (c) 2007 Sonja Milicic + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include __FBSDID("$FreeBSD$"); @@ -30,7 +56,7 @@ { 'f', "force", NULL, G_TYPE_NONE }, G_OPT_SENTINEL }, - "[-fv] name ..." + "[-fv] prov ..." }, { "start", G_FLAG_VERBOSE, NULL, { @@ -42,13 +68,13 @@ { G_OPT_SENTINEL }, - "[-v] name ..." + "[-v] prov ..." }, { "rollback", G_FLAG_VERBOSE, NULL, { G_OPT_SENTINEL }, - "[-v] name ..." + "[-v] prov ..." }, G_CMD_SENTINEL ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#7 (text+ko) ==== @@ -188,13 +188,13 @@ sc->sc_prov_disk = pp_disk; sc->sc_cons_disk = cp_disk; - /*create provider for log*/ + /*create provider and consumer for log*/ pp_log = g_new_providerf(gp, "%s.log", prov); - pp_log->mediasize = (off_t) 1000; + pp_log->mediasize = pp_disk->mediasize; pp_log->sectorsize = pp_disk->sectorsize; g_error_provider(pp_log, 0); + sc->sc_prov_log = pp_log; - if (g_log_event_sink_init(sc, &sc->sc_events, g_log_worker, "events") !=0){ *err=4; g_log_event_sink_destroy(&sc->sc_events); @@ -302,23 +302,27 @@ g_log_start(struct bio *bp) { struct g_log_softc *sc; + G_LOG_DEBUG(0, "request received."); + sc = bp->bio_to->geom->softc; KASSERT(sc != NULL, ("Provider's error should be set (error=%d)(device=%s).", bp->bio_to->error, bp->bio_to->name)); G_LOG_LOGREQ(DBG_NOTICE, bp, "Request received."); - g_io_deliver(bp, ENXIO); - return; switch(bp->bio_cmd) { case BIO_WRITE: + G_LOG_DEBUG(0, "Write request received."); g_log_post_event(&sc->sc_events, GLOG_EVWRITE, GLOG_FLAG_WAKEUP_SC, bp, 0); break; case BIO_READ: + g_io_deliver(bp, ENXIO); + return; g_log_post_event(&sc->sc_events, GLOG_EVREAD, GLOG_FLAG_WAKEUP_SC, bp, 0); break; default: - break; + g_io_deliver(bp, ENXIO); + return; } return; } @@ -374,7 +378,6 @@ g_wither_geom(gp, ENXIO); - G_LOG_DEBUG(0, "Really destroyed %s.", gp->name); return 0; } @@ -388,6 +391,7 @@ gp = pp->geom; sc = gp->softc; + cp = sc->sc_cons_disk; G_LOG_DEBUG(DBG_IMPORTANT, "%s: %d %d %d", __func__, dr, dw, de); if (sc == NULL) { @@ -404,12 +408,10 @@ return (0); } - LIST_FOREACH(cp, &gp->consumer, consumer){ - err = g_access(cp, dr ,dw, de); - if (err == 0) - continue; - G_LOG_DEBUG(0, "loop access"); - } + + err = g_access(cp, dr ,dw, de); + + G_LOG_DEBUG(0, "access done, %d", err); return err; } @@ -463,6 +465,7 @@ g_log_read(bp); break; case GLOG_EVWRITE: + G_LOG_DEBUG(0, "About to write data"); g_log_write(bp); break; case GLOG_EVSTOP: @@ -510,7 +513,6 @@ } /*gets next event from event queue*/ -/*BUG - causes a panic when there are no events*/ static struct g_log_event * g_log_get_event(struct g_log_event_sink *es) { @@ -537,12 +539,13 @@ struct g_log_softc *sc; void *data; int err; - G_LOG_DEBUG(0, "write request"); + G_LOG_DEBUG(0, "starting to write"); sc = bp->bio_to->geom->softc; data = bp->bio_data; - err = glog_write_file(sc->sc_vn, data, sizeof(data), 0); + err = glog_write_file(sc->sc_vn, data, bp->bio_length, 0); if (err != 0) G_LOG_DEBUG(0, "write error"); + G_LOG_DEBUG(0, "done writing."); } /*reads data from log file and/or disk*/ ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.c#2 (text+ko) ==== @@ -1,4 +1,33 @@ +/*- + * Copyright (c) 2007 Pawel Jakub Dawidek + * Copyright (c) 2007 Sonja Milicic + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include +__FBSDID("$FreeBSD$"); + #include #include #include ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.h#2 (text+ko) ==== @@ -1,3 +1,29 @@ +/*- + * Copyright (c) 2007 Sonja Milicic + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + struct vnode *glog_open_file(const char *file, int uiflags); int glog_close_file(struct vnode *vp, int uiflags); int glog_write_file(struct vnode *vp, void *buf, size_t size, off_t off); From owner-p4-projects@FreeBSD.ORG Fri Jul 13 13:42:56 2007 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 61AFD16A412; Fri, 13 Jul 2007 13:42:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D301B16A407 for ; Fri, 13 Jul 2007 13:42:55 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 5EF7113C4BC for ; Fri, 13 Jul 2007 13:42:55 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id B18FE690DC8; Fri, 13 Jul 2007 14:37:24 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 7ED8B690DE4; Fri, 13 Jul 2007 14:37:24 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO,RCVD_IN_DSBL autolearn=no version=3.1.7 Received: from epsilon.local (87-196-53-163.net.novis.pt [87.196.53.163]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 1C640690DC8; Fri, 13 Jul 2007 14:37:24 +0100 (WEST) Message-ID: <4697815C.2080103@fnop.net> Date: Fri, 13 Jul 2007 14:42:52 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Hans Petter Selasky References: <200707121918.l6CJIFkI094946@repoman.freebsd.org> <200707130713.14525.hselasky@c2i.net> In-Reply-To: <200707130713.14525.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 13:42:56 -0000 Hans Petter Selasky wrote: > On Thursday 12 July 2007 21:18, Rui Paulo wrote: >> http://perforce.freebsd.org/chv.cgi?CH=123399 >> >> Change 123399 by rpaulo@rpaulo_epsilon on 2007/07/12 19:18:01 >> >> For some reason, moused confuses sysmouse after attaching to the >> HID version of the MacBook Bluetooth device. >> For now, blacklist the product id of the Bluetooth controller >> (in HID mode) inside ums(4). > > You plan to remove this Quirk at some point? Yes. > > I personally don't like all these quirks. What do you mean by "all these quirks" ? This is the only quirk that can be overcome. The other fix I added for the Fn key in Apple USB keyboards is not optional. > Could you provide a "udesc_dump" from your MacBook and all its devices, so > that we can have a look? When I switch my bluetooth controller from HID mode to HCI mode, I see: ukbd1: at uhub3 port 1 (addr 2) disconnected ukbd1: detached ums1: at uhub3 port 1 (addr 2) disconnected ums1: detached uhid2: at uhub3 port 1 (addr 2) disconnected uhid2: detached ubt0: on uhub3 ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3; wMaxPacketSize=49; nframes=6, buffer size=294 If I start X after that, there's something fishy going on that prevents me from using the keyboard and the other usb mouses that I have attached. The workaround is to restart all moused instances. I don't really understand why this happens, because when the bluetooth controller is switched, the moused on ums1 dies. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Fri Jul 13 14:04:26 2007 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 5DC6016A408; Fri, 13 Jul 2007 14:04:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2DC0616A405 for ; Fri, 13 Jul 2007 14:04:26 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe07.swip.net [212.247.154.193]) by mx1.freebsd.org (Postfix) with ESMTP id 9867813C4AC for ; Fri, 13 Jul 2007 14:04:25 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] Received: from [212.17.141.53] (account mc467741@c2i.net HELO [10.150.85.213]) by mailfe07.swip.net (CommuniGate Pro SMTP 5.1.10) with ESMTPA id 546463078; Fri, 13 Jul 2007 16:04:22 +0200 From: Hans Petter Selasky To: Rui Paulo Date: Fri, 13 Jul 2007 16:04:22 +0200 User-Agent: KMail/1.9.5 References: <200707121918.l6CJIFkI094946@repoman.freebsd.org> <200707130713.14525.hselasky@c2i.net> <4697815C.2080103@fnop.net> In-Reply-To: <4697815C.2080103@fnop.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707131604.22648.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 14:04:26 -0000 On Friday 13 July 2007 15:42, Rui Paulo wrote: > Hans Petter Selasky wrote: > > On Thursday 12 July 2007 21:18, Rui Paulo wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=123399 > >> > >> Change 123399 by rpaulo@rpaulo_epsilon on 2007/07/12 19:18:01 > >> > >> For some reason, moused confuses sysmouse after attaching to the > >> HID version of the MacBook Bluetooth device. > >> For now, blacklist the product id of the Bluetooth controller > >> (in HID mode) inside ums(4). > > > > You plan to remove this Quirk at some point? > > Yes. > > > I personally don't like all these quirks. > > What do you mean by "all these quirks" ? This is the only quirk that can > be overcome. The other fix I added for the Fn key in Apple USB keyboards > is not optional. You should try to autodetect this. > > > Could you provide a "udesc_dump" from your MacBook and all its devices, > > so that we can have a look? Remove all USB device drivers from your kernel config file, except "device ugen". All your USB devices should show up like "ugenX" devices. Then install "/usr/ports/sysutils/udesc_dump" and run this command on all /dev/ugenX instances. Redirect the contents to a set of files and upload them somewhere. I want to have a look at the descriptors. Maybe there is a USB descriptor that you can detect, that makes a keyboard an Apple keyboard. That will be more generic than adding these quirks! > When I switch my bluetooth controller from HID mode to HCI mode, I see: > ukbd1: at uhub3 port 1 (addr 2) disconnected > ukbd1: detached > ums1: at uhub3 port 1 (addr 2) disconnected > ums1: detached > uhid2: at uhub3 port 1 (addr 2) disconnected > uhid2: detached > ubt0: 2> on uhub3 > ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2 > ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3; > wMaxPacketSize=49; nframes=6, buffer size=294 > > If I start X after that, there's something fishy going on that prevents > me from using the keyboard and the other usb mouses that I have attached. > > The workaround is to restart all moused instances. > > I don't really understand why this happens, because when the bluetooth > controller is switched, the moused on ums1 dies. Have you configured your system to detect Bluetooth Keyboard and Mouse ? --HPS From owner-p4-projects@FreeBSD.ORG Fri Jul 13 14:10:35 2007 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 A667916A408; Fri, 13 Jul 2007 14:10:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 602D916A403; Fri, 13 Jul 2007 14:10:34 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from fri.itea.ntnu.no (fri.itea.ntnu.no [129.241.7.60]) by mx1.freebsd.org (Postfix) with ESMTP id 209B613C49D; Fri, 13 Jul 2007 14:10:34 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by fri.itea.ntnu.no (Postfix) with ESMTP id E1954C335; Fri, 13 Jul 2007 16:08:35 +0200 (CEST) Received: from gaupe.stud.ntnu.no (gaupe.stud.ntnu.no [129.241.56.184]) by fri.itea.ntnu.no (Postfix) with ESMTP; Fri, 13 Jul 2007 16:08:35 +0200 (CEST) Received: by gaupe.stud.ntnu.no (Postfix, from userid 2312) id A9E89D0034; Fri, 13 Jul 2007 16:08:42 +0200 (CEST) Date: Fri, 13 Jul 2007 16:08:42 +0200 From: Ulf Lilleengen To: Sonja Milicic Message-ID: <20070713140842.GA5140@stud.ntnu.no> References: <200707131310.l6DDAHSO085838@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200707131310.l6DDAHSO085838@repoman.freebsd.org> User-Agent: Mutt/1.5.9i X-Content-Scanned: with sophos and spamassassin at mailgw.ntnu.no. Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 14:10:35 -0000 On fre, jul 13, 2007 at 01:10:17 +0000, Sonja Milicic wrote: > http://perforce.freebsd.org/chv.cgi?CH=123439 > > Change 123439 by smilicic@tanarri_marilith on 2007/07/13 13:09:48 > > added license statements to files that didn't have them > fixed a bug in g_log_access > redirecting write requests to log file now works > > Affected files ... > > .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 edit > .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#7 edit > .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.c#2 edit > .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.h#2 edit > > Differences ... > > ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 (text+ko) ==== > > *SNIP* > bp->bio_to->error, bp->bio_to->name)); > > G_LOG_LOGREQ(DBG_NOTICE, bp, "Request received."); > - g_io_deliver(bp, ENXIO); > - return; > switch(bp->bio_cmd) { > case BIO_WRITE: > + G_LOG_DEBUG(0, "Write request received."); > g_log_post_event(&sc->sc_events, GLOG_EVWRITE, GLOG_FLAG_WAKEUP_SC, bp, 0); > break; > case BIO_READ: > + g_io_deliver(bp, ENXIO); > + return; > g_log_post_event(&sc->sc_events, GLOG_EVREAD, GLOG_FLAG_WAKEUP_SC, bp, 0); This will never be reached. > break; > default: > - break; > + g_io_deliver(bp, ENXIO); > + return; > } *SNIP* > - } > + > + err = g_access(cp, dr ,dw, de); > + > + G_LOG_DEBUG(0, "access done, %d", err); > return err; Just a quick note from style(9): return values should be enclosed in parantheses like this: return (err); > } *SNIP* -- Ulf Lilleengen From owner-p4-projects@FreeBSD.ORG Fri Jul 13 14:16:07 2007 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 3157516A404; Fri, 13 Jul 2007 14:16:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C78A716A400 for ; Fri, 13 Jul 2007 14:16:06 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 38D5A13C467 for ; Fri, 13 Jul 2007 14:16:06 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 61AC1690DC8; Fri, 13 Jul 2007 15:10:35 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 2E22C690DE4; Fri, 13 Jul 2007 15:10:35 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO,RCVD_IN_DSBL autolearn=no version=3.1.7 Received: from epsilon.local (87-196-53-163.net.novis.pt [87.196.53.163]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by core.fnop.net (Postfix) with ESMTP id 9B356690DC8; Fri, 13 Jul 2007 15:10:34 +0100 (WEST) Message-ID: <46978923.6010009@fnop.net> Date: Fri, 13 Jul 2007 15:16:03 +0100 From: Rui Paulo User-Agent: Thunderbird 2.0.0.4 (X11/20070704) MIME-Version: 1.0 To: Hans Petter Selasky References: <200707121918.l6CJIFkI094946@repoman.freebsd.org> <200707130713.14525.hselasky@c2i.net> <4697815C.2080103@fnop.net> <200707131604.22648.hselasky@c2i.net> In-Reply-To: <200707131604.22648.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 14:16:07 -0000 Hans Petter Selasky wrote: > Remove all USB device drivers from your kernel config file, except "device > ugen". All your USB devices should show up like "ugenX" devices. Then > install "/usr/ports/sysutils/udesc_dump" and run this command on > all /dev/ugenX instances. Redirect the contents to a set of files and upload > them somewhere. I want to have a look at the descriptors. Maybe there is a > USB descriptor that you can detect, that makes a keyboard an Apple keyboard. > That will be more generic than adding these quirks! Well, I can do that but it will take some time. Regarding to the keyboard, it's not a descriptor but an HID usage: hid_locate(desc, size, HID_USAGE2(HUP_CUSTOM, UC_FNKEY) hid_input, &sc->sc_loc_fn, &flags)) > Have you configured your system to detect Bluetooth Keyboard and Mouse ? No. I'm not using them. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Fri Jul 13 14:32:00 2007 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 3B1B716A408; Fri, 13 Jul 2007 14:32:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5D61D16A401; Fri, 13 Jul 2007 14:31:59 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 2CE1113C441; Fri, 13 Jul 2007 14:31:59 +0000 (UTC) (envelope-from sam@errno.com) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id l6DEVpKr039076 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Jul 2007 07:31:51 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <46978D62.8000100@errno.com> Date: Fri, 13 Jul 2007 07:34:10 -0700 From: Sam Leffler User-Agent: Thunderbird 2.0.0.0 (X11/20070530) MIME-Version: 1.0 To: syrinx@freebsd.org References: <200707121428.l6CESBSj045007@repoman.freebsd.org> <46965433.6050207@FreeBSD.org> <200707121831.22913.hselasky@c2i.net> <20070713034425.GH2200@deviant.kiev.zoral.com.ua> <61b573980707122359y43bb9ec4gf76892e619cc8599@mail.gmail.com> In-Reply-To: <61b573980707122359y43bb9ec4gf76892e619cc8599@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Kostik Belousov , "Constantine A. Murenin" , Perforce Change Reviews , Alexey Tarasov , Hans Petter Selasky Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 14:32:00 -0000 [picking a random reply] Shteryana Shopova wrote: > style(9) says: > Many of the style rules are implicit in the examples. ;) > > IMO it is a good idea to try to keep to the rules while coding. Also > all code lines should (must ;)) contain 80 characters max. Folks, before things get too out of hand, please remember there are only 2 ironclad rules about style: 1. style(9) is a guideline and not a contract 2. existing style trumps any rules in style(9) (i.e. when modifying existing code) The point being that one shouldn't get too hungup about the exact form of this person's code. The convention+practice codified in style(9) represents the agreed upon common style to use but failing to follow some rules doesn't justify getting bent out of shape. Given them advise, sure. Point out the man page, absolutely. If you program long enough you will find your personal coding style varies widely (often to suit the project environment). Sam From owner-p4-projects@FreeBSD.ORG Fri Jul 13 15:02:59 2007 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 EF64A16A407; Fri, 13 Jul 2007 15:02:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B25D416A401 for ; Fri, 13 Jul 2007 15:02:58 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (haluter.fromme.com [83.120.8.11]) by mx1.freebsd.org (Postfix) with ESMTP id 0BAD113C474 for ; Fri, 13 Jul 2007 15:02:57 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (irc_sucks@localhost [127.0.0.1]) by haluter.fromme.com (8.13.4/8.13.4) with ESMTP id l6DEQdla089248; Fri, 13 Jul 2007 16:26:39 +0200 (CEST) (envelope-from olli@fromme.com) Received: (from olli@localhost) by haluter.fromme.com (8.13.4/8.12.9/Submit) id l6DEQdaS089246; Fri, 13 Jul 2007 16:26:39 +0200 (CEST) From: Oliver Fromme Message-Id: <200707131426.l6DEQdaS089246@haluter.fromme.com> To: glorgster@gmail.com (Alexey Tarasov) Date: Fri, 13 Jul 2007 16:26:39 +0200 (CEST) In-Reply-To: from "Alexey Tarasov" at Jul 13, 2007 09:45:26 PM X-Mailer: ELM [version 2.5 PL6] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (haluter.fromme.com [127.0.0.1]); Fri, 13 Jul 2007 16:26:39 +0200 (CEST) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 15:02:59 -0000 Alexey Tarasov wrote: > Shteryana Shopova wrote: > > IMO it is a good idea to try to keep to the rules while coding. Also > > all code lines should (must ;)) contain 80 characters max. > > I'm trying, but large screen gives illusion that lines are short :) Then you should make your windows narrower. ;-) Personally I only use 80-column windows. Large screens have the advantage that you can put two (or even more) of them beside each other, so you can see multiple files side-by-side. Therefore I very much appreciate the FreeBSD style(9) requirement to keep source code within 80 columns width. Best regards Oliver -- Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany ``We are all but compressed light'' (Albert Einstein) From owner-p4-projects@FreeBSD.ORG Fri Jul 13 15:33:16 2007 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 9246416A409; Fri, 13 Jul 2007 15:33:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 393B616A407 for ; Fri, 13 Jul 2007 15:33:16 +0000 (UTC) (envelope-from mprevot@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2969F13C4A7 for ; Fri, 13 Jul 2007 15:33:16 +0000 (UTC) (envelope-from mprevot@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DFXFOS098437 for ; Fri, 13 Jul 2007 15:33:15 GMT (envelope-from mprevot@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DFXFJk098434 for perforce@freebsd.org; Fri, 13 Jul 2007 15:33:15 GMT (envelope-from mprevot@FreeBSD.org) Date: Fri, 13 Jul 2007 15:33:15 GMT Message-Id: <200707131533.l6DFXFJk098434@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mprevot@FreeBSD.org using -f From: Mathieu Prevot To: Perforce Change Reviews Cc: Subject: PERFORCE change 123443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 15:33:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123443 Change 123443 by mprevot@mprevot_fbsd64 on 2007/07/13 15:32:42 Add prototype. Affected files ... .. //depot/projects/soc2007/mprevot-pmcgui/README#2 edit .. //depot/projects/soc2007/mprevot-pmcgui/prototype/makefile#1 add .. //depot/projects/soc2007/mprevot-pmcgui/prototype/pmcgui.py#1 add Differences ... ==== //depot/projects/soc2007/mprevot-pmcgui/README#2 (text+ko) ==== @@ -1,2 +1,10 @@ -Please see: http://wiki.freebsd.org/pmcgui +FreeBSD - Google Summer of Code 2007 +PMCGUI, a Graphical User Interface to Performance Monitoring Counters pmc(3) + +Please see: + http://wiki.freebsd.org/pmcgui + http://blogs.freebsdish.org/mprevot/ + http://www.freebsd.org/projects/summerofcode-2007.html + +Contact me at mprevot@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Jul 13 16:26:24 2007 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 9C36416A40A; Fri, 13 Jul 2007 16:26:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4AD4216A401 for ; Fri, 13 Jul 2007 16:26:24 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A38B13C48E for ; Fri, 13 Jul 2007 16:26:24 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DGQOE3003155 for ; Fri, 13 Jul 2007 16:26:24 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DGQNhu003152 for perforce@freebsd.org; Fri, 13 Jul 2007 16:26:23 GMT (envelope-from taleks@FreeBSD.org) Date: Fri, 13 Jul 2007 16:26:23 GMT Message-Id: <200707131626.l6DGQNhu003152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 123445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 16:26:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123445 Change 123445 by taleks@taleks_th on 2007/07/13 16:26:06 all: style update printf.c: added sprintf() pxe_http: moved header retreiving to separate function. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/httpfs.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/httpfs.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/libstand_mod/printf.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/libstand_mod/stand.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_await.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#21 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#17 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#7 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/httpfs.c#2 (text+ko) ==== @@ -7,8 +7,10 @@ static int http_open(const char *path, struct open_file *f); static int http_close(struct open_file *f); -static int http_read(struct open_file *f, void *buf, size_t size, size_t *resid); -static int http_write(struct open_file *f, void *buf, size_t size, size_t *resid); +static int http_read(struct open_file *f, void *buf, size_t size, + size_t *resid); +static int http_write(struct open_file *f, void *buf, size_t size, + size_t *resid); static off_t http_seek(struct open_file *f, off_t offset, int where); static int http_stat(struct open_file *f, struct stat *sb); @@ -41,12 +43,13 @@ static int http_open(const char *path, struct open_file *f) { - PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *)malloc(sizeof(PXE_HTTP_HANDLE)); + PXE_HTTP_HANDLE *httpfile = + (PXE_HTTP_HANDLE *)malloc(sizeof(PXE_HTTP_HANDLE)); if (!httpfile) return (ENOMEM); - pxe_memeset(httpfile, 0, sizeof(PXE_HTTP_HANDLE)); + pxe_memset(httpfile, 0, sizeof(PXE_HTTP_HANDLE)); httpfile->ip = pxe_get_ip32(PXE_IP_WWW); httpfile->offset = 0; ==== //depot/projects/soc2007/taleks-pxe_http/httpfs.h#2 (text+ko) ==== @@ -1,4 +1,8 @@ #ifndef HTTPFS_INCLUDED #define HTTPFS_INCLUDED +#include + +extern struct fs_ops http_fsops; + #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#11 (text+ko) ==== @@ -74,9 +74,7 @@ uint8_t *mac = &arp_table[entry].mac[0]; #ifdef PXE_DEBUG_HELL - printf("pxe_arp_table_search(): %2x:%2x:%2x:%2x:%2x:%2x\n", - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] - ); + printf("pxe_arp_table_search(): %6D\n", mac, ":"); #endif return (const MAC_ADDR *)mac; } @@ -115,8 +113,9 @@ } /* - * pxe_arp_protocol() - process received arp packet, this function is called in style - * of pxe_protocol_call function type, but last parameter is unused + * pxe_arp_protocol() - process received arp packet, this function is called in + * style of pxe_protocol_call function type, but last + * parameter is unused * in: * pack - rceived packet data * function - protocal function (will be always PXE_CORE_FRAG) @@ -141,7 +140,8 @@ ip4_src.ip = arp_reply->body.src_paddr; ip4_dst.ip = arp_reply->body.target_paddr; - if (ip4_src.ip == pxe_get_ip32(PXE_IP_MY)) { /* got broadcast send by us */ + if (ip4_src.ip == pxe_get_ip32(PXE_IP_MY)) { + /* got broadcast send by us */ #ifdef PXE_DEBUG_HELL printf("arp request from myself ignored.\n"); #endif @@ -149,19 +149,28 @@ } #ifdef PXE_DEBUG - printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n\t to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n", - mac_src[0], mac_src[1], mac_src[2], mac_src[3], mac_src[4], mac_src[5], - ip4_src.octet[0], ip4_src.octet[1], ip4_src.octet[2], ip4_src.octet[3], - mac_dst[0], mac_dst[1], mac_dst[2], mac_dst[3], mac_dst[4], mac_dst[5], - ip4_dst.octet[0], ip4_dst.octet[1], ip4_dst.octet[2], ip4_dst.octet[3] + printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n\t" + " to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n", + mac_src[0], mac_src[1], mac_src[2], + mac_src[3], mac_src[4], mac_src[5], + ip4_src.octet[0], ip4_src.octet[1], + ip4_src.octet[2], ip4_src.octet[3], + mac_dst[0], mac_dst[1], mac_dst[2], + mac_dst[3], mac_dst[4], mac_dst[5], + ip4_dst.octet[0], ip4_dst.octet[1], + ip4_dst.octet[2], ip4_dst.octet[3] ); #endif /* somebody is looking for us */ if (ip4_dst.ip == arp_table[MAX_ARP_ENTRIES].ip4.ip) { - pxe_memcpy(arp_reply->body.src_hwaddr, packet_to_send.body.target_hwaddr, 6); - packet_to_send.body.target_paddr = arp_reply->body.src_paddr; + pxe_memcpy(arp_reply->body.src_hwaddr, + packet_to_send.body.target_hwaddr, 6); + + packet_to_send.body.target_paddr = + arp_reply->body.src_paddr; + packet_to_send.hdr.operation = le2be16(PXE_ARPOP_REPLY); PXE_PACKET pack; @@ -169,9 +178,13 @@ pack.raw_size = sizeof(PXE_ARP_PACK_DATA); pack.raw_data = &packet_to_send; pack.data = &packet_to_send.hdr; - pack.data_size = sizeof(PXE_ARP_PACK_DATA) - MEDIAHDR_LEN_ETH; + pack.data_size = + sizeof(PXE_ARP_PACK_DATA) - MEDIAHDR_LEN_ETH; + pack.protocol = PXE_PROTOCOL_ARP; - pack.dest_mac = (const MAC_ADDR *)&packet_to_send.body.target_hwaddr[0]; + pack.dest_mac = (const MAC_ADDR *) + &packet_to_send.body.target_hwaddr[0]; + pack.flags = PXE_SINGLE; if (!pxe_core_transmit(&pack)) { @@ -191,15 +204,18 @@ return (0); #endif } - - if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) /* we don't need anything except replies on that stage */ - return (0); + + /* we don't need anything except replies on that stage */ + if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) + return (0); - /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier placed ARP entries. - * MAC may be lost, so protocol must check this case when creating packet (cause - * there used pointer to MAC in arp_table). May be better way is to panic if arp_table - * is full. In fact, we don't need many entries. Only two: one for gateway, one for DNS-server - * or for proxy server. Default arp_table size is 8. It seems more than enough. + /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier + * placed ARP entries. MAC may be lost, so protocol must check this + * case when creating packet (cause there used pointer to MAC + * in arp_table). May be better way is to panic if arp_table is full. + * In fact, we don't need many entries. Only two: one for gateway, + * one for DNS-server or for proxy server. Default arp_table size is 8. + * It seems more than enough. */ const MAC_ADDR *kmac = pxe_arp_table_search(arp_reply->body.src_paddr); @@ -208,15 +224,20 @@ uint8_t *octet = (uint8_t *)&arp_reply->body.src_paddr; printf("MAC of %d.%d.%d.%d already known: %x:%x:%x:%x:%x:%x\n", octet[0], octet[1], octet[2], octet[3], - (*kmac)[0], (*kmac)[1], (*kmac)[2], (*kmac)[3], (*kmac)[4], (*kmac)[5] + (*kmac)[0], (*kmac)[1], (*kmac)[2], + (*kmac)[3], (*kmac)[4], (*kmac)[5] ); #endif - /* NOTE: theoretically it's possible mac != known mac. Ignore for now. */ + /* NOTE: theoretically it's possible mac != known mac. Ignore. */ return (0); } - pxe_memcpy(&arp_reply->body.src_hwaddr, &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); - arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = arp_reply->body.src_paddr; + pxe_memcpy(&arp_reply->body.src_hwaddr, + &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); + + arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = + arp_reply->body.src_paddr; + ++arp_usage; #ifdef PXE_DEBUG_HELL @@ -227,8 +248,8 @@ } /* - * pxe_arp_send_whois() - sends ARP request packet for given ip, received packets are - * handled in pxe_arp_protocol() + * pxe_arp_send_whois() - sends ARP request packet for given ip, received + * packets are handled in pxe_arp_protocol() * in: * ip - target ip, for which to find MAC * out: @@ -270,24 +291,28 @@ * PXE_AWAIT_ constants */ int -pxe_arp_await(uint8_t function, uint16_t try_number, uint32_t timeout, void *data) +pxe_arp_await(uint8_t function, uint16_t try_number, uint32_t timeout, + void *data) { PXE_ARP_WAIT_DATA *wait_data = (PXE_ARP_WAIT_DATA *)data; const MAC_ADDR *res = NULL; switch (function) { - case PXE_AWAIT_STARTTRY: /* handle start of new try */ - if (pxe_arp_send_whois(wait_data->ip) != 1) { /* failed to send request, try once more */ - delay(10000); /* after waiting a little */ + case PXE_AWAIT_STARTTRY: /* handle start of new try */ + if (pxe_arp_send_whois(wait_data->ip) != 1) { + /* failed to send request, try once more + * after waiting a little + */ + delay(10000); return (PXE_AWAIT_NEXTTRY); } break; case PXE_AWAIT_NEWPACKETS: - - res = pxe_arp_table_search(wait_data->ip); /* check if ARP protocol was called and - * arp_table updated - */ + /* check if ARP protocol was called and + * arp_table updated + */ + res = pxe_arp_table_search(wait_data->ip); if (res != NULL) { wait_data->mac = res; return (PXE_AWAIT_COMPLETED); @@ -297,11 +322,11 @@ break; case PXE_AWAIT_FINISHTRY: - if (wait_data->mac == NULL) /* nothing got during try */ + if (wait_data->mac == NULL) /* nothing got during try */ printf("\npxe_arp_await(): ARP reply timeout.\n"); break; - case PXE_AWAIT_END: /* wait ended */ + case PXE_AWAIT_END: /* wait ended */ default: break; } @@ -333,8 +358,7 @@ wait_data.ip = ip; wait_data.mac = NULL; - if (!pxe_await(pxe_arp_await, PXE_MAX_ARP_TRY, PXE_TIME_TO_DIE, &wait_data)) { - } + pxe_await(pxe_arp_await, PXE_MAX_ARP_TRY, PXE_TIME_TO_DIE, &wait_data); pxe_core_exclusive(0); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_await.c#2 (text+ko) ==== @@ -43,18 +43,25 @@ #ifdef PXE_DEBUG twiddle(); #endif - if (pxe_core_recv_packets()) { /* means some packet was received */ + if (pxe_core_recv_packets()) { + /* means some packet was received */ - result = await_func(PXE_AWAIT_NEWPACKETS, try_counter, time_elapsed, data); + result = await_func(PXE_AWAIT_NEWPACKETS, + try_counter, time_elapsed, data); if (result == PXE_AWAIT_COMPLETED) { - await_func(PXE_AWAIT_FINISHTRY, try_counter, time_elapsed, data); + await_func(PXE_AWAIT_FINISHTRY, + try_counter, time_elapsed, data); + return (1); } - if (result == PXE_AWAIT_NEXTTRY) { + if (result == PXE_AWAIT_NEXTTRY) + break; + + /* aborted waiting */ + if (result == PXE_AWAIT_BREAK) break; - } /* continue */ } @@ -64,7 +71,8 @@ } /* notify about end of try */ - result = await_func(PXE_AWAIT_FINISHTRY, try_counter, time_elapsed, data); + result = await_func(PXE_AWAIT_FINISHTRY, try_counter, + time_elapsed, data); if (result == PXE_AWAIT_BREAK) /* failure */ return (0); @@ -76,7 +84,9 @@ /* notify about end of await, result is not interesting */ await_func(PXE_AWAIT_END, try_counter, time_elapsed, data); - /* if waiting of packet successful, control returned higher (PXE_AWAIT_COMPLETED) */ + /* if waiting of packet successful, + * control returned higher (PXE_AWAIT_COMPLETED) + */ return (0); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#3 (text+ko) ==== @@ -4,24 +4,26 @@ #include /* await callback function type */ -typedef int (*pxe_await_func)(uint8_t function, uint16_t try_counter, uint32_t timeout, void *data); +typedef int (*pxe_await_func)(uint8_t function, uint16_t try_counter, + uint32_t timeout, void *data); -#define PXE_AWAIT_NEWPACKETS 0x00 /* some packets received, check it */ -#define PXE_AWAIT_STARTTRY 0x01 /* start of new try */ -#define PXE_AWAIT_FINISHTRY 0x02 /* end of current try */ -#define PXE_AWAIT_END 0x03 /* ending of waiting */ +#define PXE_AWAIT_NEWPACKETS 0x00 /* some packets received, check it */ +#define PXE_AWAIT_STARTTRY 0x01 /* start of new try */ +#define PXE_AWAIT_FINISHTRY 0x02 /* end of current try */ +#define PXE_AWAIT_END 0x03 /* ending of waiting */ /* values that may be returned by await function */ -#define PXE_AWAIT_OK 0x00 /* ok, do what you want */ -#define PXE_AWAIT_COMPLETED 0x01 /* wait ended succefully */ -#define PXE_AWAIT_CONTINUE 0x02 /* continue waiting */ -#define PXE_AWAIT_NEXTTRY 0x03 /* continue with next try */ -#define PXE_AWAIT_BREAK 0x04 /* wait ended with failure */ +#define PXE_AWAIT_OK 0x00 /* ok, do what you want */ +#define PXE_AWAIT_COMPLETED 0x01 /* wait ended succefully */ +#define PXE_AWAIT_CONTINUE 0x02 /* continue waiting */ +#define PXE_AWAIT_NEXTTRY 0x03 /* continue with next try */ +#define PXE_AWAIT_BREAK 0x04 /* wait ended with failure */ #define TIME_DELTA_MS 10 #define TIME_DELTA 10000 /* universal waiting function */ -int pxe_await(pxe_await_func func, uint16_t try_counter, uint32_t timeout, void *data); +int pxe_await(pxe_await_func func, uint16_t try_counter, + uint32_t timeout, void *data); #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#6 (text+ko) ==== @@ -15,8 +15,9 @@ uint16_t to_write = (size < buf->bufleft) ? size : buf->bufleft; #ifdef PXE_DEBUG_HELL - printf("pxe_buffer_write(): fstart %d, fend %d, bufleft %d (of %d), to_write %d (%d)\n", - buf->fstart, buf->fend, buf->bufleft, buf->bufsize, to_write, size); + printf("pxe_buffer_write(): fstart %d, fend %d, bufleft %d (of %d)," + " to_write %d (%d)\n", buf->fstart, buf->fend, buf->bufleft, + buf->bufsize, to_write, size); #endif if (to_write == 0) /* no space left*/ @@ -36,7 +37,8 @@ uint16_t part2 = to_write - part1; if (part1) - pxe_memcpy(from, buf->data + buf->fstart, (part1 < to_write) ? part1 : to_write); + pxe_memcpy(from, buf->data + buf->fstart, + (part1 < to_write) ? part1 : to_write); if (part1 >= to_write) { buf->fstart += to_write; @@ -57,7 +59,8 @@ /* pxe_buffer_read() - reades data from buffer, if possible * in: * buf - pointer to buffer structure - * to - pointer to data to read to, if NULL data is read but not placed anywhere + * to - pointer to data to read to, + * if NULL - data is read but not placed anywhere * size - size of data buffer * out: * actual count of read bytes @@ -68,9 +71,9 @@ uint16_t usage = buf->bufsize - buf->bufleft; uint16_t to_read = (size <= usage) ? size : usage; - if (to_read == 0) { /* nothing to read */ + if (to_read == 0) /* nothing to read */ return (0); - } + uint16_t fstart = buf->fstart; uint16_t fend = buf->fend; @@ -84,11 +87,12 @@ uint16_t part2 = to_read - part1; if (part1 && (to != NULL) ) - pxe_memcpy(buf->data + fend, to, (part1 < to_read) ? part1 : to_read); + pxe_memcpy(buf->data + fend, to, + (part1 < to_read) ? part1 : to_read); - if (part1 >= to_read) { + if (part1 >= to_read) buf->fend += to_read; - } else { + else { if (to != NULL) pxe_memcpy(buf->data, to + part1, part2); @@ -123,7 +127,7 @@ pxe_buffer_space(PXE_BUFFER *buffer) { - return buffer->bufleft; + return (buffer->bufleft); } /* pxe_buffer_memalloc() - allocates memory for buffer @@ -168,9 +172,8 @@ pxe_buffer_memfree(PXE_BUFFER *buffer) { - if (buffer->data == NULL) { /* already released */ + if (buffer->data == NULL) /* already released */ return; - } #ifdef PXE_DEBUG_HELL printf("pxe_buffer_memfree(): buffer 0x%x, data 0x%x, bufleft: %d.\n", ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#6 (text+ko) ==== @@ -3,14 +3,14 @@ #include -/* buffer size choosed by default for sending/recieving*/ +/* buffer size choosed by default for sending/recieving */ #define PXE_DEFAULT_RECV_BUFSIZE 32768 #define PXE_DEFAULT_SEND_BUFSIZE 4096 /* pxe_buffer - buffer related information */ typedef struct pxe_buffer { - void *data; /* pointer to memory block, used for buffer*/ + void *data; /* pointer to memory block, used for buffer */ uint16_t fstart; /* start of free space part in buffer */ uint16_t fend; /* end of free space part in buffer */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#8 (text+ko) ==== @@ -15,9 +15,11 @@ /* currently allocated connections */ static int all_connections = 0; -/* filter_to_connection() - returns connections, associated with provided filter +/* filter_to_connection() - returns connections, + * associated with provided filter * in: - * filter - pointer to filter entry structure, for which connection is searched + * filter - pointer to filter entry structure, + * for which connection is searched * out: * NULL - failed to find * not NULL- searched connections @@ -29,9 +31,8 @@ for ( ; con_index < PXE_MAX_TCP_CONNECTIONS; ++con_index) { - if (tcp_connections[con_index].filter == filter) { + if (tcp_connections[con_index].filter == filter) return (&tcp_connections[con_index]); - } } return (NULL); @@ -67,7 +68,8 @@ /* free_connection() - releases connections * in: - * connection - pointer to connection to release (assuming it's valid connection) + * connection - pointer to connection to release + * (assuming it's valid connection) * out: * none */ @@ -91,7 +93,8 @@ PXE_TCP_CONNECTION *conn = wait_data->connection; switch(function) { - case PXE_AWAIT_NEWPACKETS: /* check current state with needed to wait for */ + case PXE_AWAIT_NEWPACKETS: + /* check current state with needed to wait for */ if (wait_data->state <= conn->state) return (PXE_AWAIT_COMPLETED); @@ -118,7 +121,8 @@ return (PXE_AWAIT_OK); } -/* pxe_tcp_connect() - connects TCP socket (performs handshaking). Blocks until handshaking is done. +/* pxe_tcp_connect() - connects TCP socket (performs handshaking). + * Blocks until handshaking is done. * in: * socket - socket * out: @@ -137,9 +141,8 @@ PXE_FILTER_ENTRY *filter = sock->filter; PXE_TCP_CONNECTION *connection = alloc_connection(); - if (connection == NULL) { + if (connection == NULL) return (0); - } pxe_memset(connection, 0, sizeof(PXE_TCP_CONNECTION)); @@ -149,7 +152,9 @@ connection->next_recv = 0; /* NOTE: need to make more correct initial number */ - connection->iss = (filter->src_ip + filter->dst_ip) + (uint32_t)pxe_get_secs(); + connection->iss = (filter->src_ip + filter->dst_ip) + + (uint32_t)pxe_get_secs(); + connection->next_send = connection->iss; connection->filter = filter; @@ -178,7 +183,8 @@ * connection will fell in this state in pxe_tcp_callback(), * after receiving SYN ACK and sending ACK to remote host */ - if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get SYN/ACK */ + if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { + /* failed to get SYN/ACK */ free_connection(connection); return (0); } @@ -211,9 +217,8 @@ PXE_TCP_CONNECTION *connection = filter_to_connection(filter); - if (connection == NULL) { + if (connection == NULL) return (0); - } /* process recieved, queued but not processed packets. * This is useful if server requested breaking of connection @@ -230,7 +235,6 @@ } if (!pxe_tcp_syssend(connection, PXE_TCP_FIN | PXE_TCP_ACK)) { -/* if (!pxe_tcp_syssend(connection, PXE_TCP_FIN)) { */ printf("pxe_tcp_disconnect(): failed to send FIN.\n"); free_connection(connection); return (0); @@ -259,17 +263,16 @@ /* awaiting expected state to close connection * connection will fell in this state in pxe_tcp_callback() */ - if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get expected state */ - + if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { + /* failed to get expected state */ free_connection(connection); if (connection->state != PXE_TCP_CLOSED) return (0); } - if (connection->state == PXE_TCP_CLOSED) { + if (connection->state == PXE_TCP_CLOSED) pxe_filter_remove(filter); - } pxe_resend_free(connection); @@ -306,7 +309,8 @@ PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); if (connection == NULL) { - printf("pxe_tcp_write(): no connection for filter 0x%x (socket: 0x%x).\n", sock->filter, sock); + printf("pxe_tcp_write(): no connection for filter 0x%x " + "(socket: 0x%x).\n", sock->filter, sock); return (-1); } @@ -339,7 +343,8 @@ connection->segment = segment; segment_data = (void *)(segment + 1); - tcp_start_segment(connection, segment, PXE_SEGMENT_OPTS_NO); + tcp_start_segment(connection, segment, + PXE_SEGMENT_OPTS_NO); } /* calculating free space in segment packet */ @@ -349,18 +354,24 @@ send_now = size_to_send - sent_data; if (send_now < bufleft) { - /* copy data to segment space, actually there is no send, till - * segment is fully filled or called pxe_tcp_push() + /* copy data to segment space, actually there is no send, + * till segment is fully filled or called pxe_tcp_push() */ - pxe_memcpy(data + sent_data, segment_data + segment->size, send_now); + pxe_memcpy(data + sent_data, + segment_data + segment->size, send_now); + segment->size += send_now; sent_data += send_now; return (sent_data); } - /* if we got here, then we need to finish current segment and alloc new segment */ - pxe_memcpy(data + sent_data, segment_data + segment->size, bufleft); + /* if we got here, then we need to finish current segment + * and alloc new segment + */ + pxe_memcpy(data + sent_data, + segment_data + segment->size, bufleft); + segment->size += bufleft; sent_data += bufleft; @@ -373,7 +384,9 @@ if (!pxe_tcp_send_segment(connection, segment)) { printf("pxe_tcp_write(): failed to send segment.\n"); - /* this segment will be resent later, so continue normal processing */ + /* this segment will be resent later, + * so continue normal processing + */ } pxe_core_recv_packets(); @@ -399,7 +412,8 @@ PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); if (connection == NULL) { - printf("pxe_tcp_read(): no connection for filter 0x%x (socket: 0x%x).\n", sock->filter, sock); + printf("pxe_tcp_read(): no connection for filter 0x%x " + "(socket: 0x%x).\n", sock->filter, sock); return (-1); } @@ -415,15 +429,17 @@ if (result != 0) { - /* if receive window was zero and now is big enough, notify remote host */ + /* if receive window was zero and now is big enough, + * notify remote host + */ if ( (connection->winlock == 1) && (recv_buffer->bufleft > PXE_DEFAULT_RECV_BUFSIZE / 4)) { - if (!pxe_tcp_syssend(connection, PXE_TCP_ACK)) { - printf("pxe_tcp_read(): failed to notify remote host about window.\n"); - } else { + if (!pxe_tcp_syssend(connection, PXE_TCP_ACK)) + printf("pxe_tcp_read(): failed to notify " + "remote host about window.\n"); + else connection->winlock = 0; - } } } @@ -447,7 +463,9 @@ PXE_TCP_CONNECTION *connection = filter_to_connection(filter); if (connection == NULL) { - printf("pxe_tcp_push(): no connection for filter 0x%x.\n", filter); + printf("pxe_tcp_push(): no connection for filter 0x%x.\n", + filter); + return (0); } @@ -455,16 +473,15 @@ (connection->state != PXE_TCP_CLOSE_WAIT) ) { printf("pxe_tcp_push(): connection 0x%x is in wrong state %d.\n", - connection, connection->state - ); - return (0); /* connection not in established state, ignore available data */ + connection, connection->state); + /* connection not in established state, ignore available data */ + return (0); } PXE_TCP_QUEUED_SEGMENT *segment = connection->segment; - if (segment == NULL) { /* nothing to push */ + if (segment == NULL) /* nothing to push */ return (1); - } /* finish segment */ tcp_finish_segment(connection, segment, PXE_TCP_ACK | PXE_TCP_PSH); @@ -474,7 +491,9 @@ if (!pxe_tcp_send_segment(connection, segment)) { printf("pxe_tcp_push(): failed to send segment.\n"); - /* this segment will be resent later, so continue normal processing */ + /* this segment will be resent later, + * so continue normal processing + */ } segment = NULL; @@ -484,7 +503,8 @@ } /* pxe_tcp_check_connection() - checks connections state by sending ACK, - * used e,g, to notify remote host about enough window to recv + * used e.g. to notify remote host about + * enough window to recv * in: * sock - TCP socket to check connection for * out: @@ -500,25 +520,24 @@ PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); if (connection == NULL) { - printf("pxe_tcp_check_connection(): no connection for filter 0x%x (socket: 0x%x).\n", - sock->filter, sock - ); + printf("pxe_tcp_check_connection(): no connection for filter " + "0x%x (socket: 0x%x).\n", sock->filter, sock); return (0); } if (connection->state != PXE_TCP_ESTABLISHED) { - printf("pxe_tcp_check_connection(): connection 0x%x is not in established state(%d).\n", - connection, connection->state - ); - return (0); /* connection not in established state, ignore available data */ + printf("pxe_tcp_check_connection(): connection 0x%x " + "is not in established state(%d).\n", + connection, connection->state); + /* connection not in established state, ignore available data */ + return (0); } PXE_BUFFER *buffer = connection->recv; /* send ACK ony if we place enough space */ - if (buffer->bufleft < buffer->bufsize / 3) { + if (buffer->bufleft < buffer->bufsize / 3) return (0); - } if (!pxe_tcp_syssend(connection, PXE_TCP_ACK)) { printf("pxe_tcp_check_connection(): failed to send ACK.\n"); @@ -528,6 +547,10 @@ return (1); } +/* pxe_connection_stats() - shows brief information about connections + * in/out: + * none + */ void pxe_connection_stats() { @@ -540,9 +563,9 @@ connection = &tcp_connections[con_index]; - printf("%d: filter: 0x%x, state: %d\n nxt_snd: %d, nxt_rcv: %d, iss: %d, irs: %d\n", - con_index, connection->filter, connection->state, - connection->next_send, connection->next_recv - ); + printf("%d: filter: 0x%x, state: %d\n" + " nxt_snd: %d, nxt_rcv: %d, iss: %d, irs: %d\n", + con_index, connection->filter, connection->state, + connection->next_send, connection->next_recv); } } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#6 (text+ko) ==== @@ -7,17 +7,19 @@ #include "pxe_filter.h" #include "pxe_sock.h" +/* maximum existing connections at one time */ +#define PXE_MAX_TCP_CONNECTIONS 8 + /* connection states */ #define PXE_TCP_STATE_MASK 0x0f #define PXE_TCP_CLOSED 0x00 /* closed */ -#define PXE_TCP_RESETED 0x0f /* TODO: check if this needed.(received RST) */ #define PXE_TCP_SYN_SENT 0x01 /* active */ #define PXE_TCP_SYN_RECEIVED 0x02 /* sent & received SYN */ #define PXE_TCP_ESTABLISHED 0x03 /* established connection */ #define PXE_TCP_CLOSE_WAIT 0x04 /* got FIN, waiting to close */ -#define PXE_TCP_LAST_ACK 0x05 /* got FIN, closing and waiting FIN ACK */ +#define PXE_TCP_LAST_ACK 0x05 /* got FIN, closing & waiting FIN ACK */ #define PXE_TCP_FIN_WAIT1 0x06 /* CLOSE, sent FIN */ #define PXE_TCP_CLOSING 0x07 /* got FIN, sent ACK, waiting FIN ACK */ @@ -31,10 +33,11 @@ typedef struct pxe_tcp_connecton { uint8_t state; /* current TCP conenction state */ - uint8_t state_out; /* show latest acked packet flags (e.g. we sent FIN and it was ACKed, - * here will be PXE_TCP_FIN. Currently used but ACKing not checked. + uint8_t state_out; /* show latest acked packet flags + * (e.g. we sent FIN and it was ACKed, + * here will be PXE_TCP_FIN. */ - uint8_t winlock; /* flag to becomes 1 when recieve window is zero*/ + uint8_t winlock; /* flag becomes 1 when recieve window is zero*/ uint32_t next_recv; /* next sequence number to accept */ uint32_t next_send; /* next sequence number to send */ uint32_t una; /* unaccepted sequence number */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#21 (text+ko) ==== @@ -60,12 +60,13 @@ int status = pxe_core_call(PXENV_UNDI_STARTUP); if (!status) - printf("pxe_core_undi_startup(): status 0x%x\n", undi_startup->Status); + printf("pxe_core_undi_startup(): status 0x%x\n", + undi_startup->Status); return (status); } -/* pxe_core_undi_init() - performs UNDI initialization call during pxe_core_init() +/* pxe_core_undi_init() - performs UNDI initialization * in: * none * out: @@ -86,7 +87,8 @@ int status = pxe_core_call(PXENV_UNDI_INITIALIZE); if (!status) - printf("pxe_core_undi_init(): status 0x%x\n", undi_init->Status); + printf("pxe_core_undi_init(): status 0x%x\n", + undi_init->Status); return (status); } @@ -103,7 +105,8 @@ pxe_core_init(pxenv_t *pxenv_p, pxe_t* pxe_p) { #ifdef PXE_DEBUG - printf("pxe_core_init(): started (pxenv_p = 0x%x, pxe_p = 0x%x).\n", pxenv_p, pxe_p); + printf("pxe_core_init(): started (pxenv_p = 0x%x, pxe_p = 0x%x).\n", + pxenv_p, pxe_p); #endif int counter = 0; uint8_t checksum = 0; @@ -144,8 +147,10 @@ */ checksum = 0; checkptr = (uint8_t *) pxenv_p; + for (counter = 0; counter < pxenv_p->Length; counter++) checksum += *checkptr++; + if (checksum != 0) { printf("PXENV+ structure failed checksum, ignoring\n"); pxenv_p = NULL; @@ -161,20 +166,24 @@ * the checksum fails. */ if (pxenv_p->Version >= 0x0200) { + for (;;) { if (bcmp((void *)pxe_p->Signature, S_SIZE("!PXE"))) { pxe_p = NULL; break; } + checksum = 0; checkptr = (uint8_t *)pxe_p; + for (counter = 0; counter < pxe_p->StructLength; counter++) checksum += *checkptr++; + if (checksum != 0) { pxe_p = NULL; - break; } + break; } } @@ -184,7 +193,7 @@ (uint8_t) (pxenv_p->Version >> 8), (uint8_t) (pxenv_p->Version & 0xFF)); - printf(" @%04x:%04x\n", + printf(" @ %04x:%04x\n", pxe_p->EntryPointSP.segment, pxe_p->EntryPointSP.offset); @@ -213,7 +222,8 @@ } #ifdef PXE_DEBUG - printf("pxe_core_init(): copied %d bytes of cached packet. Limit = %d.\n", gci_p->BufferSize, gci_p->BufferLimit); + printf("pxe_core_init(): copied %d (%d)bytes of cached packet.\n", + gci_p->BufferSize, gci_p->BufferLimit); #endif /* 3. install isr */ @@ -235,22 +245,27 @@ PXE_IPADDR nic_ip; nic_ip.ip = bootplayer.yip; /* my ip */ - printf("my ip: %d.%d.%d.%d\n", nic_ip.octet[0], nic_ip.octet[1], nic_ip.octet[2], nic_ip.octet[3]); + printf("my ip: %d.%d.%d.%d\n", + nic_ip.octet[0], nic_ip.octet[1], nic_ip.octet[2], nic_ip.octet[3]); /* my MAC */ pxe_memcpy(&bootplayer.CAddr, &nic_mac, MAC_ADDR_LEN); - printf("my MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", - nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + printf("my MAC: %6D\n", nic_mac, ":"); /* setting default ips*/ pxe_set_ip32(PXE_IP_MY, bootplayer.yip); /* nic ip */ pxe_set_ip32(PXE_IP_SERVER, bootplayer.sip); /* boot server ip */ - pxe_set_ip32(PXE_IP_NAMESERVER, 0x0100a8c0); /* nameserver ip, default to 192.168.0.1 */ - pxe_set_ip32(PXE_IP_GATEWAY, 0x0100a8c0); /* gateway ip, default to 192.168.0.1 */ - pxe_set_ip32(PXE_IP_NETMASK, 0x00ffffff); /* gateway ip, default to 255.255.255.0 */ - pxe_set_ip32(PXE_IP_BROADCAST, 0xffffffff); /* broadcast address, default to 255.255.255.255 */ - pxe_set_ip32(PXE_IP_WWW, 0x0100a8c0); /* web server */ + /* nameserver ip, default to 192.168.0.1 */ + pxe_set_ip32(PXE_IP_NAMESERVER, 0x0100a8c0); + /* gateway ip, default to 192.168.0.1 */ + pxe_set_ip32(PXE_IP_GATEWAY, 0x0100a8c0); + /* netmask, default to 255.255.255.0 */ + pxe_set_ip32(PXE_IP_NETMASK, 0x00ffffff); + /* broadcast address, default to 255.255.255.255 */ + pxe_set_ip32(PXE_IP_BROADCAST, 0xffffffff); + /* web server */ + pxe_set_ip32(PXE_IP_WWW, 0x0100a8c0); /* initing modules */ pxe_arp_init(); @@ -289,22 +304,24 @@ pxe_memset(undi_info, 0, sizeof(t_PXENV_UNDI_GET_INFORMATION)); if (!pxe_core_call(PXENV_UNDI_GET_INFORMATION)) { + printf("pxe_core_install_isr(): failed get NIC information.\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 13 16:39:42 2007 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 1612116A408; Fri, 13 Jul 2007 16:39:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC3EE16A406 for ; Fri, 13 Jul 2007 16:39:41 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CCD1913C4B2 for ; Fri, 13 Jul 2007 16:39:41 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6DGdfcV004019 for ; Fri, 13 Jul 2007 16:39:41 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6DGdfbc004016 for perforce@freebsd.org; Fri, 13 Jul 2007 16:39:41 GMT (envelope-from thioretic@FreeBSD.org) Date: Fri, 13 Jul 2007 16:39:41 GMT Message-Id: <200707131639.l6DGdfbc004016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 123447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 16:39:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123447 Change 123447 by thioretic@thioretic on 2007/07/13 16:39:10 TODO: bus_generic_*, resource_* stuff, some cleanups, locking, IO requests handling. DONE: a. naming: drv_compat_* -> driverinfo_* pdrv_compat* -> driverinfolink* pdevclass* -> devclasslink* pdevice -> devicelink* b. device_attach, _detach Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#13 edit .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#14 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#13 (text+ko) ==== @@ -53,7 +53,7 @@ # since now internally (and externally) for newbus, driver is # not just kernel object class to be compiled into device, but # also has flags, default driversops (TODO)... - # all these are hosted by compatibility layer (drv_compat_*) + # all these are hosted by compatibility layer (driverinfo_*) #TODO: check drivers, which use chainevh a.1.1 Compatibility layer: SOLUTION: keep track of *drv_compat_* stuff @@ -135,4 +135,4 @@ # probed/attached/.. driver. If driver to be set to is DR_LOWEST not equal # to that already in stack or is NULL, the whole driver configuration is # destroyed. Device won't process any i/o requests till its state is set - # to DS_ALIVE (i.e. there is no DS_RAW or other drivers in stack).+ # to DS_ATTACHED (i.e. there is no DS_RAW or other drivers in stack). ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#14 (text+ko) ==== @@ -67,7 +67,8 @@ TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */ }; -struct drv_compat { +typedef struct driverinfo* driverinfo_t; +struct driverinfo { kobj_class_t driver; /**< kobj class, implementing driver & bus interface methods (from outer space)*/ kobj_class_t drvops; /**< kobj class, implementing driverops @@ -77,33 +78,36 @@ kobj_t functional_ops; /**< object of class implemented by driverops (deeply internal:))*/ uint32_t flags; /**< driver-specific flags (from outer space)*/ - TAILQ_ENTRY(drv_compat) link; + TAILQ_ENTRY(driverinfo) link; }; -typedef struct drv_compat *drv_compat_t; -struct pdrv_compat { - drv_compat_t pdriver; +typedef struct driverinfolink* driverinfolink_t; +struct driverinfolink { + driverinfo_t pdriver; void *ivars; void *softc; #define DF_EXTERNALSOFTC 1 /* softc not allocated by us */ int flags; device_state_t state; - TAILQ_ENTRY(pdrv_compat) link; + TAILQ_ENTRY(driverinfolink) link; }; /* * Forward declarations */ typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; -typedef TAILQ_HEAD(pdevclass_list, pdevclass) pdevclass_list_t; +typedef TAILQ_HEAD(devclasslink_list, devclasslink) devclasslink_list_t; + typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; + typedef TAILQ_HEAD(device_list, device) device_list_t; -typedef TAILQ_HEAD(pdevice_list, pdevice) pdevice_list_t; +typedef TAILQ_HEAD(devicelink_list, devicelink) devicelink_list_t; -typedef TAILQ_HEAD(drv_compat_list, drv_compat) drv_compat_list_t; -typedef TAILQ_HEAD(pdrv_compat_list, pdrv_compat) pdrv_compat_list_t; +typedef TAILQ_HEAD(driverinfo_list, driverinfo) driverinfo_list_t; +typedef TAILQ_HEAD(driverinfolink_list, driverinfolink) driverinfolink_list_t; -struct pdevclass{ +typedef struct devclasslink* devclasslink_t; +struct devclasslink{ devclass_t devclass_ptr; TAILQ_ENTRY(pdevclass) link; }; @@ -111,7 +115,7 @@ struct devclass { TAILQ_ENTRY(devclass) link; devclass_t parent; /* parent in devclass hierarchy */ - pdevclass_list_t filters; /* these are used to hold information, + devclasslink_list_t filters; /* these are used to hold information, used for non-DRV_LOWEST drivers' classes */ driver_list_t drivers; /* bus devclasses store drivers for bus */ char *name; @@ -139,17 +143,16 @@ TAILQ_ENTRY(device) link; /**< list of devices in parent */ TAILQ_ENTRY(device) devlink; /**< global device list membership */ //device_t parent; /**< parent of this device */ - /*device_list_t*/ pdevice_list_t parents; - /*device_list_t*/ pdevice_list_t children; /**< list of child devices */ + devicelink_list_t parents; + devicelink_list_t children; /**< list of child devices */ /* * Details of this device. */ - /*driver_t*/ pdrv_compat *driver; /**< current driver to be probed/attached/...*/ + driverinfolink_t driver; /**< current driver to be probed/attached/...*/ int driver_level; - //driver_list_t drivers[DRV_LEVELS]; - pdrv_compat_list_t drivers[DRV_LEVELS]; - int drv_compat_flags; + driverinfolink_list_t drivers[DRV_LEVELS]; + int driverinfo_flags; devclass_t devclass; /**< current device class */ int unit; /**< current unit number */ char* nameunit; /**< name+unit e.g. foodev0 */ @@ -170,17 +173,18 @@ void *ivars; /**< instance variables */ void *softc; /**< current driver's variables */ u_long refs; + int raw; struct sysctl_ctx_list sysctl_ctx; /**< state for sysctl variables */ struct sysctl_oid *sysctl_tree; /**< state for sysctl variables */ }; -struct pdevice { +typedef struct devicelink* devicelink_t; +struct devicelink { device_t device_ptr; - TAILQ(pdevice) link; + TAILQ(devicelink) link; }; - static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc"); @@ -290,7 +294,7 @@ char *buf; int error; int level; - pdrv_compat* pdrvl; + driverinfolink_t dil; buf = NULL; switch (arg2) { @@ -309,10 +313,10 @@ case DRV_TOPMOST: tmpbuf="TOPMOST:"; break; } if (strlen(tmpbuf)+strlen(buf)>1023) break; - TAILQ_FOREACH(pdrvl,&((dev->drivers)[level]),link){ - if(strlen(pdrvl->pdriver->driver->name)+strlen(buf)>1022) + TAILQ_FOREACH(dil, &((dev->drivers)[level]), link){ + if(strlen(dil->pdriver->driver->name)+strlen(buf)>1022) break; - strcat(buf,pdrvl->pdriver->driver->name); + strcat(buf,dil->pdriver->driver->name); strcat(buf,","); } buf[strlen(buf)]='\0'; @@ -804,7 +808,7 @@ * Driver compatibility layer implementation */ -static drv_compat_list_t drv_compat_layer = TAILQ_HEAD_INITIALIZER(drv_compat_layer); +static driverinfo_list_t driverinfo_layer = TAILQ_HEAD_INITIALIZER(driverinfo_layer); /** * @internal @@ -816,31 +820,31 @@ * @param driver the device class and flags * @param add non-zero to add driver to layer */ -static drv_compat_t -drv_compat_find_internal (drv_internal_t driver, int add) { - drv_compat_t drvc; +static driverinfo_t +driverinfo_find_internal (drv_internal_t driver, int add) { + driverinfo_t di; PDEBUG(("looking for driver %s to compatibility layer", driver->devops->name)); if (!driver) return (NULL); - TAILQ_FOREACH(drvc,&drv_compat_layer,link){ - if (driver->devops == drvc->driver) + TAILQ_FOREACH(di, &driverinfo_layer, link){ + if (driver->devops == di->driver) break; } - if (!drvc && add){ + if (!di && add){ PDEBUG(("adding driver %s to compatibility layer", driver->devops->name)); - drvc = malloc(sizeof(struct drv_compat), M_BUS, M_NOWAIT|M_ZERO); + di = malloc(sizeof(struct /*drv_compat*/ driverinfo), M_BUS, M_NOWAIT|M_ZERO); if (!drvc) return (NULL); - drvc->driver = driver->devops; - drvc->flags = driver->flags; - TAILQ_INSERT_TAIL(&drv_compat_layer, drvc, link); + di->driver = driver->devops; + di->flags = driver->flags; + TAILQ_INSERT_TAIL(&driverinfo_layer, di, link); bus_data_generation_update(); } - return (drvc); + return (di); } /** @@ -850,16 +854,16 @@ * * @param driver device kobj_class pointer */ -static drv_compat_t -drv_compat_find_driver (driver_t *driver) { - drv_compat_t drvc; +static driverinfo_t +driverinfo_find_driver (driver_t *driver) { + driverinfo_t di; - TAILQ_FOREACH(drvc,&drv_compat_layer,link){ - if (driver == drvc->driver) + TAILQ_FOREACH(di, &driverinfo_layer, link){ + if (driver == di->driver) break; } - return drvc; + return di; } /** @@ -871,9 +875,9 @@ * * @param driver devops plus flags */ -static drv_compat_t -drv_compat_add_driver (drv_internal_t driver) { - return (drv_compat_find_internal(driver, TRUE)); +static driverinfo_t +driverinfo_add_driver (drv_internal_t driver) { + return (driverinfo_find_internal(driver, TRUE)); } /** @@ -884,10 +888,10 @@ * implementation */ static void -drv_compat_delete_driver (driver_t *driver) { - drv_compat_t drvc; - drvc = drv_compat_find_driver(driver); - TAILQ_REMOVE(&drv_compat_layer, drvc, link); +driverinfo_delete_driver (driver_t *driver) { + driverinfo_t di; + di = driverinfo_find_driver(driver); + TAILQ_REMOVE(&driverinfo_layer, di, link); } /** @@ -898,15 +902,15 @@ * @param flags pointer to flags to be stored */ static int -drv_compat_get_flags (driver_t *driver, uint32_t *flags){ - drv_compat_t drvc; +driverinfo_get_flags (driver_t *driver, uint32_t *flags){ + driverinfo_t di; - drvc = drv_compat_find_driver(driver); + di = driverinfo_find_driver(driver); - if (!drvc) + if (!di) return (0); - *flags = drvc->flags; + *flags = di->flags; return (1); } @@ -918,14 +922,14 @@ * @param flags flags to be set */ static int -drv_compat_set_flags (driver_t *driver, uint32_t flags){ - drv_compat_t drvc; +driverinfo_set_flags (driver_t *driver, uint32_t flags){ + driverinfo_t di; - drvc = drv_compat_find_driver(driver); + di = driverinfo_find_driver(driver); - if (!drvc) + if (!di) return (0); - drvc->flags = flags; + di->flags = flags; return (1); } /** @@ -935,7 +939,7 @@ * @param flags drv_compat flags */ static int -drv_compat_flags2idx (uint32_t flags){ +driverinfo_flags2idx (uint32_t flags){ switch (flags & DR_ALLEVELS){ case DR_LOWEST: return (DRV_LOWEST); case DR_LOWER: return (DRV_LOWER); @@ -945,12 +949,12 @@ } } -drv_compat_isfilter (driver_t *driver){ +driverinfo_isfilter (driver_t *driver){ uint32_t flags; int level; - drv_compat_get_flags (driver, &flags); - level = drv_compat_flags2idx (flags); + driverinfo_get_flags (driver, &flags); + level = driverinfo_flags2idx (flags); return((level>DR_LOWEST & leveldrivers[level]))) \ continue; \ - TAILQ_FOREACH (pdc, &(dev->drivers[level]), link){ \ - func(pdc->pdriver->memb, __VA_ARGS__); \ + TAILQ_FOREACH (dil, &(dev->drivers[level]), link){ \ + func(dil->pdriver->memb, __VA_ARGS__); \ } \ } @@ -1184,14 +1188,14 @@ is_device_driver (device_t dev, driver_t *driver){ int level; uint32_t flags; - pdrv_compat* pdrvl; + driverinfolink_t dil; - if (!drv_compat_get_flags(driver, &flags)) + if (!driverinfo_get_flags(driver, &flags)) /*todo what?*/; - level = drv_compat_flags2idx (flags); + level = driverinfo_flags2idx (flags); - TAILQ_FOREACH(pdrvl,&((dev->drivers)[level]),link){ - if (pdrvl->pdriver->driver == driver) + TAILQ_FOREACH(dil, &((dev->drivers)[level]), link){ + if (dil->pdriver->driver == driver) return(TRUE); } return(FALSE); @@ -1225,6 +1229,7 @@ int create, int filter) /**TODO*/ { devclass_t dc, dcp; + devclasslink_t dcl; PDEBUG(("looking for %s", classname)); if (!classname) @@ -1271,7 +1276,10 @@ } if (filter) { - TAILQ_INSERT_TAIL(&(dcp->filters), &dc, link); + dcl = malloc(sizeof(struct devclasslink), M_BUS, M_NOWAIT|M_ZERO); + if (!dcl) + return (NULL); /*TODO*/ + TAILQ_INSERT_TAIL(&(dcp->filters), dcl, link); } return (dc); @@ -1320,10 +1328,10 @@ devclass_add_driver(devclass_t dc, driver_t *driver) /*TODO*/ { driverlink_t dl; + driverinfo_t di; int i; uint32_t flags; int isfilter; - drv_compat_t drvc; PDEBUG(("%s", DRIVERNAME(driver))); @@ -1331,7 +1339,7 @@ if (!dl) return (ENOMEM); - isfilter = drv_compat_isfilter (driver); + isfilter = driverinfo_isfilter (driver); /* * Compile the driver's methods. Also increase the reference count * so that the class doesn't get freed when the last instance @@ -1340,8 +1348,8 @@ */ //kobj_class_compile((kobj_class_t) driver); - drvc = drv_compat_find_driver (driver); - drvc->topology_ops = kobj_create (drvc->driver, M_BUS, M_NOWAIT|M_ZERO); + di = driverinfo_find_driver (driver); + di->topology_ops = kobj_create (di->driver, M_BUS, M_NOWAIT|M_ZERO); /* * Make sure the devclass which the driver is implementing exists. @@ -1391,10 +1399,10 @@ { devclass_t dc = devclass_find(driver->name); driverlink_t dl; + driverinfo_t di; device_t dev; int i; int error; - drv_compat_t drvc; PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); @@ -1446,9 +1454,9 @@ /* XXX: kobj_mtx */ driver->refs--; if (driver->refs == 0){ - drvc = drv_compat_find_driver (driver); + di = driverinfo_find_driver (driver); //kobj_class_free((kobj_class_t) driver); - kobj_delete (drvc->topology_ops, M_BUS); + kobj_delete (di->topology_ops, M_BUS); } bus_data_generation_update(); @@ -1876,7 +1884,7 @@ devclass_add_device(devclass_t dc, device_t dev) /*TODO*/ { int buflen, error; - drv_compat_t drvc; + driverinfo_t di; PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc))); @@ -1935,29 +1943,26 @@ static int filter_probe_and_attach (device_t dev, driver_t *driver){ - drv_compat_t drvc; + driverinfolink_t dil; int level; - device_set_driver (dev, drvc->driver); + device_set_driver (dev, driver); if (DEVICE_PROBE(dev)<=0){ - drvc = dev->driver; - level = drv_compat_flags2idx(drvc->flags); - TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); + driver_attach(dev); } - device_set_driver (dev, NULL); } static void devclass_device2filters (devclass_t dc, device_t dev){ - pdevclass *pdc; + devclasslink_t dcl; driver_t *drv; driverlink_t dl; if (TAILQ_EMPTY(&(dc->filters))) return (); - TAILQ_FOREACH (pdc, &(dc->filters), link){ - if (TAILQ_EMPTY(&(pdc->driver_ptr->drivers))) + TAILQ_FOREACH (dcl, &(dc->filters), link){ + if (TAILQ_EMPTY(&(dcl->devclass_ptr->drivers))) continue; - TAILQ_FOREACH(dl, &(pdc->driver_ptr->drivers), link){ + TAILQ_FOREACH(dl, &(dcl->devclass_ptr->drivers), link){ filter_probe_and_attach (dev, dl->driver); } } @@ -1991,8 +1996,8 @@ device_t dev; devclass_t dc; int level; - drv_compat_t drvc; - pdevice *pd; + driverinfo_t di; + devicelink_t pd; PDEBUG(("%s at %s as unit %d", name, DEVICENAME(parent), unit)); @@ -2011,7 +2016,7 @@ if (!dev) return (NULL); TAILQ_INIT(&(dev->parents)); - pd = malloc(sizeof(struct pdevice), M_BUS, M_NOWAIT|M_ZERO); + pd = malloc(sizeof(struct devicelink), M_BUS, M_NOWAIT|M_ZERO); pd->device_ptr = parent; TAILQ_INSERT_TAIL(&(dev->parents), pd, link); TAILQ_INIT(&(dev->children)); @@ -2042,6 +2047,7 @@ dev->devflags = 0; dev->flags = DF_ENABLED; dev->order = 0; + dev->raw = 0; if (unit == -1) dev->flags |= DF_WILDCARD; if (name) { @@ -2102,14 +2108,14 @@ } static int -device_add_to_dev_list (device_t addwhat, pdevice_list_t *addwhere, int incr_refs){ - pdevice *pd; +device_add_to_dev_list (device_t addwhat, devicelink_list_t *addwhere, int incr_refs){ + devicelink_t pd; TAILQ_FOREACH (pd, addwhere, link){ if (pd->device_ptr == addwhat) return (1); } - pd = malloc(sizeof(struct pdevice), M_BUS, M_NOWAIT|M_ZERO); + pd = malloc(sizeof(struct devicelink), M_BUS, M_NOWAIT|M_ZERO); if (!pd) return (0); @@ -2167,13 +2173,13 @@ device_t device_add_child_ordered(device_t dev, int order, const char *name, int unit) { - /*device_t*/ pdevice *child; - /*device_t*/ pdevice *place; + devicelink_t child; + devicelink_t place; PDEBUG(("%s at %s with order %d as unit %d", name, DEVICENAME(dev), order, unit)); - child = malloc (sizeof(pdevice), M_BUS, M_NOWAIT|M_ZERO); + child = malloc (sizeof(struct devicelink), M_BUS, M_NOWAIT|M_ZERO); child->device_ptr = make_device(dev, name, unit/*, NULL*/); if (child->device_ptr == NULL){ free (child); @@ -2213,9 +2219,9 @@ static int destroy_recurse (device_t dev, device_t devtodel, int direction){ int error; - pdevice *grand; - pdevice *pd; - pdevice_list_t *list; + devicelink_t grand; + devicelink_t pd; + devicelink_list_t *list; device_t child, parent; PDEBUG(("%s from %s", DEVICENAME(child), DEVICENAME(dev))); @@ -2289,8 +2295,8 @@ static int is_device_relation (device_t dev, device_t tocheck, int direction){ - pdevice *dc; - pdevice_list_t list; + devicelink_t dc; + devicelink_list_t list; list = (direction == CHILDREN) ? &tocheck->parents : &tocheck->children; TAILQ_FOREACH (dc, list, link){ @@ -2418,7 +2424,7 @@ for (dl = first_matching_driver(dc, child); dl; dl = next_matching_driver(dc, child, dl)) { - if(!drv_compat_get_flags(dl->driver, &flags)) + if(!driverinfo_get_flags(dl->driver, &flags)) /*todo what?*/; if (child->state == DS_ALIVE && flags & DR_LOWEST || (child->state != DS_ALIVE && flags & ~(DR_STACKAWARE|DR_LOWEST))) @@ -2536,7 +2542,7 @@ device_t device_get_parent(device_t dev) /*TODO*/ { - pdevice *pd; + devicelink_t pd; if (!TAILQ_EMPTY(&(dev->parents))){ pd = TAILQ_FIRST(&(dev->parents)); return (pd->device_ptr); @@ -2564,9 +2570,9 @@ device_get_relations(device_t dev, device_t **devlistp, int *devcountp, int direction) { int count; - /*device_t*/ pdevice *relation; + devicelink_t relation; device_t *list; - pdevice_list_t wherelist; + devicelink_list_t wherelist; wherelist = (direction == CHILDREN) : &dev->children : &dev->parents; count = 0; @@ -2608,10 +2614,10 @@ device_get_driver(device_t dev) { //driverlink_t dl; - pdrv_compat *pdrvl; + driverinfolink_t dil; if (!TAILQ_EMPTY(&((dev->drivers)[DRV_LOWEST]))){ - pdrvl=TAILQ_FIRST(&((dev->drivers)[DRV_LOWEST])); - return (pdrvl->pdriver->driver); + dil=TAILQ_FIRST(&((dev->drivers)[DRV_LOWEST])); + return (dil->pdriver->driver); } return (NULL); } @@ -2801,15 +2807,15 @@ device_get_driver_softc(device_t dev, driver_t *driver){ int level; uint32_t flags; - pdrv_compat *pdrvc; + driverinfolink_t dil; - if (!drv_compat_get_flags (driver, &flags)) + if (!driverinfo_get_flags (driver, &flags)) return (NULL); - level = drv_compat_flags2idx (flags); + level = driverinfo_flags2idx (flags); - TAILQ_FOREACH (pdrvc, &(dev->drivers[level]), link){ - if (pdrvc->pdriver->driver == driver) - return (pdrvc->softc); + TAILQ_FOREACH (dil, &(dev->drivers[level]), link){ + if (dil->pdriver->driver == driver) + return (dil->softc); } return (NULL); } @@ -2825,42 +2831,42 @@ device_set_softc(device_t dev, void *softc) { void *psoftc; - pdrv_compat *pdrvc; + driverinfolink_t dil; if(!TAILQ_EMPTY(&(dev->drivers[DRV_LOWEST]))) - pdrvc = TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])); - if (pdrvc && !(pdrvc->flags & DF_EXTERNALSOFTC)) - free(pdrvc->softc, M_BUS_SC); - pdrvc->softc = softc; - if (pdrvc->softc) - pdrvc->flags |= DF_EXTERNALSOFTC; + dil = TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])); + if (dil && !(dil->flags & DF_EXTERNALSOFTC)) + free(dil->softc, M_BUS_SC); + dil->softc = softc; + if (dil->softc) + dil->flags |= DF_EXTERNALSOFTC; else - pdrvc->flags &= ~DF_EXTERNALSOFTC; + dil->flags &= ~DF_EXTERNALSOFTC; } void device_set_driver_softc(device_t dev, driver_t *driver, void* softc){ int level; uint32_t flags; - pdrv_compat *pdrvc; + driverinfolink_t dil; - if (!drv_compat_get_flags (driver, &flags)) + if (!driverinfo_get_flags (driver, &flags)) return(); - level = drv_compat_flags2idx (flags); + level = driverinfo_flags2idx (flags); - TAILQ_FOREACH (pdrvc, &(dev->drivers[level]), link){ - if (pdrvc->pdriver->driver == driver) + TAILQ_FOREACH (dil, &(dev->drivers[level]), link){ + if (dil->pdriver->driver == driver) break; } - if (!pdrvc) return(); + if (!dil) return(); - if (!(pdrv->flags & DF_EXTERNALSOFTC)) - free(pdrvc->softc, M_BUS_SC); - pdrvc->softc = softc; - if (pdrvc->softc) - pdrvc->flags |= DF_EXTERNALSOFTC; + if (!(dil->flags & DF_EXTERNALSOFTC)) + free(dil->softc, M_BUS_SC); + dil->softc = softc; + if (dil->softc) + dil->flags |= DF_EXTERNALSOFTC; else - pdrvc->flags &= ~DF_EXTERNALSOFTC; + dil->flags &= ~DF_EXTERNALSOFTC; } /** @@ -2922,7 +2928,7 @@ void device_busy(device_t dev) { - pdevice *parent; + devicelink_t parent; if (dev->state < DS_ATTACHED) panic("device_busy: called for unattached device"); if (dev->busy == 0 && !TAILQ_EMPTY(&(dev->parents))){ @@ -2940,7 +2946,7 @@ void device_unbusy(device_t dev) { - pdevice *parent; + devicelink_t parent; if (dev->state != DS_BUSY) panic("device_unbusy: called for non-busy device %s", device_get_nameunit(dev)); @@ -3045,17 +3051,17 @@ static int device_destroy_configuration (device_t dev){ int level, error; - pdrv_compat *pdrvc; + driverinfolink_t dil; for (level = DRV_TOPMOST; level>= DRV_LOWEST; level--){ if (TAILQ_EMPTY(&(dev->drivers[level]))) continue; - while(pdrvc = TAILQ_FIRST(&(dev->drivers[level]))){ - pdrvc->state = DS_RAW; + while(dil = TAILQ_FIRST(&(dev->drivers[level]))){ + dil->state = DS_RAW; if(error = device_detach(dev)) return(error); - TAILQ_REMOVE(&(dev->drivers[level]), pdrvc, link); - free(pdrvc); + TAILQ_REMOVE(&(dev->drivers[level]), dil, link); + free(dil); } } @@ -3071,26 +3077,29 @@ int device_set_driver(device_t dev, driver_t *driver) /*TODO*/ { - drv_compat_t drvc; - pdrv_compat *pdrvc; + driverinfo_t di; + driverinfolink_t dil; uint32_t flags; int level; if (dev->state >= DS_ATTACHED) return (EBUSY); + + if (driver == dev->driver->pdriver->driver) + return (0); if (driver != NULL){ - drvc = drv_compat_find_driver (driver); + di = driverinfo_find_driver (driver); - drv_compat_get_flags(driver, &flags); - level = drv_compat_flags2idx(flags); + driverinfo_get_flags(driver, &flags); + level = driverinfo_flags2idx(flags); - TAILQ_FOREACH(pdrvc, &(dev->drivers[level]), link){ - if (pdrvc->pdriver == drvc) + TAILQ_FOREACH(dil, &(dev->drivers[level]), link){ + if (dil->pdriver == di) break; } - if (pdrvc){ - pdrvc->state = DS_RAW; + if (dil){ + dil->state = DS_RAW; return (0); } } @@ -3100,16 +3109,17 @@ return (EBUSY); } - pdrvc = malloc (sizeof(struct pdrv_compat), M_BUS, M_NOWAIT|M_ZERO); - pdrvc->pdriver = drvc; - pdrvc->state = DS_RAW; + dil = malloc (sizeof(struct driverinfolink), M_BUS, M_NOWAIT|M_ZERO); + dil->pdriver = di; + dil->state = DS_RAW; + dev->raw++; - TAILQ_INSERT_TAIL (&(dev->drivers[level]), pdrvc); + TAILQ_INSERT_TAIL (&(dev->drivers[level]), dil); - dev->driver = pdrvc; -// dev->driver_level = level; + dev->driver = dil; + dev->driver_level = level; - if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) { + if (dev->softc && !(dev->flags & DF_EXTERNALSOFTC)) { /*TODO*/ free(dev->softc, M_BUS_SC); dev->softc = NULL; } @@ -3121,8 +3131,8 @@ //kobj_delete((kobj_t) dev, 0); //kobj_init((kobj_t) dev, &null_class); //dev->driver = NULL; - TAILQ_REMOVE(&(dev->drivers[level]), pdrvc, link); - free (pdrvc); + TAILQ_REMOVE(&(dev->drivers[level]), dil, link); + free (dil); return (ENOMEM); } } @@ -3211,8 +3221,8 @@ device_attach(device_t dev) { int error; - pdevice *pd; - drv_compat_t drvc; + devicelink_t pd; + driverinfolink_t dil; device_sysctl_init(dev); if (!device_is_quiet(dev)){ @@ -3220,25 +3230,36 @@ device_print_child(pd->device_ptr, dev); } } + + dev->raw--; + if ((error = DEVICE_ATTACH(dev)) != 0) { printf("device_attach: %s%d attach returned %d\n", dev->driver->name, dev->unit, error); /* Unset the class; set in device_probe_child */ if (dev->devclass == 0) device_set_devclass(dev, 0); - device_set_driver(dev, NULL); + TAILQ_REMOVE(&(dev->drivers[dev->driver_level]), dev->driver, link); + free(dev->driver); device_sysctl_fini(dev); - dev->state = DS_NOTPRESENT; + if(!dev->raw){ + dev->state = (dev->driver_level == DRV_LOWEST) ? DS_NOTPRESENT : + DS_ATTACHED; + } return (error); - } else { - drvc = dev->driver; - dev->devclass = devclass_find (DRIVERNAME(drvc->driver)); - //level = drv_compat_flags2idx(drvc->flags); - - //TAILQ_INSERT_TAIL (&((dev->drivers)[level]), &drvc, link); - //dev->driver = NULL; + } + + dil = dev->driver; + if (dev->driver_level == DRV_LOWEST){ + dev->devclass = devclass_find (DRIVERNAME(dil->pdriver->driver)); + devclass_device2filters(dev, dev->devclass); } - dev->state = DS_ATTACHED; + dil->state = DS_ATTACHED; + if(!dev->raw) + dev->state = DS_ATTECHED; + dev->driver = (!TAILQ_EMPTY(&(dev->drivers[DRV_LOWEST]))) ? + TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])) : NULL; + dev->driver_level=DRV_LOWEST; devadded(dev); return (0); } @@ -3263,7 +3284,7 @@ device_detach(device_t dev) { int error; - pdevice *pd; + devicelink_t pd; GIANT_REQUIRED; @@ -3275,6 +3296,17 @@ if ((error = DEVICE_DETACH(dev)) != 0) return (error); + if (dev->driver_level != DRV_LOWEST){ + TAILQ_REMOVE(&(dev->drivers[dev->driver_level]), dev->driver, link); + free(dev->driver); + dev->driver = (!TAILQ_EMPTY(&(dev->drivers[DRV_LOWEST]))) ? + TAILQ_FIRST(&(dev->drivers[DRV_LOWEST])) : NULL; + dev->driver_level=DRV_LOWEST; + dev->raw--; + if(!dev->raw) + dev->state = DS_ATTACHED; + return (0); + } devremoved(dev); device_printf(dev, "detached\n"); if (!TAILQ_EMPTY(&(dev->parents))){ @@ -3287,7 +3319,7 @@ devclass_delete_device(dev->devclass, dev); dev->state = DS_NOTPRESENT; - //device_set_driver(dev, NULL); + device_set_driver(dev, NULL); device_set_desc(dev, NULL); device_sysctl_fini(dev); @@ -3733,7 +3765,7 @@ int bus_generic_attach(device_t dev) { - /*device_t*/ pdevice *child; + devicelink_t child; TAILQ_FOREACH(child, &dev->children, link) { device_probe_and_attach(child->device_ptr); @@ -4627,13 +4659,13 @@ if (dmd->dmd_chainevh) error = dmd->dmd_chainevh(mod,what,dmd->dmd_chainarg); - drv_compat_add_driver(drv_intnl); + driverinfo_add_driver(drv_intnl); driver = drv_intnl->devops; PDEBUG(("Loading module: driver %s on bus %s", DRIVERNAME(driver), dmd->dmd_busname)); if (!parse_parent_name(dmd->dmd_busname, &parents)) break; - isfilter = drv_compat_isfilter (driver); + isfilter = driverinfo_isfilter (driver); while (parents[count]){ parent_devclass = devclass_find_internal(parents[count], 0, TRUE, FALSE); error &= devclass_add_driver (parent_devclass, driver); @@ -4689,7 +4721,7 @@ dmd->dmd_busname)); error = devclass_delete_driver(bus_devclass, driver); - drv_compat_delete_driver(driver); + driverinfo_delete_driver(driver); if (!error && dmd->dmd_chainevh) error = dmd->dmd_chainevh(mod,what,dmd->dmd_chainarg); break; From owner-p4-projects@FreeBSD.ORG Fri Jul 13 23:26:33 2007 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 1028516A406; Fri, 13 Jul 2007 23:26:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC43F16A403; Fri, 13 Jul 2007 23:26:32 +0000 (UTC) (envelope-from tanarri@geri.cc.fer.hr) Received: from geri.cc.fer.hr (geri.cc.fer.hr [161.53.72.121]) by mx1.freebsd.org (Postfix) with ESMTP id 4642513C461; Fri, 13 Jul 2007 23:26:32 +0000 (UTC) (envelope-from tanarri@geri.cc.fer.hr) Received: from geri.cc.fer.hr (localhost.cc.fer.hr [127.0.0.1]) by geri.cc.fer.hr (8.13.8/8.13.8) with ESMTP id l6DMq18u080227; Sat, 14 Jul 2007 00:52:01 +0200 (CEST) (envelope-from tanarri@geri.cc.fer.hr) Received: from localhost (tanarri@localhost) by geri.cc.fer.hr (8.13.8/8.13.8/Submit) with ESMTP id l6DMq0IR080224; Sat, 14 Jul 2007 00:52:00 +0200 (CEST) (envelope-from tanarri@geri.cc.fer.hr) Date: Sat, 14 Jul 2007 00:52:00 +0200 (CEST) From: Sonja Milicic To: Ulf Lilleengen In-Reply-To: <20070713140842.GA5140@stud.ntnu.no> Message-ID: <20070714004719.I79152@geri.cc.fer.hr> References: <200707131310.l6DDAHSO085838@repoman.freebsd.org> <20070713140842.GA5140@stud.ntnu.no> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (geri.cc.fer.hr [127.0.0.1]); Sat, 14 Jul 2007 00:52:01 +0200 (CEST) Cc: Perforce Change Reviews , Sonja Milicic Subject: Re: PERFORCE change 123439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2007 23:26:33 -0000 On Fri, 13 Jul 2007, Ulf Lilleengen wrote: > On fre, jul 13, 2007 at 01:10:17 +0000, Sonja Milicic wrote: >> http://perforce.freebsd.org/chv.cgi?CH=123439 >> >> Change 123439 by smilicic@tanarri_marilith on 2007/07/13 13:09:48 >> >> added license statements to files that didn't have them >> fixed a bug in g_log_access >> redirecting write requests to log file now works >> >> Affected files ... >> >> .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 edit >> .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#7 edit >> .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.c#2 edit >> .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.h#2 edit >> >> Differences ... >> >> ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#2 (text+ko) ==== >> >> > *SNIP* >> bp->bio_to->error, bp->bio_to->name)); >> >> G_LOG_LOGREQ(DBG_NOTICE, bp, "Request received."); >> - g_io_deliver(bp, ENXIO); >> - return; >> switch(bp->bio_cmd) { >> case BIO_WRITE: >> + G_LOG_DEBUG(0, "Write request received."); >> g_log_post_event(&sc->sc_events, GLOG_EVWRITE, GLOG_FLAG_WAKEUP_SC, bp, 0); >> break; >> case BIO_READ: >> + g_io_deliver(bp, ENXIO); >> + return; >> g_log_post_event(&sc->sc_events, GLOG_EVREAD, GLOG_FLAG_WAKEUP_SC, bp, 0); > This will never be reached. I know. I haven't written the code to handle read requests just yet and it caused some errors, so I just put g_io_deliver there to avoid such errors for the time being. Of course it won't be there in the final version :) > >> break; >> default: >> - break; >> + g_io_deliver(bp, ENXIO); >> + return; >> } > *SNIP* >> - } >> + >> + err = g_access(cp, dr ,dw, de); >> + >> + G_LOG_DEBUG(0, "access done, %d", err); >> return err; > Just a quick note from style(9): return values should be enclosed in parantheses > like this: return (err); Will change that before the next submit :) From owner-p4-projects@FreeBSD.ORG Sat Jul 14 07:38:20 2007 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 DBE3816A403; Sat, 14 Jul 2007 07:38:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B42AE16A400 for ; Sat, 14 Jul 2007 07:38:19 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A53FB13C4A6 for ; Sat, 14 Jul 2007 07:38:19 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6E7cJ7m040130 for ; Sat, 14 Jul 2007 07:38:19 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6E7cJvJ040127 for perforce@freebsd.org; Sat, 14 Jul 2007 07:38:19 GMT (envelope-from andrew@freebsd.org) Date: Sat, 14 Jul 2007 07:38:19 GMT Message-Id: <200707140738.l6E7cJvJ040127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 07:38:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=123472 Change 123472 by andrew@andrew_hermies on 2007/07/14 07:38:14 Make the facund_object_get_* functions take in a const object Add facund_object_array_size to get the number of items in an array Don't use NULL for the first argument in the XML string returned in facund_object_xml_string Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#7 edit .. //depot/projects/soc2007/andrew-update/lib/facund_object.h#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#7 (text+ko) ==== @@ -82,14 +82,17 @@ } int -facund_object_get_bool(struct facund_object *obj) +facund_object_get_bool(const struct facund_object *obj) { + struct facund_object *real_obj; + /* TODO: Change these to proper checks */ assert(obj != NULL); assert(obj->obj_type == FACUND_BOOL); assert(obj->obj_assigned == 1); - obj->obj_error = FACUND_OBJECT_ERROR_NONE; + real_obj = __DECONST(struct facund_object *, obj); + real_obj->obj_error = FACUND_OBJECT_ERROR_NONE; return obj->obj_int; } @@ -124,14 +127,17 @@ } int32_t -facund_object_get_int(struct facund_object *obj) +facund_object_get_int(const struct facund_object *obj) { + struct facund_object *real_obj; + /* TODO: Change these to proper checks */ assert(obj != NULL); assert(obj->obj_type == FACUND_INT); assert(obj->obj_assigned == 1); - obj->obj_error = FACUND_OBJECT_ERROR_NONE; + real_obj = __DECONST(struct facund_object *, obj); + real_obj->obj_error = FACUND_OBJECT_ERROR_NONE; return obj->obj_int; } @@ -166,14 +172,17 @@ } uint32_t -facund_object_get_uint(struct facund_object *obj) +facund_object_get_uint(const struct facund_object *obj) { + struct facund_object *real_obj; + /* TODO: Change these to proper checks */ assert(obj != NULL); assert(obj->obj_type == FACUND_UINT); assert(obj->obj_assigned == 1); - obj->obj_error = FACUND_OBJECT_ERROR_NONE; + real_obj = __DECONST(struct facund_object *, obj); + real_obj->obj_error = FACUND_OBJECT_ERROR_NONE; return (uint32_t)obj->obj_int; } @@ -220,14 +229,18 @@ } const char * -facund_object_get_string(struct facund_object *obj) +facund_object_get_string(const struct facund_object *obj) { + struct facund_object *real_obj; + /* TODO: Change these to proper checks */ assert(obj != NULL); assert(obj->obj_type == FACUND_STRING); assert(obj->obj_assigned == 1); - obj->obj_error = FACUND_OBJECT_ERROR_NONE; + real_obj = __DECONST(struct facund_object *, obj); + real_obj->obj_error = FACUND_OBJECT_ERROR_NONE; + return obj->obj_string; } @@ -246,7 +259,7 @@ int facund_object_array_append(struct facund_object *obj, - struct facund_object *item __unused) + struct facund_object *item) { struct facund_object **new; @@ -282,8 +295,10 @@ } const struct facund_object * -facund_object_get_array_item(struct facund_object *obj, unsigned int pos) +facund_object_get_array_item(const struct facund_object *obj, unsigned int pos) { + struct facund_object *real_obj; + /* TODO: Change these to proper checks */ assert(obj != NULL); assert(obj->obj_type == FACUND_ARRAY); @@ -291,10 +306,23 @@ if (pos >= obj->obj_array_count) return NULL; - obj->obj_error = FACUND_OBJECT_ERROR_NONE; + real_obj = __DECONST(struct facund_object *, obj); + real_obj->obj_error = FACUND_OBJECT_ERROR_NONE; return obj->obj_array[pos]; } +size_t +facund_object_array_size(const struct facund_object *obj) +{ + if (obj == NULL) + return 0; + + if (obj->obj_type != FACUND_ARRAY) + return 0; + + return obj->obj_array_count; +} + /* * Free an object and it's children */ @@ -384,7 +412,7 @@ } enum facund_object_error -facund_object_get_error(struct facund_object *obj) +facund_object_get_error(const struct facund_object *obj) { if (obj == NULL) { return FACUND_OBJECT_ERROR_NO_OBJECT; @@ -393,7 +421,7 @@ } enum facund_type -facund_object_get_type(struct facund_object *obj) +facund_object_get_type(const struct facund_object *obj) { return obj->obj_type; } @@ -438,7 +466,11 @@ /* Append the new data to the end of the data */ olddata = data; - asprintf(&data, "%s%s", data, tmpdata); + if (data == NULL) { + asprintf(&data, "%s", tmpdata); + } else { + asprintf(&data, "%s%s", data, tmpdata); + } free(olddata); } ==== //depot/projects/soc2007/andrew-update/lib/facund_object.h#5 (text+ko) ==== @@ -50,27 +50,28 @@ struct facund_object *facund_object_new_bool(void); int facund_object_set_bool(struct facund_object *, int); -int facund_object_get_bool(struct facund_object *); +int facund_object_get_bool(const struct facund_object *); struct facund_object *facund_object_new_int(void); int facund_object_set_int(struct facund_object *, int32_t); -int32_t facund_object_get_int(struct facund_object *); +int32_t facund_object_get_int(const struct facund_object *); struct facund_object *facund_object_new_uint(void); int facund_object_set_uint(struct facund_object *, uint32_t); -uint32_t facund_object_get_uint(struct facund_object *); +uint32_t facund_object_get_uint(const struct facund_object *); struct facund_object *facund_object_new_string(void); int facund_object_set_string(struct facund_object *, const char *); -const char *facund_object_get_string(struct facund_object *); +const char *facund_object_get_string(const struct facund_object *); struct facund_object *facund_object_new_array(void); int facund_object_array_append(struct facund_object *, struct facund_object *); -const struct facund_object *facund_object_get_array_item(struct facund_object *, - unsigned int); +const struct facund_object *facund_object_get_array_item( + const struct facund_object *, unsigned int); +size_t facund_object_array_size(const struct facund_object *); void facund_object_free(struct facund_object *); @@ -78,8 +79,8 @@ int facund_object_set_from_str(struct facund_object *, const char *); -enum facund_object_error facund_object_get_error(struct facund_object*); -enum facund_type facund_object_get_type(struct facund_object *); +enum facund_object_error facund_object_get_error(const struct facund_object*); +enum facund_type facund_object_get_type(const struct facund_object *); const char *facund_object_xml_string(struct facund_object *); void facund_object_print(struct facund_object *); From owner-p4-projects@FreeBSD.ORG Sat Jul 14 07:45:30 2007 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 B54F316A406; Sat, 14 Jul 2007 07:45:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3978916A400 for ; Sat, 14 Jul 2007 07:45:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2AB9413C4C8 for ; Sat, 14 Jul 2007 07:45:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6E7jTKn040722 for ; Sat, 14 Jul 2007 07:45:29 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6E7jSp2040719 for perforce@freebsd.org; Sat, 14 Jul 2007 07:45:28 GMT (envelope-from andrew@freebsd.org) Date: Sat, 14 Jul 2007 07:45:28 GMT Message-Id: <200707140745.l6E7jSp2040719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 07:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123473 Change 123473 by andrew@andrew_hermies on 2007/07/14 07:45:24 Implement the list_updates handler returning fake data for now Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#12 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#12 (text+ko) ==== @@ -285,34 +285,164 @@ return resp; } -static struct facund_response * -facund_call_list_updates(const char *id __unused, struct facund_object *obj __unused) +static const char ** +get_dir_list(const struct facund_object *obj) { + const char **dirs; const struct facund_object *cur; - unsigned int pos; + size_t items, pos; + assert(obj != NULL); - if (obj == NULL) { - /* TODO: Don't use magic numbers */ - return facund_response_new(id, 1, "No data sent", NULL); - } + switch(facund_object_get_type(obj)) { + case FACUND_STRING: + dirs = malloc(2 * sizeof(char *)); + if (dirs == NULL) + return NULL; - switch (facund_object_get_type(obj)) { - case FACUND_STRING: - facund_object_print(obj); + dirs[0] = facund_object_get_string( + __DECONST(struct facund_object *, obj)); + dirs[1] = NULL; break; case FACUND_ARRAY: + items = facund_object_array_size(obj); + if (items == 0) + return NULL; + + dirs = malloc((items + 1) * sizeof(char *)); + if (dirs == NULL) + return NULL; + for (pos = 0; (cur = facund_object_get_array_item(obj, pos)) != NULL; - pos++) { - facund_object_print(__DECONST(struct facund_object *, cur)); + pos++) { + dirs[pos] = facund_object_get_string(cur); } + dirs[pos] = NULL; + assert(pos == items); + break; default: + return NULL; + } + return dirs; +} + +static struct facund_response * +facund_call_list_updates(const char *id, struct facund_object *obj) +{ + const struct facund_object *cur, *area_objs[2]; + struct facund_object *args; + const char **base_dirs, *areas[2]; + int get_base, get_ports; + unsigned int pos; + enum facund_type type; + + get_base = get_ports = 0; + base_dirs = NULL; + + if (obj == NULL) { + /* TODO: Don't use magic numbers */ + return facund_response_new(id, 1, "No data sent", NULL); + } + + if (facund_object_get_type(obj) != FACUND_ARRAY) { return facund_response_new(id, 1, "Bad data sent", NULL); - break; + } + + for (pos = 0; (cur = facund_object_get_array_item(obj, pos)) != NULL; + pos++) { + switch (pos) { + case 0: + /* Read in the type of updates to list */ + type = facund_object_get_type(cur); + if (type == FACUND_ARRAY) { + if (facund_object_array_size(cur) != 2) { + return facund_response_new(id, 1, + "Wrong number of arguments", NULL); + } + area_objs[0] = + facund_object_get_array_item(cur, 0); + area_objs[1] = + facund_object_get_array_item(cur, 1); + + areas[0] = + facund_object_get_string(area_objs[0]); + areas[1] = + facund_object_get_string(area_objs[1]); + + if (strcmp(areas[0], "base") == 0 || + strcmp(areas[1], "base")) + get_base = 1; + + if (strcmp(areas[0], "base") == 0 || + strcmp(areas[1], "base")) + get_ports = 1; + } else if (type == FACUND_STRING) { + areas[0] = facund_object_get_string(cur); + if (strcmp(areas[0], "base") == 0) { + get_base = 1; + } else if (strcmp(areas[0], "base") == 0) { + get_ports = 1; + } + } else { + return facund_response_new(id, 1, + "Incorrect data type", NULL); + } + break; + case 1: + /* Read in the directories to fet updates for */ + base_dirs = get_dir_list(cur); + if (base_dirs == NULL) + return facund_response_new(id, 1, + "Malloc failed", NULL); + break; + default: + if (base_dirs != NULL) + free(base_dirs); + + return facund_response_new(id, 1, "Too many arguments", + NULL); + } + } + if (pos != 2) { + if (base_dirs != NULL) + free(base_dirs); + return facund_response_new(id, 1, + "Not enough arguments", NULL); + } + /* + * If any of these asserts fail there was + * incorrect logic checking arguments + */ + assert(get_ports == 1 || get_base == 1); + assert(base_dirs[0] != NULL); + + args = facund_object_new_array(); + for (pos = 0; base_dirs[pos] != NULL; pos++) { + struct facund_object *pair, *item, *updates; + + pair = facund_object_new_array(); + + /* Add the directory to the start of the array */ + item = facund_object_new_string(); + facund_object_set_string(item, base_dirs[pos]); + facund_object_array_append(pair, item); + + /* Add a list of directories to the array */ + updates = facund_object_new_array(); + item = facund_object_new_string(); + facund_object_set_string(item, "6.2-p1"); + facund_object_array_append(updates, item); + facund_object_array_append(pair, updates); + + /* Add the directory on to the end of the arguments to return */ + facund_object_array_append(args, pair); } - printf("STUB: %s\n", __func__); - return NULL; + + printf("STUB: %s (base: %s, ports: %s)\n", __func__, + (get_base ? "yes" : "no"), (get_ports ? "yes" : "no")); + free(base_dirs); + return facund_response_new(id, RESP_GOOD, "Success", args); } static struct facund_response * @@ -344,7 +474,7 @@ } int -main(int argc __unused, char *argv[] __unused) +main(int argc, char *argv[]) { pthread_t update_thread, comms_thread; struct facund_conn *conn; From owner-p4-projects@FreeBSD.ORG Sat Jul 14 10:48:30 2007 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 B73F516A408; Sat, 14 Jul 2007 10:48:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62BF216A404 for ; Sat, 14 Jul 2007 10:48:29 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 51E5313C471 for ; Sat, 14 Jul 2007 10:48:29 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6EAmTkH065188 for ; Sat, 14 Jul 2007 10:48:29 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6EAmNgL065170 for perforce@freebsd.org; Sat, 14 Jul 2007 10:48:23 GMT (envelope-from delphij@freebsd.org) Date: Sat, 14 Jul 2007 10:48:23 GMT Message-Id: <200707141048.l6EAmNgL065170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 123478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 10:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123478 Change 123478 by delphij@charlie on 2007/07/14 10:47:26 IFC. Affected files ... .. //depot/projects/delphij_fork/ObsoleteFiles.inc#3 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/delphij_fork/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/delphij_fork/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/delphij_fork/etc/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/Makefile#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/main.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test.h#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/delphij_fork/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/delphij_fork/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/delphij_fork/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/delphij_fork/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/delphij_fork/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/delphij_fork/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch .. //depot/projects/delphij_fork/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/delphij_fork/sys/Makefile#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/delphij_fork/sys/coda/00READ#2 delete .. //depot/projects/delphij_fork/sys/coda/README#2 delete .. //depot/projects/delphij_fork/sys/coda/TODO#2 delete .. //depot/projects/delphij_fork/sys/coda/cnode.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_io.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_kernel.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_namecache.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_namecache.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_opstats.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_psdev.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_psdev.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_subr.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_subr.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_venus.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_venus.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_vnops.c#2 delete .. //depot/projects/delphij_fork/sys/coda/coda_vnops.h#2 delete .. //depot/projects/delphij_fork/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/files#3 integrate .. //depot/projects/delphij_fork/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/delphij_fork/sys/conf/options#3 integrate .. //depot/projects/delphij_fork/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/delphij_fork/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/delphij_fork/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/delphij_fork/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/coda/README#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/TODO#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/cnode.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/delphij_fork/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/delphij_fork/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_exec.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_resource.c#2 integrate .. //depot/projects/delphij_fork/sys/modules/coda/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/delphij_fork/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/delphij_fork/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctputil.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agp_i810.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/agppriv.h#2 integrate .. //depot/projects/delphij_fork/sys/pci/agpreg.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/lock_profile.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/sysent.h#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_meter.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/dconschat/dconschat.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_cli/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_passphrase/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Packet32.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/delphij_fork/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.104 2007/07/06 07:24:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.105 2007/07/12 00:02:12 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -59,6 +59,10 @@ OLD_FILES+=usr/include/fs/umapfs/umap.h OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz OLD_DIRS+=usr/include/fs/umapfs +# 20070618: Removal of the PROTO.localhost* files +OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=etc/namedb/PROTO.localhost.rev +OLD_FILES+=etc/namedb/make-localhost # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/delphij_fork/contrib/wpa_supplicant/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. ==== //depot/projects/delphij_fork/contrib/wpa_supplicant/ChangeLog#2 (text+ko) ==== @@ -1,32 +1,334 @@ ChangeLog for wpa_supplicant -2006-02-08 - v0.4.8 +2007-05-28 - v0.5.8 + * updated driver_wext.c to build with the current wireless-dev.git tree + and net/d80211 changes + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-03.txt) + * fixed 'make install' + * fixed EAP-TTLS implementation not to crash on use of freed memory + if TLS library initialization fails + * fixed EAP-AKA Notification processing to allow Notification to be + processed after AKA Challenge response has been sent + +2006-12-31 - v0.5.7 + * updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48 + * updated EAP-PSK to use the IANA-allocated EAP type 47 + * fixed EAP-PAX key derivation + * fixed EAP-PSK bit ordering of the Flags field + * fixed EAP-PEAP/TTLS/FAST to use the correct EAP identifier in + tunnelled identity request (previously, the identifier from the outer + method was used, not the tunnelled identifier which could be + different) + * fixed EAP-TTLS AVP parser processing for too short AVP lengths + * added support for EAP-FAST authentication with inner methods that + generate MSK (e.g., EAP-MSCHAPv2 that was previously only supported + for PAC provisioning) + * fixed dbus ctrl_iface to validate message interface before + dispatching to avoid a possible segfault [Bug 190] + * fixed PeerKey key derivation to use the correct PRF label + * updated Windows binary build to link against OpenSSL 0.9.8d and + added support for EAP-FAST + +2006-11-24 - v0.5.6 + * added experimental, integrated TLSv1 client implementation with the + needed X.509/ASN.1/RSA/bignum processing (this can be enabled by + setting CONFIG_TLS=internal and CONFIG_INTERNAL_LIBTOMMATH=y in + .config); this can be useful, e.g., if the target system does not + have a suitable TLS library and a minimal code size is required + (total size of this internal TLS/crypto code is bit under 50 kB on + x86 and the crypto code is shared by rest of the supplicant so some + of it was already required; TLSv1/X.509/ASN.1/RSA added about 25 kB) + * removed STAKey handshake since PeerKey handshake has replaced it in + IEEE 802.11ma and there are no known deployments of STAKey + * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest + draft (draft-ietf-emu-eap-gpsk-01.txt) + * added preliminary implementation of IEEE 802.11w/D1.0 (management + frame protection) + (Note: this requires driver support to work properly.) + (Note2: IEEE 802.11w is an unapproved draft and subject to change.) + * fixed Windows named pipes ctrl_iface to not stop listening for + commands if client program opens a named pipe and closes it + immediately without sending a command + * fixed USIM PIN status determination for the case that PIN is not + needed (this allows EAP-AKA to be used with USIM cards that do not + use PIN) + * added support for reading 3G USIM AID from EF_DIR to allow EAP-AKA to + be used with cards that do not support file selection based on + partial AID + * added support for matching the subjectAltName of the authentication + server certificate against multiple name components (e.g., + altsubject_match="DNS:server.example.com;DNS:server2.example.com") + * fixed EAP-SIM/AKA key derivation for re-authentication case (only + affects IEEE 802.1X with dynamic WEP keys) + * changed ctrl_iface network configuration 'get' operations to not + return password/key material; if these fields are requested, "*" + will be returned if the password/key is set, but the value of the + parameter is not exposed + +2006-08-27 - v0.5.5 + * added support for building Windows version with UNICODE defined + (wide-char functions) + * driver_ndis: fixed static WEP configuration to avoid race condition + issues with some NDIS drivers between association and setting WEP + keys + * driver_ndis: added validation for IELength value in scan results to + avoid crashes when using buggy NDIS drivers [Bug 165] + * fixed Release|Win32 target in the Visual Studio project files + (previously, only Debug|Win32 target was set properly) + * changed control interface API call wpa_ctrl_pending() to allow it to + return -1 on error (e.g., connection lost); control interface clients + will need to make sure that they verify that the value is indeed >0 + when determining whether there are pending messages + * added an alternative control interface backend for Windows targets: + Named Pipe (CONFIG_CTRL_IFACE=named_pipe); this is now the default + control interface mechanism for Windows builds (previously, UDP to + localhost was used) + * changed ctrl_interface configuration for UNIX domain sockets: + - deprecated ctrl_interface_group variable (it may be removed in + future versions) + - allow both directory and group be configured with ctrl_interface + in following format: DIR=/var/run/wpa_supplicant GROUP=wheel + - ctrl_interface=/var/run/wpa_supplicant is still supported for the + case when group is not changed + * added support for controlling more than one interface per process in + Windows version + * added a workaround for a case where the AP is using unknown address + (e.g., MAC address of the wired interface) as the source address for + EAPOL-Key frames; previously, that source address was used as the + destination for EAPOL-Key frames and in key derivation; now, BSSID is + used even if the source address does not match with it + (this resolves an interoperability issue with Thomson SpeedTouch 580) + * added a workaround for UDP-based control interface (which was used in + Windows builds before this release) to prevent packets with forged + addresses from being accepted as local control requests + * removed ndis_events.cpp and possibility of using external + ndis_events.exe; C version (ndis_events.c) is fully functional and + there is no desire to maintain two separate versions of this + implementation + * ndis_events: Changed NDIS event notification design to use WMI to + learn the adapter description through Win32_PnPEntity class; this + should fix some cases where the adapter name was not recognized + correctly (e.g., with some USB WLAN adapters, e.g., Ralink RT2500 + USB) [Bug 113] + * fixed selection of the first network in ap_scan=2 mode; previously, + wpa_supplicant could get stuck in SCANNING state when only the first + network for enabled (e.g., after 'wpa_cli select_network 0') + * winsvc: added support for configuring ctrl_interface parameters in + registry (ctrl_interface string value in + HKLM\SOFTWARE\wpa_supplicant\interfaces\0000 key); this new value is + required to enable control interface (previously, this was hardcoded + to be enabled) + * allow wpa_gui subdirectory to be built with both Qt3 and Qt4 + * converted wpa_gui-qt4 subdirectory to use Qt4 specific project format + +2006-06-20 - v0.5.4 + * fixed build with CONFIG_STAKEY=y [Bug 143] + * added support for doing MLME (IEEE 802.11 management frame + processing) in wpa_supplicant when using Devicescape IEEE 802.11 + stack (wireless-dev.git tree) + * added a new network block configuration option, fragment_size, to + configure the maximum EAP fragment size + * driver_ndis: Disable WZC automatically for the selected interface to + avoid conflicts with two programs trying to control the radio; WZC + will be re-enabled (if it was enabled originally) when wpa_supplicant + is terminated + * added an experimental TLSv1 client implementation + (CONFIG_TLS=internal) that can be used instead of an external TLS + library, e.g., to reduce total size requirement on systems that do + not include any TLS library by default (this is not yet complete; + basic functionality is there, but certificate validation is not yet + included) + * added PeerKey handshake implementation for IEEE 802.11e + direct link setup (DLS) to replace STAKey handshake + * fixed WPA PSK update through ctrl_iface for the case where the old + PSK was derived from an ASCII passphrase and the new PSK is set as + a raw PSK (hex string) + * added new configuration option for identifying which network block + was used (id_str in wpa_supplicant.conf; included on + WPA_EVENT_CONNECT monitor event and as WPA_ID_STR environmental + variable in wpa_cli action scripts; in addition WPA_ID variable is + set to the current unique identifier that wpa_supplicant assigned + automatically for the network and that can be used with + GET_NETWORK/SET_NETWORK ctrl_iface commands) + * wpa_cli action script is now called only when the connect/disconnect + status changes or when associating with a different network + * fixed configuration parser not to remove CCMP from group cipher list + if WPA-None (adhoc) is used (pairwise=NONE in that case) + * fixed integrated NDIS events processing not to hang the process due + to a missed change in eloop_win.c API in v0.5.3 [Bug 155] + * added support for EAP Generalized Pre-Shared Key (EAP-GPSK, + draft-clancy-emu-eap-shared-secret-00.txt) + * added Microsoft Visual Studio 2005 solution and project files for + build wpa_supplicant for Windows (see vs2005 subdirectory) + * eloop_win: fixed unregistration of Windows events + * l2_packet_winpcap: fixed a deadlock in deinitializing l2_packet + at the end of RSN pre-authentication and added unregistration of + a Windows event to avoid getting eloop_win stuck with an invalid + handle + * driver_ndis: added support for selecting AP based on BSSID + * added new environmental variable for wpa_cli action scripts: + WPA_CTRL_DIR is the current control interface directory + * driver_ndis: added support for using NDISUIO instead of WinPcap for + OID set/query operations (CONFIG_USE_NDISUIO=y in .config); with new + l2_packet_ndis (CONFIG_L2_PACKET=ndis), this can be used to build + wpa_supplicant without requiring WinPcap; note that using NDISUIO + requires that WZC is disabled (net stop wzcsvc) since NDISUIO allows + only one application to open the device + * changed NDIS driver naming to only include device GUID, e.g., + {7EE3EFE5-C165-472F-986D-F6FBEDFE8C8D}, instead of including WinPcap + specific \Device\NPF_ prefix before the GUID; the prefix is still + allowed for backwards compatibility, but it is not required anymore + when specifying the interface + * driver_ndis: re-initialize driver interface is the adapter is removed + and re-inserted [Bug 159] + * driver_madwifi: fixed TKIP and CCMP sequence number configuration on + big endian hosts [Bug 146] + +2006-04-27 - v0.5.3 + * fixed EAP-GTC response to include correct user identity when run as + phase 2 method of EAP-FAST (i.e., EAP-FAST did not work in v0.5.2) + * driver_ndis: Fixed encryption mode configuration for unencrypted + networks (some NDIS drivers ignored this, but others, e.g., Broadcom, + refused to associate with open networks) [Bug 106] + * driver_ndis: use BSSID OID polling to detect when IBSS network is + formed even when ndis_events code is included since some NDIS drivers + do not generate media connect events in IBSS mode + * config_winreg: allow global ctrl_interface parameter to be configured + in Windows registry + * config_winreg: added support for saving configuration data into + Windows registry + * added support for controlling network device operational state + (dormant/up) for Linux 2.6.17 to improve DHCP processing (see + http://www.flamewarmaster.de/software/dhcpclient/ for a DHCP client + that can use this information) + * driver_wext: added support for WE-21 change to SSID configuration + * driver_wext: fixed privacy configuration for static WEP keys mode + [Bug 140] + * added an optional driver_ops callback for MLME-SETPROTECTION.request + primitive + * added support for EAP-SAKE (no EAP method number allocated yet, so + this is using the same experimental type 255 as EAP-PSK) + * added support for dynamically loading EAP methods (.so files) instead + of requiring them to be statically linked in; this is disabled by + default (see CONFIG_DYNAMIC_EAP_METHODS in defconfig for information + on how to use this) + +2006-03-19 - v0.5.2 + * do not try to use USIM APDUs when initializing PC/SC for SIM card + access for a network that has not enabled EAP-AKA + * fixed EAP phase 2 Nak for EAP-{PEAP,TTLS,FAST} (this was broken in + v0.5.1 due to the new support for expanded EAP types) + * added support for generating EAP Expanded Nak + * try to fetch scan results once before requesting new scan when + starting up in ap_scan=1 mode (this can speed up initial association + a lot with, e.g., madwifi-ng driver) + * added support for receiving EAPOL frames from a Linux bridge + interface (-bbr0 on command line) + * fixed EAPOL re-authentication for sessions that used PMKSA caching + * changed EAP method registration to use a dynamic list of methods + instead of a static list generated at build time + * fixed PMKSA cache deinitialization not to use freed memory when + removing PMKSA entries + * fixed a memory leak in EAP-TTLS re-authentication + * reject WPA/WPA2 message 3/4 if it does not include any valid + WPA/RSN IE + * driver_wext: added fallback to use SIOCSIWENCODE for setting auth_alg + if the driver does not support SIOCSIWAUTH + +2006-01-29 - v0.5.1 + * driver_test: added better support for multiple APs and STAs by using + a directory with sockets that include MAC address for each device in + the name (driver_param=test_dir=/tmp/test) + * added support for EAP expanded type (vendor specific EAP methods) + * added AP_SCAN command into ctrl_iface so that ap_scan configuration + option can be changed if needed + * wpa_cli/wpa_gui: skip non-socket files in control directory when + using UNIX domain sockets; this avoids selecting an incorrect + interface (e.g., a PID file could be in this directory, even though + use of this directory for something else than socket files is not + recommended) + * fixed TLS library deinitialization after RSN pre-authentication not + to disable TLS library for normal authentication + * driver_wext: Remove null-termination from SSID length if the driver + used it; some Linux drivers do this and they were causing problems in + wpa_supplicant not finding matching configuration block. This change + would break a case where the SSID actually ends in '\0', but that is + not likely to happen in real use. + * fixed PMKSA cache processing not to trigger deauthentication if the + current PMKSA cache entry is replaced with a valid new entry + * fixed PC/SC initialization for ap_scan != 1 modes (this fixes + EAP-SIM and EAP-AKA with real SIM/USIM card when using ap_scan=0 or + ap_scan=2) + +2005-12-18 - v0.5.0 (beginning of 0.5.x development releases) + * added experimental STAKey handshake implementation for IEEE 802.11e + direct link setup (DLS); note: this is disabled by default in both + build and runtime configuration (can be enabled with CONFIG_STAKEY=y + and stakey=1) + * fixed EAP-SIM and EAP-AKA pseudonym and fast re-authentication to + decrypt AT_ENCR_DATA attributes correctly + * fixed EAP-AKA to allow resynchronization within the same session + * made code closer to ANSI C89 standard to make it easier to port to + other C libraries and compilers + * started moving operating system or C library specific functions into + wrapper functions defined in os.h and implemented in os_*.c to make + code more portable + * wpa_supplicant can now be built with Microsoft Visual C++ + (e.g., with the freely available Toolkit 2003 version or Visual + C++ 2005 Express Edition and Platform SDK); see nmake.mak for an + example makefile for nmake + * added support for using Windows registry for command line parameters + (CONFIG_MAIN=main_winsvc) and configuration data + (CONFIG_BACKEND=winreg); see win_example.reg for an example registry + contents; this version can be run both as a Windows service and as a + normal application; 'wpasvc.exe app' to start as applicant, + 'wpasvc.exe reg ' to register a service, + 'net start wpasvc' to start the service, 'wpasvc.exe unreg' to + unregister a service + * made it possible to link ndis_events.exe functionality into + wpa_supplicant.exe by defining CONFIG_NDIS_EVENTS_INTEGRATED + * added better support for multiple control interface backends + (CONFIG_CTRL_IFACE option); currently, 'unix' and 'udp' are supported * fixed PC/SC code to use correct length for GSM AUTH command buffer and to not use pioRecvPci with SCardTransmit() calls; these were not causing visible problems with pcsc-lite, but Windows Winscard.dll refused the previously used parameters; this fixes EAP-SIM and EAP-AKA authentication using SIM/USIM card under Windows + * added new event loop implementation for Windows using + WaitForMultipleObject() instead of select() in order to allow waiting + for non-socket objects; this can be selected with + CONFIG_ELOOP=eloop_win in .config + * added support for selecting l2_packet implementation in .config + (CONFIG_L2_PACKET; following options are available now: linux, pcap, + winpcap, freebsd, none) + * added new l2_packet implementation for WinPcap + (CONFIG_L2_PACKET=winpcap) that uses a separate receive thread to + reduce latency in EAPOL receive processing from about 100 ms to about + 3 ms * added support for EAP-FAST key derivation using other ciphers than RC4-128-SHA for authentication and AES128-SHA for provisioning - * fixed EAP-SIM and EAP-AKA pseudonym and fast re-authentication to - decrypt AT_ENCR_DATA attributes correctly * added support for configuring CA certificate as DER file and as a configuration blob * fixed private key configuration as configuration blob and added support for using PKCS#12 as a blob - * fixed cygwin build + * tls_gnutls: added support for using PKCS#12 files; added support for + session resumption * added support for loading trusted CA certificates from Windows certificate store: ca_cert="cert_store://", where is likely CA (Intermediate CA certificates) or ROOT (root certificates) - * fixed TLS library deinitialization after RSN pre-authentication not - to disable TLS library for normal authentication - * fixed PMKSA cache processing not to trigger deauthentication if the - current PMKSA cache entry is replaced with a valid new entry - * fixed PC/SC initialization for ap_scan != 1 modes (this fixes - EAP-SIM and EAP-AKA with real SIM/USIM card when using ap_scan=0 or - ap_scan=2) - * do not try to use USIM APDUs when initializing PC/SC for SIM card - access for a network that has not enabled EAP-AKA + * added C version of ndis_events.cpp and made it possible to build this + with MinGW so that CONFIG_NDIS_EVENTS_INTEGRATED can be used more + easily on cross-compilation builds + * added wpasvc.exe into Windows binary release; this is an alternative + version of wpa_supplicant.exe with configuration backend using + Windows registry and with the entry point designed to run as a + Windows service + * integrated ndis_events.exe functionality into wpa_supplicant.exe and + wpasvc.exe and removed this additional tool from the Windows binary + release since it is not needed anymore + * load winscard.dll functions dynamically when building with MinGW + since MinGW does not yet include winscard library 2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases) * l2_packet_pcap: fixed wired IEEE 802.1X authentication with libpcap ==== //depot/projects/delphij_fork/contrib/wpa_supplicant/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.3 2006/03/07 05:44:45 sam Exp $ +$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-Xlist,v 1.4 2007/07/11 15:59:42 sam Exp $ .cvsignore README-Windows.txt driver_atmel.c @@ -8,14 +8,26 @@ driver_ipw.c driver_madwifi.c driver_ndiswrapper.c +driver_ndis_.c driver_prism54.c driver_test.c driver_wext.c driver_wext.h l2_packet_freebsd.c l2_packet_linux.c +l2_packet_ndis.c +l2_packet_none.c l2_packet_pcap.c +l2_packet_winpcap.c +main_none.c +main_winmain.c +main_winsvc.c +ndis_events.c ndis_events.cpp +nmake.mk +os_win32.c priv_netlink.h +vs2005 +win_example.reg win_if_list.c wireless_copy.h ==== //depot/projects/delphij_fork/contrib/wpa_supplicant/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.1 2005/06/05 20:55:01 sam Exp $ +$FreeBSD: src/contrib/wpa_supplicant/FREEBSD-upgrade,v 1.2 2007/07/11 15:59:42 sam Exp $ WPA Supplicant originals can be found at: http://hostap.epitest.fi/releases/ @@ -6,12 +6,12 @@ For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.3.8.tar.gz + tar -X FREEBSD-Xlist -zxf wpa_supplicant-0.5.8.tar.gz then imported by: - cvs import -m 'Import of WPA supplicant 0.3.8' \ - src/contrib/wpa_supplicant MALINEN v0_3_8 + cvs import -m 'Import of WPA supplicant 0.5.8' \ + src/contrib/wpa_supplicant MALINEN v0_5_8 To make local changes to wpa_supplcaint, simply patch and commit to the main branch (aka HEAD). Never make local changes on the @@ -21,4 +21,4 @@ the next vendor release. sam@FreeBSD.org -4-June-2005 +11-July-2007 ==== //depot/projects/delphij_fork/contrib/wpa_supplicant/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ ALL=wpa_supplicant wpa_passphrase wpa_cli -all: verify_config $(ALL) +all: verify_config $(ALL) dynamic_eap_methods verify_config: @if [ ! -r .config ]; then \ @@ -36,13 +36,36 @@ for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done OBJS = config.o \ - eloop.o common.o md5.o \ - rc4.o sha1.o -OBJS_p = wpa_passphrase.o sha1.o md5.o + common.o md5.o md4.o \ + rc4.o sha1.o des.o +OBJS_p = wpa_passphrase.o sha1.o md5.o md4.o \ + common.o des.o OBJS_c = wpa_cli.o wpa_ctrl.o -include .config +ifndef CONFIG_OS +ifdef CONFIG_NATIVE_WINDOWS +CONFIG_OS=win32 +else +CONFIG_OS=unix +endif +endif + +ifeq ($(CONFIG_OS), internal) +CFLAGS += -DOS_NO_C_LIB_DEFINES +endif + +OBJS += os_$(CONFIG_OS).o +OBJS_p += os_$(CONFIG_OS).o +OBJS_c += os_$(CONFIG_OS).o + +ifndef CONFIG_ELOOP +CONFIG_ELOOP=eloop +endif +OBJS += $(CONFIG_ELOOP).o + + ifdef CONFIG_EAPOL_TEST CFLAGS += -Werror -DEAPOL_TEST endif @@ -56,6 +79,14 @@ CFLAGS += -DCONFIG_BACKEND_FILE endif +ifeq ($(CONFIG_BACKEND), winreg) +OBJS += config_winreg.o +endif + +ifeq ($(CONFIG_BACKEND), none) +OBJS += config_none.o +endif + ifdef CONFIG_DRIVER_HOSTAP CFLAGS += -DCONFIG_DRIVER_HOSTAP OBJS_d += driver_hostap.o @@ -111,16 +142,22 @@ ifdef CONFIG_DRIVER_BSD CFLAGS += -DCONFIG_DRIVER_BSD OBJS_d += driver_bsd.o -CONFIG_DNET_PCAP=y -CONFIG_L2_FREEBSD=y +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=freebsd +endif endif ifdef CONFIG_DRIVER_NDIS CFLAGS += -DCONFIG_DRIVER_NDIS OBJS_d += driver_ndis.o driver_ndis_.o -CONFIG_DNET_PCAP=y +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=pcap +endif CONFIG_WINPCAP=y +ifdef CONFIG_USE_NDISUIO +CFLAGS += -DCONFIG_USE_NDISUIO endif +endif ifdef CONFIG_DRIVER_WIRED CFLAGS += -DCONFIG_DRIVER_WIRED @@ -132,116 +169,176 @@ OBJS_d += driver_test.o endif -ifdef CONFIG_DNET_PCAP -CFLAGS += -DUSE_DNET_PCAP +ifndef CONFIG_L2_PACKET +CONFIG_L2_PACKET=linux +endif + +OBJS += l2_packet_$(CONFIG_L2_PACKET).o + +ifeq ($(CONFIG_L2_PACKET), pcap) ifdef CONFIG_WINPCAP -OBJS += l2_packet_pcap.o CFLAGS += -DCONFIG_WINPCAP LIBS += -lwpcap -lpacket LIBS_w += -lwpcap else -ifdef CONFIG_L2_FREEBSD -OBJS += l2_packet_freebsd.o -LIBS += -lpcap -else -OBJS += l2_packet_pcap.o LIBS += -ldnet -lpcap endif endif -else -OBJS += l2_packet_linux.o + +ifeq ($(CONFIG_L2_PACKET), winpcap) +LIBS += -lwpcap -lpacket +LIBS_w += -lwpcap +endif + +ifeq ($(CONFIG_L2_PACKET), freebsd) +LIBS += -lpcap endif ifdef CONFIG_EAP_TLS # EAP-TLS +ifeq ($(CONFIG_EAP_TLS), dyn) +CFLAGS += -DEAP_TLS_DYNAMIC +EAPDYN += eap_tls.so +else CFLAGS += -DEAP_TLS OBJS += eap_tls.o +endif TLS_FUNCS=y CONFIG_IEEE8021X_EAPOL=y endif ifdef CONFIG_EAP_PEAP # EAP-PEAP +ifeq ($(CONFIG_EAP_PEAP), dyn) +CFLAGS += -DEAP_PEAP_DYNAMIC +EAPDYN += eap_peap.so +else CFLAGS += -DEAP_PEAP OBJS += eap_peap.o +endif TLS_FUNCS=y -CONFIG_EAP_MSCHAPV2=y >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 14 17:09:41 2007 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 48CDF16A468; Sat, 14 Jul 2007 17:09:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 264A816A420 for ; Sat, 14 Jul 2007 17:09:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1475513C471 for ; Sat, 14 Jul 2007 17:09:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6EH9eEv020729 for ; Sat, 14 Jul 2007 17:09:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6EH9eaK020725 for perforce@freebsd.org; Sat, 14 Jul 2007 17:09:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 14 Jul 2007 17:09:40 GMT Message-Id: <200707141709.l6EH9eaK020725@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 123491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 17:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123491 Change 123491 by rwatson@rwatson_peppercorn on 2007/07/14 17:08:53 Apply patch from bin/113534 correctings bugs due to not zeroing tm before passing it to strptime(3), which in the presence of a partial time string, will only initialize fields specified by the user. Submitted by: "Alex Samorukov" Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#55 edit .. //depot/projects/trustedbsd/openbsm/README#24 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#55 (text+ko) ==== @@ -6,6 +6,8 @@ - Synchronized audit event list to Solaris, picking up the *at(2) system call definitions, now required for FreeBSD and Linux. Added additional events for *at(2) system calls not present in Solaris. +- Bugs in auditreduce(8) fixed allowing partial date strings to be used in + filtering events. OpenBSM 1.0 alpha 14 @@ -293,4 +295,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#54 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#55 $ ==== //depot/projects/trustedbsd/openbsm/README#24 (text+ko) ==== @@ -89,6 +89,7 @@ Ruslan Ermilov Martin Voros Diego Giagio + Alex Samorukov In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -110,4 +111,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#23 $ +$P4: //depot/projects/trustedbsd/openbsm/README#24 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#19 $ */ /* @@ -629,6 +629,7 @@ usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_a); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d%H%M%S", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); @@ -641,6 +642,7 @@ usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_b); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d%H%M%S", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); @@ -661,6 +663,7 @@ OPT_a)) usage("'d' is exclusive with 'a' and 'b'"); SETOPT(opttochk, OPT_d); + bzero(&tm, sizeof(tm)); strptime(optarg, "%Y%m%d", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); /* fprintf(stderr, "Time converted = %s\n", timestr); */ From owner-p4-projects@FreeBSD.ORG Sat Jul 14 19:04:00 2007 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 E815716A409; Sat, 14 Jul 2007 19:03:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E034B16A400 for ; Sat, 14 Jul 2007 19:03:58 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CBC2A13C4AA for ; Sat, 14 Jul 2007 19:03:58 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6EJ3wp6031303 for ; Sat, 14 Jul 2007 19:03:58 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6EJ3uGJ031285 for perforce@freebsd.org; Sat, 14 Jul 2007 19:03:56 GMT (envelope-from loafier@FreeBSD.org) Date: Sat, 14 Jul 2007 19:03:56 GMT Message-Id: <200707141903.l6EJ3uGJ031285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 123493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 19:04:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=123493 Change 123493 by loafier@chrisdsoc on 2007/07/14 18:45:56 Increased scope of my branch to track audio driver template work in share/examples/. Affected files ... .. //depot/projects/soc2007/loafier_busalloc/doc/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/README#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/linux-comparison/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/articles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/teams.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/flyer/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/articles.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/books.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2007/loafier_busalloc/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 14 19:42:49 2007 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 B58FB16A405; Sat, 14 Jul 2007 19:42:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 86C4C16A410 for ; Sat, 14 Jul 2007 19:42:48 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7585913C4BD for ; Sat, 14 Jul 2007 19:42:48 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6EJgmMA035285 for ; Sat, 14 Jul 2007 19:42:48 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6EJglMV035282 for perforce@freebsd.org; Sat, 14 Jul 2007 19:42:47 GMT (envelope-from loafier@FreeBSD.org) Date: Sat, 14 Jul 2007 19:42:47 GMT Message-Id: <200707141942.l6EJglMV035282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 123496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 19:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=123496 Change 123496 by loafier@chrisdsoc on 2007/07/14 19:42:02 Added back edits and sound driver template. Affected files ... .. //depot/projects/soc2007/loafier_busalloc/src/share/examples/drivers/template.c#1 add .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_mci.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_pio.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_rtc.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_spi.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_ssc.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_twi.c#2 edit .. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/if_ate.c#2 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -63,14 +63,25 @@ #define BBSZ 512 +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec mci_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct at91_mci_softc { void *intrhand; /* Interrupt handle */ device_t dev; int flags; #define CMD_STARTED 1 #define STOP_STARTED 2 - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ and Memory resources */ struct mtx sc_mtx; bus_dma_tag_t dmatag; bus_dmamap_t map; @@ -86,13 +97,13 @@ static inline uint32_t RD4(struct at91_mci_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_mci_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } /* bus entry points */ @@ -191,7 +202,7 @@ /* * Activate the interrupt */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC | INTR_MPSAFE, NULL, at91_mci_intr, sc, &sc->intrhand); if (err) { AT91_MCI_LOCK_DESTROY(sc); @@ -222,23 +233,14 @@ at91_mci_activate(device_t dev) { struct at91_mci_softc *sc; - int rid; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; + if (bus_alloc_resources(dev, mci_res_spec, sc->res)) { + at91_mci_deactivate(dev); + return (ENOMEM); + } + return (0); -errout: - at91_mci_deactivate(dev); - return (ENOMEM); } static void @@ -248,18 +250,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, mci_res_spec, sc->res); } static void ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -42,12 +42,23 @@ #include #include +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec pio_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct at91_pio_softc { device_t dev; /* Myself */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ and Memory resources */ struct mtx sc_mtx; /* basically a perimeter lock */ struct cdev *cdev; int flags; @@ -57,13 +68,13 @@ static inline uint32_t RD4(struct at91_pio_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_pio_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } #define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) @@ -148,7 +159,7 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC, at91_pio_intr, NULL, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); @@ -177,23 +188,15 @@ at91_pio_activate(device_t dev) { struct at91_pio_softc *sc; - int rid; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE | RF_SHAREABLE); - if (sc->irq_res == NULL) - goto errout; + + if (bus_alloc_resources(dev, pio_res_spec, sc->res)) { + at91_pio_deactivate(dev); + return (ENOMEM); + } + return (0); -errout: - at91_pio_deactivate(dev); - return (ENOMEM); } static void @@ -203,18 +206,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, pio_res_spec, sc->res); } static int ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_rtc.c#2 (text) ==== @@ -43,25 +43,36 @@ #include "clock_if.h" +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec rtc_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, + {-1, 0, 0} +}; + struct at91_rtc_softc { device_t dev; /* Myself */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ and Memory resources */ struct mtx sc_mtx; /* basically a perimeter lock */ }; static inline uint32_t RD4(struct at91_rtc_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_rtc_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } #define AT91_RTC_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) @@ -110,7 +121,7 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, RTC_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC, at91_rtc_intr, NULL, sc, &sc->intrhand); if (err) { AT91_RTC_LOCK_DESTROY(sc); @@ -133,23 +144,15 @@ at91_rtc_activate(device_t dev) { struct at91_rtc_softc *sc; - int rid; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE | RF_SHAREABLE); - if (sc->irq_res == NULL) - goto errout; + + if (bus_alloc_resources(dev, rtc_res_spec, sc->res)) { + at91_rtc_deactivate(dev); + return (ENOMEM); + } + return (0); -errout: - at91_rtc_deactivate(dev); - return (ENOMEM); } static void @@ -159,18 +162,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, rtc_res_spec, sc->res); } static int ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_spi.c#2 (text) ==== @@ -43,12 +43,23 @@ #include #include "spibus_if.h" +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec spi_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct at91_spi_softc { device_t dev; /* Myself */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ and Memory resource */ bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t map[4]; /* Maps for the transaction */ int rxdone; @@ -57,13 +68,13 @@ static inline uint32_t RD4(struct at91_spi_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_spi_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } /* bus entry points */ @@ -149,20 +160,14 @@ at91_spi_activate(device_t dev) { struct at91_spi_softc *sc; - int rid, err = ENOMEM; + int err = ENOMEM; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) + + if (bus_alloc_resources(dev, spi_res_spec, sc->res)) goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC | INTR_MPSAFE, NULL, at91_spi_intr, sc, &sc->intrhand); if (err != 0) goto errout; @@ -179,18 +184,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, spi_res_spec, sc->res); } static void ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_ssc.c#2 (text) ==== @@ -38,12 +38,23 @@ #include +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec ssc_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct at91_ssc_softc { device_t dev; /* Myself */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ and Memory resources */ struct mtx sc_mtx; /* basically a perimeter lock */ struct cdev *cdev; int flags; @@ -53,13 +64,13 @@ static inline uint32_t RD4(struct at91_ssc_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_ssc_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } #define AT91_SSC_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -123,7 +134,7 @@ /* * Activate the interrupt */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC | INTR_MPSAFE, NULL, at91_ssc_intr, sc, &sc->intrhand); if (err) { AT91_SSC_LOCK_DESTROY(sc); @@ -165,23 +176,15 @@ at91_ssc_activate(device_t dev) { struct at91_ssc_softc *sc; - int rid; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; + + if (bus_alloc_resources(dev, ssc_res_spec, sc->res)) { + at91_ssc_deactivate(dev); + return (ENOMEM); + } + return (0); -errout: - at91_ssc_deactivate(dev); - return (ENOMEM); } static void @@ -191,18 +194,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, ssc_res_spec, sc->res); } static void ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -49,12 +49,23 @@ #define TWI_FAST_CLOCK 45000 #define TWI_FASTEST_CLOCK 90000 +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec twi_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct at91_twi_softc { device_t dev; /* Myself */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ & Memory resources */ struct mtx sc_mtx; /* basically a perimeter lock */ volatile uint32_t flags; uint32_t cwgr; @@ -66,13 +77,13 @@ static inline uint32_t RD4(struct at91_twi_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct at91_twi_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } #define AT91_TWI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -121,7 +132,7 @@ /* * Activate the interrupt */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_MISC | INTR_MPSAFE, NULL, at91_twi_intr, sc, &sc->intrhand); if (err) { AT91_TWI_LOCK_DESTROY(sc); @@ -162,23 +173,15 @@ at91_twi_activate(device_t dev) { struct at91_twi_softc *sc; - int rid; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; + + if (bus_alloc_resources(dev, twi_res_spec, sc->res)) { + at91_twi_deactivate(dev); + return (ENOMEM); + } + return (0); -errout: - at91_twi_deactivate(dev); - return (ENOMEM); } static void @@ -188,18 +191,10 @@ sc = device_get_softc(dev); if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, twi_res_spec, sc->res); } static void ==== //depot/projects/soc2007/loafier_busalloc/src/sys/arm/at91/if_ate.c#2 (text) ==== @@ -75,6 +75,18 @@ #define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 +enum { + RES_MEM, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec ate_res_spec[] = { + {SYS_RES_MEMORY, 0, RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE}, + {-1, 0, 0} +}; + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -82,8 +94,7 @@ device_t dev; /* Myself */ device_t miibus; /* My child miibus */ void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ - struct resource *mem_res; /* Memory resource */ + struct resource *res[RES_SZ]; /* IRQ & Memory resources */ struct callout tick_ch; /* Tick callout */ bus_dma_tag_t mtag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; @@ -104,13 +115,13 @@ static inline uint32_t RD4(struct ate_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + return bus_read_4(sc->res[RES_MEM], off); } static inline void WR4(struct ate_softc *sc, bus_size_t off, uint32_t val) { - bus_write_4(sc->mem_res, off, val); + bus_write_4(sc->res[RES_MEM], off, val); } #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -225,7 +236,7 @@ /* * Activate the interrupt */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->res[RES_IRQ], INTR_TYPE_NET | INTR_MPSAFE, NULL, ate_intr, sc, &sc->intrhand); if (err) { ether_ifdetach(ifp); @@ -324,20 +335,12 @@ ate_activate(device_t dev) { struct ate_softc *sc; - int rid, err, i; + int err, i; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) + if (bus_alloc_resources(dev, ate_res_spec, sc->res)) goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; - + /* * Allocate DMA tags and maps */ @@ -441,20 +444,12 @@ bus_dma_tag_destroy(sc->mcs_tag); #endif if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->intrhand); sc->intrhand = 0; bus_generic_detach(sc->dev); if (sc->miibus) device_delete_child(sc->dev, sc->miibus); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + bus_release_resources(dev, ate_res_spec, sc->res); } /* From owner-p4-projects@FreeBSD.ORG Sat Jul 14 23:29:41 2007 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 598F416A408; Sat, 14 Jul 2007 23:29:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16CF716A406 for ; Sat, 14 Jul 2007 23:29:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0350513C4A7 for ; Sat, 14 Jul 2007 23:29:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6ENTeXt069513 for ; Sat, 14 Jul 2007 23:29:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6ENT0MB069457 for perforce@freebsd.org; Sat, 14 Jul 2007 23:29:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 14 Jul 2007 23:29:00 GMT Message-Id: <200707142329.l6ENT0MB069457@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 123508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 23:29:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123508 Change 123508 by rwatson@rwatson_zoo on 2007/07/14 23:28:03 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#22 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#18 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#24 integrate .. //depot/projects/trustedbsd/audit3/bin/df/df.c#8 integrate .. //depot/projects/trustedbsd/audit3/bin/ed/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/Makefile.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/THANKS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/analyze.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/bootstrap#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/config.hin#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/configure#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/configure.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/context.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/diagmeet.note#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/diff.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/diff.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/diff.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/diff3.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/dir.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/version.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/ed.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/exgettext#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/ifdef.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/install-sh#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/io.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/basename.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/error.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/error.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/exit.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/regex.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/regex.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/man/cmp.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/man/diff.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/man/diff3.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/normal.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/prepend_args.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/prepend_args.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/sdiff.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/side.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/analyze.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/cmp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/context.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/diff.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/diff.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/diff3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/dir.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/ed.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/io.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/normal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/side.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/system.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/src/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/diff/stamp-h.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/system.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/util.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/version.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/xmalloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/hostapd/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/accounting.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/accounting.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ap_list.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ap_list.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/beacon.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/beacon.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/build_config.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config_types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ctrl_iface.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defconfig#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/des.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_wired.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_aka.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_defs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_gpsk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_gpsk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_i.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_identity.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_md5.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_methods.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_methods.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_peap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sake.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sake_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sake_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_db.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_db.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls_common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_version.patch#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop_win.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hlr_auc_gw.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostap_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.conf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.eap_user#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.vlan#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hw_features.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hw_features.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/iapp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/iapp.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11_auth.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11_auth.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11h.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11h.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/includes.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/l2_packet.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/l2_packet_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md4.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/milenage.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/milenage.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/mlme.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/mlme.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/os.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/os_internal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/os_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/os_unix.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/pmksa_cache.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/preauth.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/preauth.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/reconfig.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha256.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha256.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/state_machine.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_none.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_openssl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/version.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/vlan_init.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/vlan_init.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wme.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wme.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/NEWS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/command.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/forwback.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/less.man#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/less.nro#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lessecho.man#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lessecho.nro#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.man#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/lesskey.nro#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/optfunc.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/screen.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/search.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/less/version.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/netcat.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/authpf/authpf.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/authpf/authpf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/filter.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/filter.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/ftp-proxy.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/ftp-proxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/getline.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/util.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/pf/ftp-proxy/util.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/buffer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/evbuffer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/event-internal.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/event.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/event.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/evsignal.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/kqueue.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/log.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/log.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/poll.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/select.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/libevent/signal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pf.4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pf.conf.5#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pf.os.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pflog.4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/parse.y#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pf_print_state.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_altq.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_optimize.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_osfp.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_parser.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_parser.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_radix.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pfctl/pfctl_table.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pflogd.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pflogd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pidfile.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pidfile.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/privsep.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/tftp-proxy/filter.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/tftp-proxy/filter.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/tftp-proxy/tftp-proxy.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/pf/tftp-proxy/tftp-proxy.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ChangeLog#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_ssid.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defconfig#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/drivers.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_aka.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_defs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_fast.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gtc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_i.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_leap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_md5.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_mschapv2.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_otp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_peap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_testing.txt#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/l2_packet.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_none.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_openssl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/todo.txt#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/version.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_cli.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_passphrase.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant_i.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/trustedbsd/audit3/etc/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#23 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#10 integrate .. //depot/projects/trustedbsd/audit3/etc/group#6 integrate .. //depot/projects/trustedbsd/audit3/etc/inetd.conf#6 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/trustedbsd/audit3/etc/namedb/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/trustedbsd/audit3/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/trustedbsd/audit3/etc/namedb/make-localhost#3 delete .. //depot/projects/trustedbsd/audit3/etc/namedb/master/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/etc/namedb/master/empty.db#1 branch .. //depot/projects/trustedbsd/audit3/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/trustedbsd/audit3/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/trustedbsd/audit3/etc/namedb/named.conf#5 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/atrun#1 branch .. //depot/projects/trustedbsd/audit3/etc/pam.d/cron#1 branch .. //depot/projects/trustedbsd/audit3/etc/pam.d/ftpd#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/gdm#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/imap#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/kde#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/login#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/other#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/pop3#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/rsh#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/sshd#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/telnetd#2 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/xdm#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sendmail#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.resume#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.suspend#2 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#21 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libregex/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff/diff.1#3 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/trustedbsd/audit3/include/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/inet.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/histedit.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/paths.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/stdlib.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#14 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_fd.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_file.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_open_memory.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#16 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_by_name.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ustar.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_tar_empty.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libbsnmp/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/SYS.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/SYS.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/sys/sbrk.S#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/__getosreldate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/SYS.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/SYS.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Symbol.map#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_sys_calls.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sourcefilter.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/sourcefilter.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/regcomp.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/regerror.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/regexec.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/regfree.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/SYS.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fseek.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/getenv.3#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.3#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/putenv.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/setenv.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ftruncate.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/lseek.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/modstat.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/pread.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/pwrite.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_delete.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/truncate.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libedit/editline.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libedit/el.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libedit/el.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libedit/term.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libedit/term.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_accept_sec_context.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_display_status.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_export_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_indicate_mechs.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_dump_policy.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_get_policylen.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_set_policy.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/ipsec_strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/pfkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/pfkey_dump.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/policy_parse.y#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/policy_token.l#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/test-policy.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_amd64.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_i386.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_private.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_nologin/pam_nologin.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/login_cap.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/login_cap.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/e_log.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/atrun/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/atrun/atrun.c#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/atrun/atrun.man#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftp-proxy/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/libexec/pppoed/pppoed.c#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Symbol.map#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/tftp-proxy/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/misc/dev.archlist.txt#14 integrate .. //depot/projects/trustedbsd/audit3/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/src-install.sh#3 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/af_ipx.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#20 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifmedia.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/libipf/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#17 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/trustedbsd/audit3/sbin/mknod/mknod.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.8#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#13 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/mount_umapfs.8#4 delete .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/mount_umapfs.c#4 delete .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/trustedbsd/audit3/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/trustedbsd/audit3/sbin/pfctl/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping/ping.c#8 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping6/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping6/ping6.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/trustedbsd/audit3/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/trustedbsd/audit3/sbin/setkey/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/setkey/parse.y#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/setkey/setkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/setkey/test-policy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/setkey/token.l#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libssh/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/share/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/FAQ#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/Overview#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/contrib/hplay.c#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/contrib/isdntelmux.c#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/i4brunppp/i4brunppp.c#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/v21/v21modem.c#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#23 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#15 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ath.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/bce.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fwohci.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ieee80211.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ip.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mac.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/miibus.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/msk.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nfe.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nxge.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/pcm.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/rum.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/tty.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ucom.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uhid.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ural.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/wi.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man5/Makefile#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#15 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/src.conf.5#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/tmpfs.5#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man5/xfs.5#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man7/hier.7#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/ieee80211_ioctl.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/lock.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/locking.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/priv.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/selrecord.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/suser.9#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/taskqueue.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-ports.dot#6 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.own.mk#9 integrate .. //depot/projects/trustedbsd/audit3/share/mk/sys.mk#7 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/kdb.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/intr.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/kdb.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pte.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/openfirm.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/openfirm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/README.quirks#2 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/00READ#2 delete .. //depot/projects/trustedbsd/audit3/sys/coda/cnode.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_psdev.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_venus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_venus.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vfsops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_file.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_uid16.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#25 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#34 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#16 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#17 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#11 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#15 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#13 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sparc64#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sun4v#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#16 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#22 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.amd64#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.i386#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.pc98#9 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_cbq.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pflog.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_mtag.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_norm.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_osfp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ruleset.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adwcam.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aha/aha.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ahb/ahbreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aic_pccard.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic/aicvar.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 14 23:32:46 2007 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 2A2B216A405; Sat, 14 Jul 2007 23:32:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB9A816A402 for ; Sat, 14 Jul 2007 23:32:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA88513C461 for ; Sat, 14 Jul 2007 23:32:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6ENWjt7069930 for ; Sat, 14 Jul 2007 23:32:45 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6ENWjTe069927 for perforce@freebsd.org; Sat, 14 Jul 2007 23:32:45 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 14 Jul 2007 23:32:45 GMT Message-Id: <200707142332.l6ENWjTe069927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 123509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2007 23:32:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=123509 Change 123509 by ivoras@ivoras_finstall on 2007/07/14 23:32:02 - make UZIP image more customizable - fix file system creation & mounting to optimize for large images and speed - bunch of fixes & additions to bundled files to make the livecd more usable Images Created by the script in its current state with default knobs will bring in entire xorg-7.2 system, Xfce 4.2, firefox and thunderbird. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/bundle-spec#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/dot.xinitrc#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/font.local.conf#2 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/fstab#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/hosts#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/livecd#4 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/loader.conf#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/rc.conf#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/xorg.conf#3 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#9 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/pkglist#3 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/bundle-spec#3 (text+ko) ==== @@ -4,11 +4,19 @@ # kw : expand keywords in the (text) file # x : set execute bit to destination file # a : append to destination file +/boot/loader.conf=loader.conf;kw /etc/rc.conf=rc.conf;kw /etc/X11/xorg.conf=xorg.conf;kw /etc/rc.d/livecd=livecd;kw;x -/root/.xinitrc=dot.xinitrc;kw /etc/hosts=hosts;kw;a /etc/fstab=fstab;kw -/boot/loader.conf=loader.conf;kw +/etc/rc.d/prelogin=prelogin;kw;x +/etc/prelogin.txt=prelogin.txt +/etc/ipfw.rules=ipfw.rules +/root/.xinitrc=dot.xinitrc;kw +/root/.config/xfce4/mcs_settings/gtk.xml=gtk.xml +/install/.config/xfce4/mcs_settings/gtk.xml=gtk.xml +/install/.config/autostart/xfce4-tips-autostart.desktop=xfce4-tips-autostart.desktop +/install/.xinitrc=dot.xinitrc;kw +/install/.config/xfce4/mcs_settings/gtk.xml=gtk.xml /usr/local/etc/fonts/local.conf=font.local.conf;kw ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/dot.xinitrc#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/font.local.conf#2 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/fstab#3 (text+ko) ==== @@ -1,4 +1,5 @@ # $dest_file$ generated by finstall makeimage.py on $date$ $time$ /dev/iso9660/$label$ / cd9660 ro 0 0 +dev /dev devfs rw 0 0 #md /tmp mfs rw,-S,-s32m 0 0 #/tmp /etc unionfs rw,copymode=transparent 0 0 ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/hosts#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/livecd#4 (text+ko) ==== @@ -18,13 +18,13 @@ /bin/date -f %s $t fi -/sbin/mount_mfs -s 128m -S -m 3 -f 512 -b 4096 md /tmp +/sbin/mount_mfs -s 64m -S -m 3 -f 512 -b 4096 md /tmp /bin/mkdir /tmp/etc /tmp/var /tmp/root /tmp/install /sbin/mount_unionfs -o copymode=transparent /tmp/etc /etc /sbin/mount_unionfs -o copymode=transparent /tmp/var /var /sbin/mount_unionfs -o copymode=transparent /tmp/root /root /sbin/mount_unionfs -o copymode=transparent /tmp/install /install -/sbin/mdconfig -a -t vnode -f /usr/usr.img.uzip -u 60 -/sbin/mount -o ro /dev/md60.uzip /usr +/sbin/mdconfig -a -t vnode -f /usr/.usr.local.img.uzip -u 60 +/sbin/mount -o ro /dev/md60.uzip /usr/local ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/loader.conf#3 (text+ko) ==== @@ -1,4 +1,5 @@ # $dest_file$ generated by finstall makeimage.py on $date$ $time$ -rootdev="iso9660/$label$" -boot_cdrom="1" -ipfw_load="YES" +#rootdev="iso9660/$label$" +#boot_cdrom="1" +#ipfw_load="YES" +geom_uzip_load="YES" ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/rc.conf#3 (text+ko) ==== @@ -6,3 +6,10 @@ usbd_enable="YES" moused_enable="YES" sendmail_enable="NONE" + +firewall_enable="YES" +firewall_type="/etc/ipfw.rules" + +#hald_enable="YES" +#polkitd_enable="YES" +#dbus_enable="YES" ==== //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/xorg.conf#3 (text+ko) ==== @@ -55,7 +55,7 @@ SubSection "Display" Viewport 0 0 Depth 24 - Modes "800x600" + Modes "1024x768" EndSubSection EndSection ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#9 (text+ko) ==== @@ -72,6 +72,9 @@ PKGLISTFILE = None ISO = None STARTDIR = os.path.realpath(".") +ZIMAGE = "/usr/.usr.local.img.uzip" +ZIMAGE_IMGNAME = "usr.local.img" +ZIMAGE_TREE = "/usr/local" opts, args = getopt(sys.argv[1:], "d:s:i:p:k:bch") for o,a in opts: @@ -132,16 +135,22 @@ os.chdir(WORKDIR) if DoMakeRoot: - execute("touch usr.img") - execute("truncate -s 600m usr.img") -if not os.path.exists("%s/usr.img" % WORKDIR): - print "No usr.img" + if os.path.exists(ZIMAGE_IMGNAME): + execute("rm %s" % ZIMAGE_IMGNAME) + execute("touch %s" % ZIMAGE_IMGNAME) + execute("truncate -s 700m %s" % ZIMAGE_IMGNAME) +if not os.path.exists("%s/%s" % (WORKDIR, ZIMAGE_IMGNAME)): + print "No %s" % ZIMAGE_IMGNAME sys.exit(1) -execute("mdconfig -a -t vnode -f usr.img -u 60") -execute("newfs -m 2 /dev/md60") +execute("mdconfig -a -t vnode -f %s -u 60" % ZIMAGE_IMGNAME) +if DoMakeRoot: + execute("newfs /dev/md60") + if not os.path.exists("%s/usr" % DESTDIR): os.mkdir("%s/usr" % DESTDIR) -execute("mount /dev/md60 %s/usr" % DESTDIR) +if not os.path.exists("%s/usr/local" % DESTDIR): + os.mkdir("%s/usr/local" % DESTDIR) +execute("mount -o async /dev/md60 %s%s" % (DESTDIR, ZIMAGE_TREE)) os.chdir(STARTDIR) @@ -156,7 +165,7 @@ execute("make installworld DESTDIR=%s" % DESTDIR) execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) execute("make distribution DESTDIR=%s" % DESTDIR) -# execute("rm %s/boot/kernel/*.symbols" % DESTDIR) + execute("rm %s/boot/kernel/*.symbols" % DESTDIR) os.chdir(DESTDIR) execute("mtree -c > livecd.mtree") os.chdir(STARTDIR) @@ -222,7 +231,8 @@ if os.path.exists("%s/%s" % (BUNDLEDIR, BUNDLEFILE)): printmsg("Bundling config files") cflist = [] - f = file("%s/%s" % (BUNDLEDIR, BUNDLEFILE), "r") + filename = "%s/%s" % (BUNDLEDIR, BUNDLEFILE) + f = file(filename, "r") for line in f.readlines(): line = line.strip() if len(line) == 0: @@ -246,10 +256,13 @@ file_contents = file_contents.replace("$date$", str_date) file_contents = file_contents.replace("$dest_file$", dest_file) file_contents = file_contents.replace("$src_file$", src_file) + filename = "%s%s" % (DESTDIR, dest_file) + if not os.path.exists(os.path.dirname(filename)): + os.makedirs(os.path.dirname(filename)) if "a" in flags: - df = file("%s%s" % (DESTDIR, dest_file), "a") + df = file(filename, "a") else: - df = file("%s%s" % (DESTDIR, dest_file), "w") + df = file(filename, "w") df.write(file_contents) df.close() if "x" in flags: @@ -278,18 +291,19 @@ f.close() execute("chroot %s /bin/sh /tmp/userinst.sh" % DESTDIR) os.unlink("%s/tmp/userinst.sh" % DESTDIR) -skel_cshrc = file("%s/usr/share/skel/dot.cshrc" % DESTDIR, "r").read() -f = file("%s/install/.cshrc" % DESTDIR, "w") -f.write(skel_cshrc) + +skel_data = file("%s/usr/share/skel/dot.login" % DESTDIR, "r").read() +f = file("%s/install/.login" % DESTDIR, "w") +f.write(skel_data) f.write("startx\n") f.close() # finish usr image os.chdir(WORKDIR) -execute("umount %s/usr" % DESTDIR) +execute("umount %s%s" % (DESTDIR, ZIMAGE_TREE)) execute("mdconfig -d -u 60") -execute("mkuzip -v -o %s/usr/usr.img.uzip -s 16384 usr.img" % DESTDIR) +execute("mkuzip -o %s%s -s 16384 %s" % (DESTDIR, ZIMAGE, ZIMAGE_IMGNAME)) os.chdir(WORKDIR) if ISO == None: ==== //depot/projects/soc2007/ivoras_finstall/makeimage/pkglist#3 (text+ko) ==== @@ -1,14 +1,10 @@ -#vim-gtk2 +# Package list +xorg-7.2 +xfce-4 +vim-gtk2 py24-gtk -xorg-server -xf86-input-keyboard -xf86-input-mouse -xkeyboard-config -xf86-video-vesa -xf86-video-fbdev -xf86-video-vga -xorg-fonts-7.2 -xkbcomp -xinit -#gnome-icons-slick -xfce-4 +firefox +thunderbird +strace +unixbench +bonnie++