From owner-p4-projects@FreeBSD.ORG Sun Jul 15 00:51: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 936DC16A406; Sun, 15 Jul 2007 00:51: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 5FCBA16A404 for ; Sun, 15 Jul 2007 00:51:24 +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 50D0113C491 for ; Sun, 15 Jul 2007 00:51:24 +0000 (UTC) (envelope-from gcooper@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 l6F0pOeG084913 for ; Sun, 15 Jul 2007 00:51:24 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F0pOrl084910 for perforce@freebsd.org; Sun, 15 Jul 2007 00:51:24 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 00:51:24 GMT Message-Id: <200707150051.l6F0pOrl084910@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 123511 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, 15 Jul 2007 00:51:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123511 Change 123511 by gcooper@optimus-revised_pkgtools on 2007/07/15 00:50:56 Much faster way to read a packing list. Inspired by Tim Kientzle (kientzle). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#7 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#7 (text+ko) ==== @@ -309,7 +309,7 @@ } ++cp, ++sp; } - printf("COMMAND STRING: %s\nCMD: %s\nCP: %s\nSP: %s\n", s, cmd, cp, sp); + printf("COMMAND STRING: %s\nCMD"/*: %s\nCP: %s\nSP: %s\n"*/, s/*, cmd, cp, sp*/); if(!*(cmd+1)) return FAIL; @@ -422,8 +422,6 @@ int cmd; - unsigned int i = 0; - pkg->fmtver_maj = 1; pkg->fmtver_mnr = 2; pkg->origin = NULL; @@ -434,18 +432,12 @@ /* Empty file -- don't attempt to process */ assert(contents_stat.st_size != 0); - plines = (char*) malloc(contents_stat.st_size); + plines = (char*) malloc(contents_stat.st_size+1); - 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(0 != i); + assert(contents_stat.st_size == read(fileno(fp), plines, contents_stat.st_size+1)); /* Just in case file doesn't have EOF */ - *(plines+i) = '\0'; + *(plines+contents_stat.st_size) = '\0'; pline = strtok(plines, "\n"); From owner-p4-projects@FreeBSD.ORG Sun Jul 15 01:51: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 A2B0516A406; Sun, 15 Jul 2007 01:51: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 57DF416A400 for ; Sun, 15 Jul 2007 01:51: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 484AA13C442 for ; Sun, 15 Jul 2007 01:51:39 +0000 (UTC) (envelope-from gcooper@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 l6F1pcQP091534 for ; Sun, 15 Jul 2007 01:51:39 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F1pcV5091531 for perforce@freebsd.org; Sun, 15 Jul 2007 01:51:38 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 01:51:38 GMT Message-Id: <200707150151.l6F1pcV5091531@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 123512 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, 15 Jul 2007 01:51:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=123512 Change 123512 by gcooper@optimus-revised_pkgtools on 2007/07/15 01:51:18 prof_process: Better assumption for determining package name from filename. run_prof.sh: Get rid of echo at the bottom of script and make it into a command again. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#5 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#3 (text+ko) ==== @@ -6,8 +6,11 @@ } $package = $ARGV[1]; +$package = $1 if $package =~ /(.+)-.+/; $logdir = "$ARGV[2]/$package"; +system("mkdir $logdir"); + foreach my $iteration (1..$ARGV[0]) { my ( %hash, %count_hash ); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#5 (text+ko) ==== @@ -25,4 +25,4 @@ $SCRIPT_DIR/prof_process.pl $ITERATIONS ${i}* $LOG_DIR done -echo $SCRIPT_DIR/prof_postprocess.pl $LOG_DIR +$SCRIPT_DIR/prof_postprocess.pl $LOG_DIR From owner-p4-projects@FreeBSD.ORG Sun Jul 15 03: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 E9D0916A40B; Sun, 15 Jul 2007 03:02: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 8EFD316A400 for ; Sun, 15 Jul 2007 03:02:17 +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 791C213C428 for ; Sun, 15 Jul 2007 03:02:17 +0000 (UTC) (envelope-from sephe@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 l6F32HKW097812 for ; Sun, 15 Jul 2007 03:02:17 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F328JZ097807 for perforce@freebsd.org; Sun, 15 Jul 2007 03:02:08 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 15 Jul 2007 03:02:08 GMT Message-Id: <200707150302.l6F328JZ097807@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 123515 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, 15 Jul 2007 03:02:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=123515 Change 123515 by sephe@sephe_enigma:sam_wifi on 2007/07/15 03:01:13 IFC @123506 Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#21 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/COPYING#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/Makefile#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/README#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/base64.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/base64.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/common.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/common.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config_file.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config_ssid.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config_types.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/crypto_gnutls.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/defconfig#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/defs.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/code_structure.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.fast#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.full#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/eap.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/mainpage.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/porting.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/doc/testing_tools.doxygen#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_hostap.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.c#6 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_ndis.h#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/driver_wired.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/drivers.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_aka.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_defs.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_fast.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gtc.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_i.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_leap.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_md5.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_mschapv2.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_otp.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_pax_common.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_peap.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk_common.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_testing.txt#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_test.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/events.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/hostapd.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/l2_packet.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/md5.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/md5.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/preauth.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/preauth_test.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_gnutls.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_none.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_openssl.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_schannel.c#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/todo.txt#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/version.h#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_cli.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.c#5 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_gui/wpamsg.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_i.h#3 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_passphrase.c#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#6 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.conf#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.h#4 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate .. //depot/projects/wifi/etc/Makefile#15 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#20 integrate .. //depot/projects/wifi/etc/mtree/BSD.usr.dist#8 integrate .. //depot/projects/wifi/include/Makefile#27 integrate .. //depot/projects/wifi/lib/Makefile#16 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#28 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#20 integrate .. //depot/projects/wifi/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/wifi/lib/libarchive/test/main.c#6 integrate .. //depot/projects/wifi/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test.h#5 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_tar_filenames.c#6 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#9 integrate .. //depot/projects/wifi/lib/libc/sys/ioctl.2#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/Symbol.map#4 integrate .. //depot/projects/wifi/libexec/rtld-elf/sparc64/reloc.c#6 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#19 integrate .. //depot/projects/wifi/sbin/atm/Makefile#2 integrate .. //depot/projects/wifi/share/examples/Makefile#8 integrate .. //depot/projects/wifi/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/wifi/share/man/man4/wi.4#12 integrate .. //depot/projects/wifi/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/wifi/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/wifi/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch .. //depot/projects/wifi/share/zoneinfo/leapseconds#8 integrate .. //depot/projects/wifi/sys/Makefile#11 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/wifi/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/wifi/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/wifi/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/wifi/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/wifi/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/wifi/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/wifi/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/wifi/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/wifi/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/wifi/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/wifi/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/wifi/sys/coda/00READ#2 delete .. //depot/projects/wifi/sys/coda/README#2 delete .. //depot/projects/wifi/sys/coda/TODO#2 delete .. //depot/projects/wifi/sys/coda/cnode.h#5 delete .. //depot/projects/wifi/sys/coda/coda.h#4 delete .. //depot/projects/wifi/sys/coda/coda_fbsd.c#7 delete .. //depot/projects/wifi/sys/coda/coda_io.h#3 delete .. //depot/projects/wifi/sys/coda/coda_kernel.h#3 delete .. //depot/projects/wifi/sys/coda/coda_namecache.c#3 delete .. //depot/projects/wifi/sys/coda/coda_namecache.h#3 delete .. //depot/projects/wifi/sys/coda/coda_opstats.h#3 delete .. //depot/projects/wifi/sys/coda/coda_pioctl.h#3 delete .. //depot/projects/wifi/sys/coda/coda_psdev.c#5 delete .. //depot/projects/wifi/sys/coda/coda_psdev.h#3 delete .. //depot/projects/wifi/sys/coda/coda_subr.c#4 delete .. //depot/projects/wifi/sys/coda/coda_subr.h#3 delete .. //depot/projects/wifi/sys/coda/coda_venus.c#4 delete .. //depot/projects/wifi/sys/coda/coda_venus.h#3 delete .. //depot/projects/wifi/sys/coda/coda_vfsops.c#8 delete .. //depot/projects/wifi/sys/coda/coda_vfsops.h#5 delete .. //depot/projects/wifi/sys/coda/coda_vnops.c#17 delete .. //depot/projects/wifi/sys/coda/coda_vnops.h#7 delete .. //depot/projects/wifi/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/wifi/sys/conf/NOTES#46 integrate .. //depot/projects/wifi/sys/conf/files#59 integrate .. //depot/projects/wifi/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#24 integrate .. //depot/projects/wifi/sys/conf/options#39 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/wifi/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#16 integrate .. //depot/projects/wifi/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#31 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#13 integrate .. //depot/projects/wifi/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/wifi/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/wifi/sys/dev/mxge/eth_z8e.dat.gz.uu#6 integrate .. //depot/projects/wifi/sys/dev/mxge/ethp_z8e.dat.gz.uu#6 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/wifi/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/wifi/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#15 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#17 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/wifi/sys/dev/wi/if_wavelan_ieee.h#4 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#39 integrate .. //depot/projects/wifi/sys/fs/coda/README#1 branch .. //depot/projects/wifi/sys/fs/coda/TODO#1 branch .. //depot/projects/wifi/sys/fs/coda/cnode.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/wifi/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/wifi/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#20 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfsmount.h#5 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/wifi/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/wifi/sys/kern/kern_event.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#26 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#18 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/wifi/sys/modules/Makefile#42 integrate .. //depot/projects/wifi/sys/modules/coda/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/netgraph/atm/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#24 integrate .. //depot/projects/wifi/sys/netatm/atm_proto.c#6 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/wifi/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/wifi/sys/netinet/sctp_constants.h#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#19 integrate .. //depot/projects/wifi/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#19 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#16 integrate .. //depot/projects/wifi/sys/pc98/cbus/sio.c#8 integrate .. //depot/projects/wifi/sys/pci/agp.c#6 integrate .. //depot/projects/wifi/sys/pci/agp_i810.c#7 integrate .. //depot/projects/wifi/sys/pci/agppriv.h#2 integrate .. //depot/projects/wifi/sys/pci/agpreg.h#5 integrate .. //depot/projects/wifi/sys/sys/lock_profile.h#5 integrate .. //depot/projects/wifi/sys/sys/sysent.h#8 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#20 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#24 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#11 integrate .. //depot/projects/wifi/sys/vm/vm_phys.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_phys.h#2 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#15 integrate .. //depot/projects/wifi/tools/kerneldoc/subsys/Makefile#3 integrate .. //depot/projects/wifi/tools/tools/mfc/mfc.pl#3 integrate .. //depot/projects/wifi/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/wifi/usr.bin/kdump/mkioctls#3 integrate .. //depot/projects/wifi/usr.sbin/Makefile#24 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.c#6 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_cli/Makefile#4 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_passphrase/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#7 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#21 (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/wifi/contrib/wpa_supplicant/COPYING#3 (text+ko) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#5 (text+ko) ==== @@ -1,5 +1,16 @@ ChangeLog for wpa_supplicant +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 ==== //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#5 (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,6 +8,7 @@ driver_ipw.c driver_madwifi.c driver_ndiswrapper.c +driver_ndis_.c driver_prism54.c driver_test.c driver_wext.c @@ -21,12 +22,12 @@ main_none.c main_winmain.c main_winsvc.c +ndis_events.c ndis_events.cpp -os_internal.c -os_none.c +nmake.mk os_win32.c priv_netlink.h vs2005 +win_example.reg win_if_list.c -win_example.reg wireless_copy.h ==== //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-upgrade#3 (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/wifi/contrib/wpa_supplicant/Makefile#4 (text+ko) ==== @@ -9,9 +9,9 @@ # Include directories for CVS version CFLAGS += -I. -I../utils -I../hostapd -ALL=wpa_supplicant wpa_passphrase wpa_cli dynamic_eap_methods +ALL=wpa_supplicant wpa_passphrase wpa_cli -all: verify_config $(ALL) +all: verify_config $(ALL) dynamic_eap_methods verify_config: @if [ ! -r .config ]; then \ ==== //depot/projects/wifi/contrib/wpa_supplicant/README#5 (text+ko) ==== @@ -1,8 +1,7 @@ WPA Supplicant ============== -Copyright (c) 2003-2006, Jouni Malinen and -contributors +Copyright (c) 2003-2007, Jouni Malinen and contributors All Rights Reserved. This program is dual-licensed under both the GPL version 2 and BSD @@ -222,12 +221,18 @@ Optional libraries for EAP-TLS, EAP-PEAP, and EAP-TTLS: -- openssl (tested with 0.9.7c and 0.9.7d, assumed to work with most - relatively recent versions; this is likely to be available with most - distributions, http://www.openssl.org/) +- OpenSSL (tested with 0.9.7c and 0.9.7d, and 0.9.8 versions; assumed to + work with most relatively recent versions; this is likely to be + available with most distributions, http://www.openssl.org/) - GnuTLS - internal TLSv1 implementation +TLS options for EAP-FAST: +- OpenSSL 0.9.8d _with_ openssl-0.9.8d-tls-extensions.patch applied + (i.e., the default OpenSSL package does not include support for + extensions needed for EAP-FAST) +- internal TLSv1 implementation + One of these libraries is needed when EAP-TLS, EAP-PEAP, EAP-TTLS, or EAP-FAST support is enabled. WPA-PSK mode does not require this or EAPOL/EAP implementation. A configuration file, .config, for compilation is ==== //depot/projects/wifi/contrib/wpa_supplicant/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/wpa_supplicant/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/wpa_supplicant/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/wpa_supplicant/base64.c#3 (text) ==== @@ -1,6 +1,6 @@ /* * Base64 encoding/decoding (RFC1341) - * Copyright (c) 2005, Jouni Malinen + * Copyright (c) 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/wpa_supplicant/base64.h#3 (text) ==== @@ -1,6 +1,6 @@ /* * Base64 encoding/decoding (RFC1341) - * Copyright (c) 2005, Jouni Malinen + * Copyright (c) 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/wpa_supplicant/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]; - cp = strchr(optstring, optopt); + cp = os_strchr(optstring, optopt); if (cp == NULL || optopt == ':') { if (argv[optind][++optchr] == '\0') { optchr = 1; ==== //depot/projects/wifi/contrib/wpa_supplicant/common.h#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 @@ -10,6 +10,8 @@ * license. * * See README and COPYING for more details. + * + * $FreeBSD: src/contrib/wpa_supplicant/common.h,v 1.4 2007/07/11 15:58:51 sam Exp $ */ #ifndef COMMON_H @@ -264,8 +266,8 @@ #define wpa_hexdump_key(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii(l,t,b,le) do { } while (0) #define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0) -#define wpa_debug_open_file(void) do { } while (0) -#define wpa_debug_close_file(void) do { } while (0) +#define wpa_debug_open_file() do { } while (0) +#define wpa_debug_close_file() do { } while (0) #else /* CONFIG_NO_STDOUT_DEBUG */ ==== //depot/projects/wifi/contrib/wpa_supplicant/config.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / Configuration parser and common functions - * Copyright (c) 2003-2006, Jouni Malinen + * Copyright (c) 2003-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 @@ -1156,7 +1156,8 @@ #ifdef CONFIG_IEEE80211W { INT_RANGE(ieee80211w, 0, 2) }, #endif /* CONFIG_IEEE80211W */ - { INT_RANGE(peerkey, 0, 1) } + { INT_RANGE(peerkey, 0, 1) }, + { INT_RANGE(mixed_cell, 0, 1) } }; #undef OFFSET ==== //depot/projects/wifi/contrib/wpa_supplicant/config.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / Configuration file structures - * 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/wpa_supplicant/config_file.c#3 (text) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / Configuration backend: text file - * Copyright (c) 2003-2006, Jouni Malinen + * Copyright (c) 2003-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 ==== //depot/projects/wifi/contrib/wpa_supplicant/config_ssid.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / Network configuration structures - * Copyright (c) 2003-2006, Jouni Malinen + * Copyright (c) 2003-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 @@ -624,6 +624,16 @@ */ int proactive_key_caching; + /** + * mixed_cell - Whether mixed cells are allowed + * + * This option can be used to configure whether so called mixed cells, + * i.e., networks that use both plaintext and encryption in the same + * SSID, are allowed. This is disabled (0) by default. Enable by + * setting this to 1. + */ + int mixed_cell; + #ifdef IEEE8021X_EAPOL /** ==== //depot/projects/wifi/contrib/wpa_supplicant/config_types.h#3 (text) ==== @@ -1,6 +1,6 @@ /* * hostapd / Shared configuration file defines - * 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/wpa_supplicant/crypto.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / wrapper functions for libcrypto - * Copyright (c) 2004-2005, Jouni Malinen + * Copyright (c) 2004-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/wpa_supplicant/crypto.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / wrapper functions for crypto libraries - * Copyright (c) 2004-2005, Jouni Malinen + * Copyright (c) 2004-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/wpa_supplicant/crypto_gnutls.c#3 (text) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / wrapper functions for libgcrypt - * Copyright (c) 2004-2005, Jouni Malinen + * Copyright (c) 2004-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/wpa_supplicant/ctrl_iface.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / Control interface (shared code for all backends) - * Copyright (c) 2004-2006, Jouni Malinen + * Copyright (c) 2004-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 ==== //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant / UNIX domain socket -based control interface - * Copyright (c) 2004-2005, Jouni Malinen + * Copyright (c) 2004-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/wpa_supplicant/defconfig#4 (text+ko) ==== @@ -122,6 +122,13 @@ # EAP-TTLS CONFIG_EAP_TTLS=y +# EAP-FAST +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + # EAP-GTC CONFIG_EAP_GTC=y @@ -308,6 +315,4 @@ # be used to set these (WIRELESS_DEV must point to the root directory of the # wireless-dev.git tree). #WIRELESS_DEV=/usr/src/wireless-dev -#CFLAGS += -I$(WIRELESS_DEV)/include -#CFLAGS += -I$(WIRELESS_DEV)/net/d80211 -#CFLAGS += -D_LINUX_TYPES_H +#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211 ==== //depot/projects/wifi/contrib/wpa_supplicant/defs.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * WPA Supplicant - Common definitions - * Copyright (c) 2004-2006, Jouni Malinen + * Copyright (c) 2004-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 ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/code_structure.doxygen#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 (text) ==== @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_BACKGROUND" "8" "31 December 2006" "" "" +.TH "WPA_BACKGROUND" "8" "28 May 2007" "" "" .SH NAME wpa_background \- Background information on Wi-Fi Protected Access and IEEE 802.11i @@ -76,7 +76,7 @@ .SH "LEGAL" .PP wpa_supplicant is copyright (c) 2003-2005, -Jouni Malinen and +Jouni Malinen and contributors. All Rights Reserved. .PP ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#3 (text) ==== @@ -91,7 +91,7 @@ Legal wpa_supplicant is copyright (c) 2003-2005, - Jouni Malinen jkmaline@cc.hut.fi and + Jouni Malinen j@w1.fi and contributors. All Rights Reserved. ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 (text) ==== @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_CLI" "8" "31 December 2006" "" "" +.TH "WPA_CLI" "8" "28 May 2007" "" "" .SH NAME wpa_cli \- WPA command line client @@ -201,7 +201,7 @@ .SH "LEGAL" .PP wpa_supplicant is copyright (c) 2003-2005, -Jouni Malinen and +Jouni Malinen and contributors. All Rights Reserved. .PP ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 (text) ==== @@ -328,7 +328,7 @@ Legal wpa_supplicant is copyright (c) 2003-2005, - Jouni Malinen jkmaline@cc.hut.fi and + Jouni Malinen j@w1.fi and contributors. All Rights Reserved. ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 (text) ==== @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_PASSPHRASE" "8" "31 December 2006" "" "" +.TH "WPA_PASSPHRASE" "8" "28 May 2007" "" "" .SH NAME wpa_passphrase \- Generate a WPA PSK from an ASCII passphrase for a SSID @@ -32,7 +32,7 @@ .SH "LEGAL" .PP wpa_supplicant is copyright (c) 2003-2005, -Jouni Malinen and +Jouni Malinen and contributors. All Rights Reserved. .PP ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#3 (text) ==== @@ -63,7 +63,7 @@ Legal wpa_supplicant is copyright (c) 2003-2005, - Jouni Malinen jkmaline@cc.hut.fi and + Jouni Malinen j@w1.fi and contributors. All Rights Reserved. ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 (text) ==== @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_SUPPLICANT" "8" "31 December 2006" "" "" +.TH "WPA_SUPPLICANT" "8" "28 May 2007" "" "" .SH NAME wpa_supplicant \- Wi-Fi Protected Access client and IEEE 802.1X supplicant @@ -545,7 +545,7 @@ .SH "LEGAL" .PP wpa_supplicant is copyright (c) 2003-2005, -Jouni Malinen and +Jouni Malinen and contributors. All Rights Reserved. .PP ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 (text) ==== @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_SUPPLICANT.CONF" "5" "31 December 2006" "" "" +.TH "WPA_SUPPLICANT.CONF" "5" "28 May 2007" "" "" .SH NAME wpa_supplicant.conf \- configuration file for wpa_supplicant ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 (text) ==== @@ -773,7 +773,7 @@ Legal wpa_supplicant is copyright (c) 2003-2005, - Jouni Malinen jkmaline@cc.hut.fi and + Jouni Malinen j@w1.fi and contributors. All Rights Reserved. ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.fast#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/doxygen.full#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/eap.doxygen#3 (text) ==== ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#3 (xtext) ==== @@ -20,7 +20,7 @@ # ########################################################################## # Copyright (C) 2003 Jonathan Foster -# Copyright (C) 2005 Jouni Malinen +# Copyright (C) 2005 Jouni Malinen # (modified for kerneldoc format used in wpa_supplicant) # # This program is free software; you can redistribute it and/or modify ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/mainpage.doxygen#3 (text) ==== @@ -13,7 +13,7 @@ %wpa_supplicant has been implemented, how it can be modified, how new drivers can be supported, and how %wpa_supplicant can be ported to other operating systems. If any information is missing, feel free to -contact Jouni Malinen for more +contact Jouni Malinen for more information. Contributions as patch files are also very welcome at the same address. Please note that %wpa_supplicant is licensed under dual license, GPLv2 or BSD at user's choice. All contributions to ==== //depot/projects/wifi/contrib/wpa_supplicant/doc/porting.doxygen#3 (text) ==== @@ -5,8 +5,9 @@ hardware (board, CPU) and software (OS, drivers) targets. It is already used with number of operating systems and numerous wireless card models and drivers. The main %wpa_supplicant repository includes -support for Linux, FreeBSD, and Windows. In addition, at least VxWorks -and PalmOS are supported in separate repositories. On the hardware +support for Linux, FreeBSD, and Windows. In addition, at least VxWorks, +PalmOS, Windows CE, and Windows Mobile are supported in separate +repositories. On the hardware side, %wpa_supplicant is used on various systems: desktops, laptops, PDAs, and embedded devices with CPUs including x86, PowerPC, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 15 03:24:47 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 A1BEA16A402; Sun, 15 Jul 2007 03:24: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 6514E16A400 for ; Sun, 15 Jul 2007 03:24:46 +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 3D13613C478 for ; Sun, 15 Jul 2007 03:24:46 +0000 (UTC) (envelope-from sephe@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 l6F3Ok18000460 for ; Sun, 15 Jul 2007 03:24:46 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F3Okxl000457 for perforce@freebsd.org; Sun, 15 Jul 2007 03:24:46 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 15 Jul 2007 03:24:46 GMT Message-Id: <200707150324.l6F3Okxl000457@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 123517 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, 15 Jul 2007 03:24:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=123517 Change 123517 by sephe@sephe_enigma:sam_wifi on 2007/07/15 03:23:44 Per ieee80211com sysctl ctx leakage on detach. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#29 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#29 (text+ko) ==== @@ -136,6 +136,7 @@ if (ic->ic_sysctl != NULL) { sysctl_ctx_free(ic->ic_sysctl); + FREE(ic->ic_sysctl, M_DEVBUF); ic->ic_sysctl = NULL; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 15 04:45: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 990A716A409; Sun, 15 Jul 2007 04:45: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 2BFED16A401 for ; Sun, 15 Jul 2007 04:45:25 +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 1B91813C47E for ; Sun, 15 Jul 2007 04:45:25 +0000 (UTC) (envelope-from gcooper@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 l6F4jOiC009073 for ; Sun, 15 Jul 2007 04:45:24 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F4jORQ009070 for perforce@freebsd.org; Sun, 15 Jul 2007 04:45:24 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 04:45:24 GMT Message-Id: <200707150445.l6F4jORQ009070@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 123518 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, 15 Jul 2007 04:45:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=123518 Change 123518 by gcooper@optimus-revised_pkgtools on 2007/07/15 04:45:24 Summary: Performance (?) and functionality improvements on simple profiling scripts. run_prof -- Create timestamp instead of depending on other scripts to do so. prof_postprocess -- -Improve error checking. -Get rid of use Data::Dumper. -Rename $hash to $time_hash for clarity. -Improve csv header titles. -Get rid of directory timestamp. prof_process -- -Improve package name detecting regex. -Use iteration number for log and csv file basename instead of initial file creation timestamp. -Improve csv header titles. -Use just stderr for reaping data instead of stdout + stderr. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#6 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/usr/local/bin/perl -w use FileHandle; -use Data::Dumper; if($#ARGV) { print "$0 [root_dir]\n"; @@ -10,16 +9,18 @@ $root_dir = $ARGV[0]; +# Prefetch all directory names that need to be parsed over @dirs = `ls $root_dir`; -$date_stamp = `/bin/date +'%F_%H.%M.%S'`; +$summaries_dir = "$root_dir/summaries"; -chomp $date_stamp; +if(-e $summaries_dir) { + print "Summary directory, $summaries_dir , already exists. Exiting..\n"; + exit -1; +} else { + system("mkdir -p $summaries_dir") || die "Couldn't create $summaries_dir\n"; +} -$summaries_dir = "$root_dir/summaries.$date_stamp"; - -system("mkdir -p $summaries_dir"); - for(my $i=0; $i <= $#dirs; $i++) { next if($dirs[$i] =~ /summaries\..+/); @@ -93,10 +94,6 @@ my @keys = sort(keys(%{shift()})); -# print Dumper(@_), "\n"; - -# print ( map "$_\n", @keys ); - foreach my $key (@keys) { for(my $i=0; $i <= $#{$header_fields_ref}; $i++) { @@ -151,7 +148,7 @@ my $summary_fh = new FileHandle(">$summary_filename") || die "Filehandle couldn't be created for $summary_filename\n"; # Print out header.. - print $summary_fh join( ",", "Name", map ( "Median for $_,Standard deviation for $_,Minimum for $_,Maximum for $_" , @{$header_fields_ref} ) ) . "\n"; + print $summary_fh join( ",", "Name", map ( "$_ -- Mean,$_ -- Stdev,$_ -- Min,$_-- Max", @{$header_fields_ref} ) ) . "\n"; # Have to loop through once again to normalize the standard deviation to the number of elements, and print out the CSV formatted fields. foreach my $key (@keys) { @@ -171,6 +168,4 @@ print "Statistics summary printed to $summary_filename\n"; -# print Dumper(%stdev_hash), "\n", Dumper(%mean_hash), "\n"; - } ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#4 (text+ko) ==== @@ -5,19 +5,26 @@ exit 1; } -$package = $ARGV[1]; -$package = $1 if $package =~ /(.+)-.+/; +if($ARGV[1] =~ /(.+)-.+/) { + $package = $1; +} else { + die "Package name format not understood. Is this actually derived from a package file?\n"; +} + $logdir = "$ARGV[2]/$package"; -system("mkdir $logdir"); +system "mkdir $logdir" || die "Can't create $logdir\n"; + +# Automatically pre-prime test machine by throwing out iteration 0 (most likely an outlying value -- package info not cached in vmem yet most likely..) +system "pkg_add -f ${package}*.tbz"; foreach my $iteration (1..$ARGV[0]) { my ( %hash, %count_hash ); - chomp ( $logfile_base = "$logdir/".`date +'%F-%H.%M.%S'` ); + $logfile_base = "$logdir/$iteration"; - system "/usr/bin/time -alh -o $logfile_base.log pkg_add -f ${package}*.tbz >> $logfile_base.log 2>> $logfile_base.log\n"; + system "/usr/bin/time -alh -o $logfile_base.log pkg_add -f ${package}*.tbz 2> $logfile_base.log"; open IN_FH, "<$logfile_base.log" || die "Can't open log filehandle\n"; @@ -31,22 +38,22 @@ if($_ =~ /^\((\w+)\).+: ([\d\.]+)/) { - unless(exists($hash{$1})) { - $count_hash{$1} = 1; - $hash{$1} = 0 + $2; - } else { - $count_hash{$1}++; - $hash{$1} += $2; + unless(exists($time_hash{$1})) { + $count_hash{$1} = 0; + $time_hash{$1} = 0; } + $count_hash{$1}++; + $time_hash{$1} += $2; + } } - print OUT_FH "Function,number of iterations,time spent (secs)\n"; + print OUT_FH "Function,iterations,time spent (secs)\n"; foreach(sort(keys(%hash))) { - printf OUT_FH "%s,%d,%4.20lf\n", $_, $count_hash{$_}, $hash{$_}; + printf OUT_FH "%s,%d,%4.20lf\n", $_, $count_hash{$_}, $time_hash{$_}; } close OUT_FH; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#6 (text+ko) ==== @@ -7,12 +7,13 @@ fi ITERATIONS=500 -LOG_DIR="/store/motonoad0/new_profile_logs" +LOG_DIR="/store/motonoad0/profile_logs/" +LOG_DIR_STAMPED="$LOG_DIR/"`date +'%F_%H.%M.%S'` PACKAGE_DIR="/usr/ports/packages/All" SCRIPT_DIR=`realpath $0 | perl -e '$pwd=$ENV{PWD}; print "$1/\n" if =~ /(.+)\/[^\/]+$/;'` -[ ! -d "$LOG_DIR" ] && mkdir -p $LOG_DIR +[ ! -d "$LOG_DIR_STAMPED" ] && mkdir -p $LOG_DIR_STAMPED if [ ! -d "$PACKAGE_DIR" ] ; then echo "ERROR: $PACKAGE_DIR doesn't exist; exiting.." @@ -22,7 +23,7 @@ cd $PACKAGE_DIR for i in $pkgs; do - $SCRIPT_DIR/prof_process.pl $ITERATIONS ${i}* $LOG_DIR + $SCRIPT_DIR/prof_process.pl $ITERATIONS ${i}* $LOG_DIR_STAMPED done -$SCRIPT_DIR/prof_postprocess.pl $LOG_DIR +$SCRIPT_DIR/prof_postprocess.pl $LOG_DIR_STAMPED From owner-p4-projects@FreeBSD.ORG Sun Jul 15 06:03:02 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 50EB416A405; Sun, 15 Jul 2007 06:03: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 D832D16A400 for ; Sun, 15 Jul 2007 06:03:01 +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 C70F313C478 for ; Sun, 15 Jul 2007 06:03:01 +0000 (UTC) (envelope-from gcooper@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 l6F631RZ023828 for ; Sun, 15 Jul 2007 06:03:01 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F631Rj023709 for perforce@freebsd.org; Sun, 15 Jul 2007 06:03:01 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 06:03:01 GMT Message-Id: <200707150603.l6F631Rj023709@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 123519 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, 15 Jul 2007 06:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=123519 Change 123519 by gcooper@optimus-revised_pkgtools on 2007/07/15 06:02:26 2 big changes: -Moved file read-in algoritm from add_plist(..) to lib/file.c (seems that there was already a subroutine that did what I was trying to accomplish sooner after I looked a bit closer.. heh). -Took the rest of kientzle's suggestion for converting if(str[0] == '{char}' methodology and stuffed it into switch/case statements. It does look nicer and the logic works. Added a nice comment to the head of the long statement block discussing choice-making in creating block and for ordering in block. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#8 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#8 (text+ko) ==== @@ -28,8 +28,6 @@ #include #include -#define BUFFER_TRY 1 - int run_generic_plist_prof(char *fn_name, ...) { @@ -109,7 +107,7 @@ 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 ) ); + fprintf(stderr, "(%s) Difference: %3.20lf secs\n", fn_name, (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); return ret_code; @@ -300,6 +298,7 @@ str_lowercase(cmd); cp = cmd; sp = s; + while (*cp) { if (isspace(*cp)) { *cp = '\0'; @@ -309,98 +308,136 @@ } ++cp, ++sp; } - printf("COMMAND STRING: %s\nCMD"/*: %s\nCP: %s\nSP: %s\n"*/, s/*, cmd, cp, sp*/); - if(!*(cmd+1)) + /** All commands should be greater than 1 char long **/ + if(*cmd == '\0' || *(cmd+1) == '\0') return FAIL; if (arg) *arg = (char *)sp; - if(*cmd == 'c') { + /** + * In order to avoid the a large sheer number of + * loops produced by plist_cmd running strcmp, + * let's prod the first char with a switch statement + * to reduce the search radices later on down the line. + * + * This is justified because this command is called + * somewhere in the thousands range for iterations while + * installing some packages. + * + * First characters and subsequent command directives + * are arranged in descending order of likelihood for + * being present in +CONTENTS and related files. + */ + switch(*cmd) { + case 'c': + /** COMMENT .. **/ + if(!strcmp(cmd, "comment")) { + /** .. with origin info. **/ + if (!strncmp(*arg, "ORIGIN:", 7)) { + *arg += 7; + return PLIST_ORIGIN; + } + /** .. with deporigin info. **/ + else if (!strncmp(*arg, "DEPORIGIN:", 10)) { + *arg += 10; + return PLIST_DEPORIGIN; + } + /** Standard comment :) **/ + return PLIST_COMMENT; - if(!strcmp(cmd+1, "wd") || *(cmd+1) == 'd') { - printf("CWD IS: %s\n", sp); + } + /** CWD / CD **/ + else if(!strcmp(cmd, "cwd") || !strcmp(cmd, "cd")) { return PLIST_CWD; } + /** CONFLICTS **/ + else if(!strcmp(cmd, "conflicts")) + return PLIST_CONFLICTS; - else if(*(cmd+1) == 'o') { + /** FALL-THROUGH **/ - 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; + case 'e': + /** EXEC **/ + if (!strcmp(cmd, "exec")) + return PLIST_CMD; + /** FALL-THROUGH **/ - } else if(!strcmp(cmd+2, "nflicts")) { - return PLIST_CONFLICTS; - } + case 'u': + /** UN(DO)EXEC **/ + if (!strcmp(cmd, "unexec")) + return PLIST_UNEXEC; + /** FALL-THROUGH **/ - } - - } - - else if (!strcmp(cmd, "exec")) - return PLIST_CMD; - else if (!strcmp(cmd, "unexec")) - return PLIST_UNEXEC; - else if(*cmd == 'i') { - - if (!strcmp(cmd+1, "gnore")) + case 'i': + /** IGNORE **/ + if (!strcmp(cmd, "ignore")) return PLIST_IGNORE; - else if(!strcmp(cmd+1, "gnore_inst")) + /** IGNORE_INST **/ + else if(!strcmp(cmd, "ignore_inst")) return PLIST_IGNORE_INST; + /** FALL-THROUGH **/ - } - - else if (*cmd == 'd') { - - if (!strcmp(cmd+1, "irrm")) + case 'd': + /** DIRRM **/ + if (!strcmp(cmd, "dirrm")) return PLIST_DIR_RM; - else if(!strcmp(cmd+1, "isplay")) + /** DISPLAY **/ + else if(!strcmp(cmd, "display")) return PLIST_DISPLAY; + /** FALL-THROUGH **/ - } - - else if (*cmd == 'n') { - - if (!strcmp(cmd+1, "oinst")) + case 'n': + /** NAME **/ + if(!strcmp(cmd, "name")) + return PLIST_NAME; + /** NOINST **/ + else if (!strcmp(cmd, "noinst")) return PLIST_NOINST; - else if(!strcmp(cmd+1, "ame")) - return PLIST_NAME; + /** FALL-THROUGH **/ - } - - else if (*cmd == 'm') { - - if(!strcmp(cmd+1, "ode")) + case 'm': + /** MODE **/ + if(!strcmp(cmd, "mode")) return PLIST_CHMOD; - else if(!strcmp(cmd+1, "tree")) + /** MTREE **/ + else if(!strcmp(cmd, "mtree")) return PLIST_MTREE; + /** FALL-THROUGH **/ - } + case 'o': + /** OWNER **/ + if(!strcmp(cmd, "owner")) + return PLIST_CHOWN; + /** OPTION **/ + else if (!strcmp(cmd, "option")) + return PLIST_OPTION; + /** FALL-THROUGH **/ - else if (*cmd == 'o') { + case 's': + /** SRCDIR **/ + if(!strcmp(cmd, "srcdir")) + return PLIST_SRC; + /** FALL-THROUGH **/ - if(!strcmp(cmd+1, "wner")) - return PLIST_CHOWN; - else if (!strcmp(cmd+1, "ption")) - return PLIST_OPTION; + case 'g': + /** GROUP **/ + if (!strcmp(cmd, "group")) + return PLIST_CHGRP; + /** FALL-THROUGH **/ - } + case 'p': + /** PKGDEP **/ + if (!strcmp(cmd, "pkgdep")) + return PLIST_PKGDEP; + /** FALL-THROUGH **/ - else if (!strcmp(cmd, "srcdir")) - return PLIST_SRC; - else if (!strcmp(cmd, "group")) - return PLIST_CHGRP; - else if (!strcmp(cmd, "pkgdep")) - return PLIST_PKGDEP; + /** Apparently the command didn't match .. oops **/ + default: + return FAIL; - return FAIL; + } } @@ -414,8 +451,6 @@ read_plist_np(Package *pkg, FILE *fp) { - struct stat contents_stat; - char *plines; char *pline; char *cp; @@ -426,19 +461,8 @@ pkg->fmtver_mnr = 2; pkg->origin = NULL; - 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*) malloc(contents_stat.st_size+1); + plines = fileGetContentsByDescriptor(fp, "+CONTENTS"); - assert(contents_stat.st_size == read(fileno(fp), plines, contents_stat.st_size+1)); - - /* Just in case file doesn't have EOF */ - *(plines+contents_stat.st_size) = '\0'; - pline = strtok(plines, "\n"); if(0 == trim_end_whitespace(pline)) @@ -714,15 +738,20 @@ if (cp != NULL) { /* Mismatch? */ if (strcmp(cp, p->next->name + 4)) { + warnx("'%s' fails original MD5 checksum - %s", tmp, Force ? "deleted anyway." : "not deleted."); if (!Force) { fail = FAIL; continue; } + } + } + } + if (Verbose) printf("Delete file %s\n", tmp); if (!Fake) { @@ -732,15 +761,23 @@ char tmp2[FILENAME_MAX]; if (make_preserve_name(tmp2, FILENAME_MAX, name, tmp)) { + if (fexists(tmp2)) { + if (rename(tmp2, tmp)) warn("preserve: unable to restore %s as %s", tmp2, tmp); + } + } + } + } + } + break; case PLIST_DIR_RM: @@ -822,9 +859,9 @@ return 1; } /* back up the pathname one component */ - if (cp2) { + if (cp2) cp1 = strdup(dir); - } + } return 0; } From owner-p4-projects@FreeBSD.ORG Sun Jul 15 06:08: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 32CC016A407; Sun, 15 Jul 2007 06:08: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 C90E016A400 for ; Sun, 15 Jul 2007 06:08:08 +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 A03C013C4A7 for ; Sun, 15 Jul 2007 06:08:08 +0000 (UTC) (envelope-from gcooper@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 l6F688tF025114 for ; Sun, 15 Jul 2007 06:08:08 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F68853025110 for perforce@freebsd.org; Sun, 15 Jul 2007 06:08:08 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 06:08:08 GMT Message-Id: <200707150608.l6F68853025110@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 123520 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, 15 Jul 2007 06:08:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=123520 Change 123520 by gcooper@optimus-revised_pkgtools on 2007/07/15 06:07:59 Converted profiling statements from printf(...) to fprintf(stderr, ...). Not doing this will stimulate what I believe is a bug in pkg_add (doubles / triples the number of iterations I've seen in adding some packages like x11-libs/atk). It may be a design choice though made by the original author given recent questions I've seen crop up on ports@. Need to talk to mentor (krion) about it. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/extract.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#9 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/extract.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ static char PenLocation[FILENAME_MAX]; static char Previous[FILENAME_MAX]; -#if SIMPLE_PROF_TRY char * run_generic_playpen_prof(char *fn_name, ...) { @@ -73,12 +72,11 @@ 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 ) ); + fprintf(stderr, "(%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) @@ -88,7 +86,6 @@ static char * find_playpen(char *pen, off_t sz) { -#if SIMPLE_PROF_TRY return run_generic_playpen_prof("find_playpen", pen, sz); } @@ -96,8 +93,6 @@ char * find_playpen_np(char *pen, off_t sz) { -#endif - char *cp; struct stat sb; @@ -150,7 +145,6 @@ char * make_playpen(char *pen, off_t sz) { -#if SIMPLE_PROF_TRY return run_generic_playpen_prof("make_playpen", pen, sz); } @@ -161,8 +155,6 @@ char * make_playpen_np(char *pen, off_t sz) { -#endif - if (!find_playpen(pen, sz)) return NULL; @@ -207,7 +199,6 @@ void leave_playpen() { -#if SIMPLE_PROF_TRY run_generic_playpen_prof("leave_playpen"); } @@ -215,8 +206,6 @@ void 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#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 15 06:14: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 14CF616A403; Sun, 15 Jul 2007 06:14: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 BB52816A400 for ; Sun, 15 Jul 2007 06:14:17 +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 AAF4313C441 for ; Sun, 15 Jul 2007 06:14:17 +0000 (UTC) (envelope-from gcooper@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 l6F6EHnJ025638 for ; Sun, 15 Jul 2007 06:14:17 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F6EH5t025631 for perforce@freebsd.org; Sun, 15 Jul 2007 06:14:17 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 06:14:17 GMT Message-Id: <200707150614.l6F6EH5t025631@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 123521 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, 15 Jul 2007 06:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=123521 Change 123521 by gcooper@optimus-revised_pkgtools on 2007/07/15 06:13:22 - Buffered file reading algorithm from plist_add(..) moved to fileGetContentsByDescriptor - fileGetContents renamed to fileGetContentsByFilename(..), possibility for security-critical race condition when stat(2)'ing file reduced by using fopen(2) and fstat(2). - isUrl(..) logic slightly redone with constants instead of hardcoded strings and string lengths. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#3 (text+ko) ==== @@ -117,19 +117,33 @@ Boolean isURL(const char *fname) { + +#define URI_SUFFIX "://" +#define FILE_PREFIX "file" URI_SUFFIX +#define FTP_PREFIX "ftp" URI_SUFFIX +#define HTTP_PREFIX "http" URI_SUFFIX +#define HTTPS_PREFIX "https" URI_SUFFIX + /* * I'm sure there are other types of URL specifications that I could * also be looking for here, but for now I'll just be happy to get ftp * and http working. */ - if (!fname) - return FALSE; - while (isspace(*fname)) - ++fname; - if (!strncmp(fname, "ftp://", 6) || !strncmp(fname, "http://", 7) || - !strncmp(fname, "https://", 8) || !strncmp(fname, "file://", 7)) - return TRUE; + if (fname) { + + /** Get rid of leading whitespace **/ + while (isspace(*fname)) + ++fname; + + if (!strncmp(fname, FTP_PREFIX, strlen(FTP_PREFIX)) || !strncmp(fname, HTTP_PREFIX, strlen(HTTP_PREFIX)) || + !strncmp(fname, HTTPS_PREFIX, strlen(HTTPS_PREFIX)) || !strncmp(fname, FILE_PREFIX, strlen(FILE_PREFIX))) { + return TRUE; + } + + } + return FALSE; + } char * @@ -177,29 +191,43 @@ } char * -fileGetContents(const char *fname) +fileGetContentsByFilename(const char *fname) { char *contents; + + FILE *fd = fopen(fname, O_RDONLY); + + if (fd != NULL) { + cleanup(0); + errx(2, "%s: unable to open '%s' for reading", __func__, fname); + } + + contents = fileGetContentsByDescriptor(fd, fname); + + fclose(fd); + + return contents; + +} + +char * +fileGetContentsByDescriptor(FILE *fd, const char* fname) +{ + char *contents; struct stat sb; - int fd; - if (stat(fname, &sb) == FAIL) { + if (fstat(fileno(fd), &sb) == FAIL) { cleanup(0); errx(2, "%s: can't stat '%s'", __func__, fname); } contents = (char *)malloc(sb.st_size + 1); - fd = open(fname, O_RDONLY, 0); - if (fd == FAIL) { - cleanup(0); - errx(2, "%s: unable to open '%s' for reading", __func__, fname); - } - if (read(fd, contents, sb.st_size) != sb.st_size) { + + if ((int) fread(contents, sb.st_size, 1, fd) == FAIL) { cleanup(0); errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, fname, (long long)sb.st_size); } - close(fd); contents[sb.st_size] = '\0'; return contents; } @@ -287,7 +315,7 @@ 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 ) ); + fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "copy_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); } @@ -315,7 +343,7 @@ 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 ) ); + fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "move_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); } From owner-p4-projects@FreeBSD.ORG Sun Jul 15 06:15: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 BF3C016A402; Sun, 15 Jul 2007 06:15: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 8550E16A400 for ; Sun, 15 Jul 2007 06:15:19 +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 5CA2713C48E for ; Sun, 15 Jul 2007 06:15:19 +0000 (UTC) (envelope-from gcooper@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 l6F6FJpo025710 for ; Sun, 15 Jul 2007 06:15:19 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F6FJjJ025707 for perforce@freebsd.org; Sun, 15 Jul 2007 06:15:19 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 06:15:19 GMT Message-Id: <200707150615.l6F6FJjJ025707@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 123522 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, 15 Jul 2007 06:15:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=123522 Change 123522 by gcooper@optimus-revised_pkgtools on 2007/07/15 06:14:16 Use fileGetContentsByFilename(..) in lib/file.c instead of fileGetContents(..). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/str.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/str.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ if (*s == '-') *str = copy_string_adds_newline(s + 1); else - *str = fileGetContents(s); + *str = fileGetContentsByFilename(s); return *str; } From owner-p4-projects@FreeBSD.ORG Sun Jul 15 06:23: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 4C0BD16A402; Sun, 15 Jul 2007 06:23: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 0AE1416A400 for ; Sun, 15 Jul 2007 06:23:30 +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 EE5B713C442 for ; Sun, 15 Jul 2007 06:23:29 +0000 (UTC) (envelope-from gcooper@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 l6F6NTdE026335 for ; Sun, 15 Jul 2007 06:23:29 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F6NT6q026332 for perforce@freebsd.org; Sun, 15 Jul 2007 06:23:29 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 06:23:29 GMT Message-Id: <200707150623.l6F6NT6q026332@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 123523 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, 15 Jul 2007 06:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123523 Change 123523 by gcooper@optimus-revised_pkgtools on 2007/07/15 06:23:14 lib/exec.c: Whitespace and make hardcoded integers into constants. lib/lib.h: -Add #include -Get rid of constants I defined for profiling and buffering. -Add function prototypes. lib/match.c: Minor logic change and move int len declaration to function header. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/exec.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/match.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/exec.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ * builds and executes command. Returns exit code. */ +/* some slop for the sh -c */ +#define SH_SLOP 32 + int vsystem(const char *fmt, ...) { @@ -36,8 +39,8 @@ char *cmd; int ret, maxargs; - maxargs = sysconf(_SC_ARG_MAX); - maxargs -= 32; /* some slop for the sh -c */ + maxargs = sysconf(_SC_ARG_MAX) - SH_SLOP; + cmd = malloc(maxargs); if (!cmd) { warnx("vsystem can't alloc arg space"); @@ -61,18 +64,19 @@ char * vpipe(const char *fmt, ...) { - FILE *fp; - char *cmd, *rp; - int maxargs; - va_list args; + FILE *fp; + char *cmd, *rp; + int maxargs; + va_list args; rp = malloc(MAXPATHLEN); if (!rp) { warnx("vpipe can't alloc buffer space"); return NULL; } - maxargs = sysconf(_SC_ARG_MAX); - maxargs -= 32; /* some slop for the sh -c */ + + maxargs = sysconf(_SC_ARG_MAX) - SH_SLOP; + cmd = alloca(maxargs); if (!cmd) { warnx("vpipe can't alloc arg space"); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#4 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -105,17 +106,6 @@ #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, @@ -171,16 +161,12 @@ 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 *); @@ -202,7 +188,8 @@ Boolean isURL(const char *); char *fileGetURL(const char *, const char *, int); char *fileFindByPath(const char *, const char *); -char *fileGetContents(const char *); +char *fileGetContentsByFilename(const char *); +char *fileGetContentsByDescriptor(FILE *, const char *); void write_file(const char *, const char *); void copy_file(const char *, const char *, const char *); void move_file(const char *, const char *, const char *); @@ -211,9 +198,7 @@ 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 *); @@ -239,18 +224,17 @@ 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 *); +void read_plist_old_np(Package *, FILE *); int plist_cmd_np(const char *, char **); int delete_package_np(Boolean, Boolean, Package *); -#endif +void read_plist_np(Package *, FILE *); +int trim_end_whitespace(char *); /* For all */ int pkg_perform(char **); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/match.c#2 (text+ko) ==== @@ -242,6 +242,7 @@ { char **installed; int i; + int len; static struct store *store = NULL; store = storecreate(store); @@ -278,17 +279,20 @@ } cmd = -1; + while (fgets(tmp, sizeof(tmp), fp)) { - int len = strlen(tmp); + + if( 0 == (len = strlen(tmp)) && *cp != CMD_CHAR ) + continue; while (len && isspace(tmp[len - 1])) tmp[--len] = '\0'; if (!len) continue; + cp = tmp; - if (tmp[0] != CMD_CHAR) - continue; - cmd = plist_cmd(tmp + 1, &cp); + + cmd = plist_cmd(tmp+1, &cp); if (cmd == PLIST_ORIGIN) { if (csh_match(origin, cp, FNM_PATHNAME) == 0) storeappend(store, installed[i]); From owner-p4-projects@FreeBSD.ORG Sun Jul 15 08:21: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 C9ACC16A403; Sun, 15 Jul 2007 08:21: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 82BE416A400 for ; Sun, 15 Jul 2007 08:21:55 +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 71F1F13C428 for ; Sun, 15 Jul 2007 08:21:55 +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 l6F8LtTr036630 for ; Sun, 15 Jul 2007 08:21:55 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F8Lslu036627 for perforce@freebsd.org; Sun, 15 Jul 2007 08:21:54 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 15 Jul 2007 08:21:54 GMT Message-Id: <200707150821.l6F8Lslu036627@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 123525 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, 15 Jul 2007 08:21:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123525 Change 123525 by taleks@taleks_th on 2007/07/15 08:21:43 This submit includes files, changed outside of main project directory. loader_mod: mainly changed main.c to add pxe_http testing functions i386_mod: in Makefile added pxe_http directory to compile library libpxe_http.a libi386_mod: make pxe.c call pxe_core_init(), other functions are now stubs. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/i386_mod/Makefile#1 add .. //depot/projects/soc2007/taleks-pxe_http/libi386_mod/pxe.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/libi386_mod/pxe.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/loader_mod/Makefile#1 add .. //depot/projects/soc2007/taleks-pxe_http/loader_mod/conf.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/loader_mod/main.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 15 11:54: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 B12B116A407; Sun, 15 Jul 2007 11: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 7973B16A404 for ; Sun, 15 Jul 2007 11:54:18 +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 6A06613C4B6 for ; Sun, 15 Jul 2007 11:54:18 +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 l6FBsIVh063383 for ; Sun, 15 Jul 2007 11:54:18 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FBsI0k063380 for perforce@freebsd.org; Sun, 15 Jul 2007 11:54:18 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 11:54:18 GMT Message-Id: <200707151154.l6FBsI0k063380@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 123530 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, 15 Jul 2007 11:54:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123530 Change 123530 by andrew@andrew_hermies on 2007/07/15 11:54:14 Update the gui by placing the computer selector in a scrool area and adding an update selector Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund-fe.glade#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund-fe.glade#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -184,11 +184,20 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + @@ -202,6 +211,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Connect + 0 5 @@ -214,6 +224,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Disconnect + 0 5 @@ -239,7 +250,25 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + True + @@ -249,8 +278,16 @@ False + + True + True + + + True + True + From owner-p4-projects@FreeBSD.ORG Sun Jul 15 11:58: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 61FF916A404; Sun, 15 Jul 2007 11:58: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 35F1516A400 for ; Sun, 15 Jul 2007 11:58:24 +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 266F013C4B4 for ; Sun, 15 Jul 2007 11:58:24 +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 l6FBwO0M063591 for ; Sun, 15 Jul 2007 11:58:24 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FBwNtD063588 for perforce@freebsd.org; Sun, 15 Jul 2007 11:58:23 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 11:58:23 GMT Message-Id: <200707151158.l6FBwNtD063588@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 123531 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, 15 Jul 2007 11:58:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123531 Change 123531 by andrew@andrew_hermies on 2007/07/15 11:58:15 Add a response object to hold the response from the server Allow a call's response to be set Add the ability for other classes to lock the response to alow syncronisation of the response Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/call.py#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/call.py#2 (text+ko) ==== @@ -24,16 +24,48 @@ # SUCH DAMAGE. # +import threading + class Call: def __init__(self, name, args): self.__name = name self.__args = args self.__response = None + self.__responseLock = threading.Lock() + def getCall(self): # TODO: Use a better call ID return "%s" % (self.__name, self.__args) + def getID(self): + return 1 + + def setResponse(self, response): + self.__response = response + def getResponse(self): return self.__response + + def acquireLock(self): + '''Aquires the lock to use to set the response.''' + self.__responseLock.acquire() + + def releaseLock(self): + '''Releases the lock to use and set the response.''' + self.__responseLock.release() + +class Response: + def __init__(self, id, code, message, data = None): + self.__id = id + self.__code = code + self.__message = message + self.__data = data + + def __str__(self): + return "%s" \ + % (self.__id, self.__message, self.__code, str(self.__data)) + + def getData(self): + return self.__data From owner-p4-projects@FreeBSD.ORG Sun Jul 15 12:02: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 917BC16A403; Sun, 15 Jul 2007 12:02: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 5CBC616A409 for ; Sun, 15 Jul 2007 12:02:30 +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 4D35E13C4A5 for ; Sun, 15 Jul 2007 12:02:30 +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 l6FC2UKj064142 for ; Sun, 15 Jul 2007 12:02:30 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FC2ULF064139 for perforce@freebsd.org; Sun, 15 Jul 2007 12:02:30 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 12:02:30 GMT Message-Id: <200707151202.l6FC2ULF064139@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 123532 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, 15 Jul 2007 12:02:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123532 Change 123532 by andrew@andrew_hermies on 2007/07/15 12:01:54 When sending a call hold the response lock until the response is set Wait for the response lock to be released when issuing a call Create a response object when a response is found and add it to the call object When the data is a child of an array append it to the array Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#8 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#4 (text+ko) ==== @@ -97,6 +97,10 @@ call = facund.Call("list_updates", args) self.__connection.doCall(call) + # Wait for the response + call.acquireLock() + call.releaseLock() + return call.getResponse() def connect(self): '''Connects to the remote computer''' ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#8 (text+ko) ==== @@ -35,6 +35,7 @@ self.isReady = False self.__data = None + self.__calls = {} self.bufSize = 1024 self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) @@ -50,7 +51,7 @@ # Mark the class as ready and able to disconnect self.isReady = True - self.socket.send("") + #self.socket.send("") def disconnect(self): if self.isReady: @@ -65,9 +66,11 @@ self.parser.close() def doCall(self, call): + print call.getID() + call.acquireLock() + self.__calls[str(call.getID())] = call self.socket.send(call.getCall()) - def interact(self): '''Reads data from the connection and passes it to the XML parser''' @@ -103,6 +106,21 @@ data.setParent(self.__data) self.__data = data + elif name == "response": + self.__responseID = None + self.__responseMessage = None + self.__responseCode = None + + for attr in attributes.items(): + if attr[0] == "id": + self.__responseID = int(attr[1]) + elif attr[0] == "code": + print self.__responseCode + elif attr[0] == "message": + self.__responseMessage = str(attr[1]) + else: + print attr + elif name == "facund-server": self.__connected_lock.acquire() @@ -112,11 +130,20 @@ if name == "data": data = self.__data.getParent() if data is not None: + data.append(self.__data) self.__data = data elif name == "response": - print str(self.__data) - del self.__data + response = facund.Response(self.__responseID, + self.__responseMessage, self.__responseCode, + self.__data) + + # TODO: Check this is a valid item + call = self.__calls[str(self.__responseID)] + call.setResponse(response) + call.releaseLock() + self.__calls[self.__responseID] = None + self.__data = None elif name == "facund-server": From owner-p4-projects@FreeBSD.ORG Sun Jul 15 12:03:32 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 675C916A405; Sun, 15 Jul 2007 12:03:32 +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 3DB3916A403 for ; Sun, 15 Jul 2007 12:03:32 +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 1684913C461 for ; Sun, 15 Jul 2007 12:03:32 +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 l6FC3VjG065388 for ; Sun, 15 Jul 2007 12:03:31 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FC3VhN065385 for perforce@freebsd.org; Sun, 15 Jul 2007 12:03:31 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 12:03:31 GMT Message-Id: <200707151203.l6FC3VhN065385@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 123533 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, 15 Jul 2007 12:03:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=123533 Change 123533 by andrew@andrew_hermies on 2007/07/15 12:03:07 Allow an array's data to be retrieved Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/data.py#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/data.py#3 (text+ko) ==== @@ -119,6 +119,9 @@ self.__data.append(data) data.setParent(self) + def getData(self): + return self.__data + def setData(self, data): raise ValueError("Array's can't have data set") From owner-p4-projects@FreeBSD.ORG Sun Jul 15 12:06: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 80F4316A406; Sun, 15 Jul 2007 12:06: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 4CFB516A402 for ; Sun, 15 Jul 2007 12:06:36 +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 3D98113C49D for ; Sun, 15 Jul 2007 12:06:36 +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 l6FC6avx067754 for ; Sun, 15 Jul 2007 12:06:36 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FC6Zue067751 for perforce@freebsd.org; Sun, 15 Jul 2007 12:06:35 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 12:06:35 GMT Message-Id: <200707151206.l6FC6Zue067751@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 123534 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, 15 Jul 2007 12:06:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=123534 Change 123534 by andrew@andrew_hermies on 2007/07/15 12:05:35 Add a model for the update view and allow one to be set in the main window Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#6 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/update_model.py#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#4 (text+ko) ==== @@ -26,3 +26,4 @@ from computer_model import ComputerTreeModel from main_window import MainWindow +from update_model import UpdateListModel ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#6 (text+ko) ==== @@ -42,6 +42,15 @@ def setController(self, controller): self.__controller = controller + def setUpdateViewModel(self, model): + '''Sets the model to use to for the computer tree''' + self.__updateViewModel = model + treeView = self.__xml.get_widget('updateView') + treeView.set_model(model) + cell = gtk.CellRendererText() + column = gtk.TreeViewColumn("Update", cell, text=0) + treeView.append_column(column) + def setComputerTreeModel(self, model): '''Sets the model to use to for the computer tree''' self.__computerTreeModel = model From owner-p4-projects@FreeBSD.ORG Sun Jul 15 12:09: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 40BF816A405; Sun, 15 Jul 2007 12:09: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 1EA9016A403 for ; Sun, 15 Jul 2007 12:09:42 +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 0F78513C4B5 for ; Sun, 15 Jul 2007 12:09:42 +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 l6FC9fwY067918 for ; Sun, 15 Jul 2007 12:09:41 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FC9fJC067915 for perforce@freebsd.org; Sun, 15 Jul 2007 12:09:41 GMT (envelope-from andrew@freebsd.org) Date: Sun, 15 Jul 2007 12:09:41 GMT Message-Id: <200707151209.l6FC9fJC067915@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 123536 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, 15 Jul 2007 12:09:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123536 Change 123536 by andrew@andrew_hermies on 2007/07/15 12:08:40 Create a model for the update view and pass it to the controller Parse the response from the list_updates call and display it Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund.py#8 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/controller.py#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#8 (text+ko) ==== @@ -38,14 +38,16 @@ # fc.interact() if __name__ == "__main__": - model = facund.gui.ComputerTreeModel() + computerModel = facund.gui.ComputerTreeModel() localComputer = facund.Computer("Local computer", '/tmp/facund') localComputer.addDir('/') - model.addComputer(localComputer) + computerModel.addComputer(localComputer) + + updateModel = facund.gui.UpdateListModel() mainWindow = facund.gui.MainWindow('facund-fe.glade') - controller = facund.Controller(model, mainWindow); + controller = facund.Controller(mainWindow, computerModel, updateModel); controller.run() ==== //depot/projects/soc2007/andrew-update/frontend/facund/controller.py#2 (text+ko) ==== @@ -25,12 +25,14 @@ # class Controller: - def __init__(self, computersModel, view): + def __init__(self, view, computersModel, updateModel): self.__view = view self.__view.setController(self) self.__computersModel = computersModel self.__view.setComputerTreeModel(self.__computersModel) self.__currentComputer = None + self.__updateModel = updateModel + self.__view.setUpdateViewModel(self.__updateModel) def run(self): self.__view.run() @@ -49,7 +51,16 @@ return command = dir.getCommands()[position[2]] - dir.runCommand(position[2]) + response = dir.runCommand(position[2]) + data = response.getData() + item = data.getData()[0] + # Each item will be a pair of + pair = item.getData() + theDir = pair[0].getData() + + self.__updateModel.empty() + for update in pair[1].getData(): + self.__updateModel.addUpdate(update) def getCurrentComputer(self): return self.__currentComputer From owner-p4-projects@FreeBSD.ORG Sun Jul 15 17:20: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 B387316A406; Sun, 15 Jul 2007 17:20: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 5864516A404 for ; Sun, 15 Jul 2007 17:20:05 +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 4809613C4B4 for ; Sun, 15 Jul 2007 17:20:05 +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 l6FHK5mO012556 for ; Sun, 15 Jul 2007 17:20:05 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FHK492012548 for perforce@freebsd.org; Sun, 15 Jul 2007 17:20:04 GMT (envelope-from thioretic@FreeBSD.org) Date: Sun, 15 Jul 2007 17:20:04 GMT Message-Id: <200707151720.l6FHK492012548@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 123542 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, 15 Jul 2007 17:20:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=123542 Change 123542 by thioretic@thioretic on 2007/07/15 17:19:41 TODO: some cleanups, locking and IO requests handling. DONE: resource_* and bus_generic_* stuff. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#14 edit .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#15 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#14 (text+ko) ==== @@ -135,4 +135,11 @@ # 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_ATTACHED (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). + a.1.6 resorce_* and bus_generic_* + SOLUTION: use is_devie_parent() and deviec_get_parent() instead of using + dev->parent; + FILE(S) AFFECTED: kern/subr_bus.c + # I'm unsure about what to do with those, who have more than a single parent. + # Although it's highly unlikely that any devices, which have multiple parents + # (functional devices) will use the api. ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#15 (text+ko) ==== @@ -1201,6 +1201,18 @@ return(FALSE); } +static int +is_device_parent (device_t dev, device_t parent){ + devicelink_t dl; + if (TAILQ_EMPTY(&dev->parents)) + return (FALSE); + TAILQ_FOREACH (dl, &dev->parents, link){ + if (dl->device_ptr == parent) + break; + } + return ((dl) ? TRUE : FALSE); +} + /* * Devclass implementation @@ -3580,7 +3592,7 @@ int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct resource_list_entry *rle = 0; - int passthrough = (device_get_parent(child) != bus); + int passthrough = !is_device_parent (child, bus); int isdefault = (start == 0UL && end == ~0UL); if (passthrough) { @@ -3639,7 +3651,7 @@ int type, int rid, struct resource *res) { struct resource_list_entry *rle = 0; - int passthrough = (device_get_parent(child) != bus); + int passthrough = !is_device_parent (child, bus); int error; if (passthrough) { @@ -3969,8 +3981,8 @@ DEVICE_IDENTIFY(driver, dev); TAILQ_FOREACH(child, &dev->children, link) { -// if (child->state == DS_NOTPRESENT || -// (child->flags & DF_REBID)) + if (child->state == DS_NOTPRESENT || + (child->flags & DF_REBID)) device_probe_and_attach(child); } } @@ -4002,9 +4014,11 @@ bus_generic_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { + device_t parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_TEARDOWN_INTR(dev->parent, child, irq, cookie)); + if (parent) + return (BUS_TEARDOWN_INTR(parent, child, irq, cookie)); return (EINVAL); } @@ -4018,9 +4032,11 @@ bus_generic_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 parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_ALLOC_RESOURCE(dev->parent, child, type, rid, + if (parent) + return (BUS_ALLOC_RESOURCE(parent, child, type, rid, start, end, count, flags)); return (NULL); } @@ -4035,9 +4051,11 @@ bus_generic_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { + device_t parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_RELEASE_RESOURCE(dev->parent, child, type, rid, + if (parent) + return (BUS_RELEASE_RESOURCE(parent, child, type, rid, r)); return (EINVAL); } @@ -4052,9 +4070,11 @@ bus_generic_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { + device_t parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_ACTIVATE_RESOURCE(dev->parent, child, type, rid, + if (parent) + return (BUS_ACTIVATE_RESOURCE(parent, child, type, rid, r)); return (EINVAL); } @@ -4069,9 +4089,11 @@ bus_generic_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { + device_t parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_DEACTIVATE_RESOURCE(dev->parent, child, type, rid, + if (parent) + return (BUS_DEACTIVATE_RESOURCE(parent, child, type, rid, r)); return (EINVAL); } @@ -4086,10 +4108,11 @@ bus_generic_config_intr(device_t dev, int irq, enum intr_trigger trig, enum intr_polarity pol) { - + device_t parent; + parent = device_get_parent (dev); /* Propagate up the bus hierarchy until someone handles it. */ - if (dev->parent) - return (BUS_CONFIG_INTR(dev->parent, irq, trig, pol)); + if (parent) + return (BUS_CONFIG_INTR(parent, irq, trig, pol)); return (EINVAL); } @@ -4240,9 +4263,11 @@ bus_alloc_resource(device_t dev, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - if (dev->parent == 0) + device_t parent; + parent = device_get_parent (dev); + if (!parent) return (0); - return (BUS_ALLOC_RESOURCE(dev->parent, dev, type, rid, start, end, + return (BUS_ALLOC_RESOURCE(parent, dev, type, rid, start, end, count, flags)); } @@ -4255,9 +4280,11 @@ int bus_activate_resource(device_t dev, int type, int rid, struct resource *r) { - if (dev->parent == 0) + device_t parent; + parent = device_get_parent (dev); + if (!parent) return (EINVAL); - return (BUS_ACTIVATE_RESOURCE(dev->parent, dev, type, rid, r)); + return (BUS_ACTIVATE_RESOURCE(parent, dev, type, rid, r)); } /** @@ -4269,9 +4296,11 @@ int bus_deactivate_resource(device_t dev, int type, int rid, struct resource *r) { - if (dev->parent == 0) + device_t parent; + parent = device_get_parent (dev); + if (!parent) return (EINVAL); - return (BUS_DEACTIVATE_RESOURCE(dev->parent, dev, type, rid, r)); + return (BUS_DEACTIVATE_RESOURCE(parent, dev, type, rid, r)); } /** @@ -4283,9 +4312,11 @@ int bus_release_resource(device_t dev, int type, int rid, struct resource *r) { - if (dev->parent == 0) + device_t parent; + parent = device_get_parent (dev); + if (!parent) return (EINVAL); - return (BUS_RELEASE_RESOURCE(dev->parent, dev, type, rid, r)); + return (BUS_RELEASE_RESOURCE(parent, dev, type, rid, r)); } /** @@ -4299,12 +4330,14 @@ driver_intr_t handler, void *arg, void **cookiep) { int error; + device_t parent; - if (dev->parent != 0) { + parent = device_get_parent (dev); + if (parent) { if ((flags &~ INTR_ENTROPY) == (INTR_TYPE_NET | INTR_MPSAFE) && !debug_mpsafenet) flags &= ~INTR_MPSAFE; - error = BUS_SETUP_INTR(dev->parent, dev, r, flags, + error = BUS_SETUP_INTR(parent, dev, r, flags, handler, arg, cookiep); if (error == 0) { if (!(flags & (INTR_MPSAFE | INTR_FAST))) @@ -4328,9 +4361,12 @@ int bus_teardown_intr(device_t dev, struct resource *r, void *cookie) { - if (dev->parent == 0) + device_t parent; + + parent = device_get_parent (dev); + if (!parent) return (EINVAL); - return (BUS_TEARDOWN_INTR(dev->parent, dev, r, cookie)); + return (BUS_TEARDOWN_INTR(parent, dev, r, cookie)); } /** From owner-p4-projects@FreeBSD.ORG Sun Jul 15 18:37: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 3CDF816A407; Sun, 15 Jul 2007 18:37: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 D180216A400 for ; Sun, 15 Jul 2007 18:37:09 +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 C062F13C481 for ; Sun, 15 Jul 2007 18:37:09 +0000 (UTC) (envelope-from jbr@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 l6FIb9Nf019460 for ; Sun, 15 Jul 2007 18:37:09 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FIb1wq019453 for perforce@freebsd.org; Sun, 15 Jul 2007 18:37:01 GMT (envelope-from jbr@FreeBSD.org) Date: Sun, 15 Jul 2007 18:37:01 GMT Message-Id: <200707151837.l6FIb1wq019453@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 123545 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, 15 Jul 2007 18:37:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123545 Change 123545 by jbr@jbr_bob on 2007/07/15 18:36:02 Integrate to newest current Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/00READ#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/README#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/TODO#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/cnode.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_io.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_kernel.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_namecache.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_opstats.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_psdev.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_subr.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_venus.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.c#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/coda/coda_vnops.h#2 delete .. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/conf/NOTES#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/conf/files#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/conf/options#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/README#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/TODO#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/cnode.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/modules/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/modules/coda/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netatm/atm_proto.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agp.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agppriv.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/pci/agpreg.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/sys/sysent.h#3 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_phys.h#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $ +# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ .include @@ -8,7 +8,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1023,7 +1023,8 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimit + linux32_fixlimit, + &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/Makefile.inc#2 (text) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.6 2006/12/20 17:47:54 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm __at91_boot_Makefile.inc__: -# tsc, bwct, kb920x are the supported flavors -BOOT_FLAVOR=kb920x +# tsc, bwct, kb920x, centipad are the supported flavors +BOOT_FLAVOR?=kb920x CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/board.h#2 (text+ko) ==== @@ -21,8 +21,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.1 2006/11/09 20:07:26 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $ */ void Update(void); void board_init(void); +int drvread(void *, unsigned, unsigned); ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $"); #include #include @@ -26,9 +26,7 @@ #include -#include "emac.h" #include "lib.h" -#include "sd-card.h" #include "board.h" #define RBX_ASKNAME 0x0 /* -a */ @@ -84,8 +82,6 @@ RBX_VERBOSE }; -unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; - unsigned dsk_start; static char cmd[512]; static char kname[1024]; @@ -96,7 +92,6 @@ static int parse(void); static int xfsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); -static int drvread(void *, unsigned, unsigned); #include "ufsread.c" @@ -147,10 +142,6 @@ ino_t ino; board_init(); - EMAC_Init(); - EMAC_SetMACAddress(mac); - while (sdcard_init() == 0) - printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ @@ -179,14 +170,11 @@ xputchar('\n'); autoboot = 0; c = 0; - printf("cmd is '%s'\n", cmd); if (parse()) xputchar('\a'); #ifdef XMODEM_DL else if (*cmd == '*') - Update(); - else if (*cmd == '#') - reset(); + Update(); #endif else load(); @@ -281,14 +269,14 @@ dp = (void *)(sec + DOSPARTOFF); for (i = 0; i < NDOSPART; i++) { if (dp[i].dp_typ == DOSPTYP_386BSD) - break; + break; } if (i == NDOSPART) - return -1; + return -1; // Although dp_start is aligned within the disk partition structure, // DOSPARTOFF is 446, which is only word (2) aligned, not longword (4) // aligned. Cope by using memcpy to fetch the start of this partition. - memcpy(&dsk_start, &dp[i].dp_start, 4); + memcpy(&dsk_start, &dp[1].dp_start, 4); if (drvread(sec, dsk_start + LABELSECTOR, 1)) return -1; d = (void *)(sec + LABELOFFSET); @@ -306,12 +294,3 @@ } return drvread(buf, dsk_start + lba, nblk); } - -static int -drvread(void *buf, unsigned lba, unsigned nblk) -{ - static unsigned c = 0x2d5c7c2f; - - printf("%c\b", c = c << 8 | c >> 24); - return (MCI_read((char *)buf, lba << 9, nblk << 9)); -} ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== @@ -24,15 +24,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.3 2006/11/09 20:08:46 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $"); #include #include "emac.h" #include "lib.h" #include "board.h" +#include "sd-card.h" -extern unsigned char mac[]; +unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; static void MacFromEE() @@ -40,7 +41,7 @@ uint32_t sig; sig = 0; ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) + if (sig != 0x92021054) return; ReadEEPROM(12 * 1024 + 4, mac, 6); printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], @@ -57,4 +58,14 @@ { InitEEPROM(); MacFromEE(); + EMAC_Init(); + EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); +} + +int +drvread(void *buf, unsigned lba, unsigned nblk) +{ + return (MCI_read((char *)buf, lba << 9, nblk << 9)); } ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.8 2007/03/15 03:31:49 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -8,7 +8,7 @@ putchar.c printf.c reset.c spi_flash.c xmodem.c \ sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \ memset.c memcmp.c -SRCS+=ashldi3.c divsi3.S +SRCS+=ashldi3.c divsi3.c NO_MAN= .if ${MK_TAG_LIST} != "no" ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #include "at91rm9200.h" @@ -62,7 +62,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | AT91C_PIO_PC20; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | @@ -136,7 +136,11 @@ AT91C_BASE_EBI->EBI_CSA = value; AT91C_BASE_SDRC->SDRC_CR = +#ifdef KB9202_B + AT91C_SDRC_NC_10 | +#else AT91C_SDRC_NC_9 | +#endif AT91C_SDRC_NR_13 | AT91C_SDRC_NB_4_BANKS | AT91C_SDRC_CAS_2 | ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #ifndef _AT91RM9200_LOWLEVEL_H_ @@ -39,6 +39,14 @@ #define OSC_MAIN_MULT 90 #endif +#ifdef BOOT_CENTIPAD +/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +typedef unsigned short sdram_size_t; +#define OSC_MAIN_MULT 90 +#endif + #ifdef BOOT_BWCT /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.c#2 (text) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" @@ -380,7 +380,7 @@ static void MII_GetLinkSpeed(AT91PS_EMAC pEmac) { -#if defined(BOOT_TSC) | defined(BOOT_KB920X) +#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) unsigned short stat2; #endif unsigned update; @@ -394,7 +394,7 @@ update |= AT91C_EMAC_SPD; update |= AT91C_EMAC_FD; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) return ; ==== //depot/projects/soc2007/jbr-syscall/src/sys/boot/arm/at91/libat91/emac.h#2 (text) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.5 2006/11/09 20:32:36 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $ *****************************************************************************/ @@ -114,7 +114,7 @@ /* MII registers definition */ #define MII_STS_REG 0x01 #define MII_STS_LINK_STAT 0x04 -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) #define MII_STS2_REG 0x11 #define MII_STS2_LINK 0x400 #define MII_STS2_100TX 0x4000 ==== //depot/projects/soc2007/jbr-syscall/src/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" @@ -100,6 +100,13 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); +static u_long ia32_maxdsiz = IA32_MAXDSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); +static u_long ia32_maxssiz = IA32_MAXSSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); +static u_long ia32_maxvmem = IA32_MAXVMEM; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); + struct sysentvec ia32_freebsd_sysvec = { FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, @@ -126,7 +133,8 @@ VM_PROT_ALL, ia32_copyout_strings, ia32_setregs, - ia32_fixlimit + ia32_fixlimit, + &ia32_maxssiz }; @@ -273,13 +281,6 @@ return ((register_t *)stack_base); } -static u_long ia32_maxdsiz = IA32_MAXDSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); -static u_long ia32_maxssiz = IA32_MAXSSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); -static u_long ia32_maxvmem = IA32_MAXVMEM; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); - static void ia32_fixlimit(struct rlimit *rl, int which) { ==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1441 2007/07/05 15:33:13 gnn Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1444 2007/07/14 21:49:23 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -558,14 +558,6 @@ # faster.. if you are not debugging don't use. options SCTP_DEBUG # -# High speed enables sally floyds HS TCP optioin -# for congestion control increase, use only in -# very HS networks and with caution since I doubt -# it will compete fairly with peers. For the big-bad -# internet its best NOT to enable. -# -options SCTP_HIGH_SPEED -# # This option turns off the CRC32c checksum. Basically # You will not be able to talk to anyone else that # has not done this. Its more for expermentation to @@ -634,7 +626,7 @@ options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) -options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) @@ -899,6 +891,8 @@ # # ATM (HARP version) options # +# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE. +# # ATM_CORE includes the base ATM functionality code. This must be included # for ATM support. # @@ -917,14 +911,14 @@ # # The `harp' pseudo-driver makes all NATM interface drivers available to HARP. # -options ATM_CORE #core ATM protocol family -options ATM_IP #IP over ATM support -options ATM_SIGPVC #SIGPVC signalling manager -options ATM_SPANS #SPANS signalling manager -options ATM_UNI #UNI signalling manager +#options ATM_CORE #core ATM protocol family +#options ATM_IP #IP over ATM support +#options ATM_SIGPVC #SIGPVC signalling manager +#options ATM_SPANS #SPANS signalling manager +#options ATM_UNI #UNI signalling manager -device hfa #FORE PCA-200E ATM PCI -device harp #Pseudo-interface for NATM +#device hfa #FORE PCA-200E ATM PCI +#device harp #Pseudo-interface for NATM ##################################################################### ==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1234 2007/07/05 15:28:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -103,13 +103,6 @@ cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ -coda/coda_fbsd.c optional vcoda -coda/coda_namecache.c optional vcoda -coda/coda_psdev.c optional vcoda -coda/coda_subr.c optional vcoda -coda/coda_venus.c optional vcoda -coda/coda_vfsops.c optional vcoda -coda/coda_vnops.c optional vcoda contrib/altq/altq/altq_cbq.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq @@ -666,28 +659,28 @@ dev/fxp/if_fxp.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci -dev/harp/if_harp.c optional harp pci +#dev/harp/if_harp.c optional harp pci dev/hatm/if_hatm.c optional hatm pci dev/hatm/if_hatm_intr.c optional hatm pci dev/hatm/if_hatm_ioctl.c optional hatm pci dev/hatm/if_hatm_rx.c optional hatm pci dev/hatm/if_hatm_tx.c optional hatm pci -dev/hfa/fore_buffer.c optional hfa -dev/hfa/fore_command.c optional hfa -dev/hfa/fore_globals.c optional hfa -dev/hfa/fore_if.c optional hfa -dev/hfa/fore_init.c optional hfa -dev/hfa/fore_intr.c optional hfa -dev/hfa/fore_output.c optional hfa -dev/hfa/fore_receive.c optional hfa -dev/hfa/fore_stats.c optional hfa -dev/hfa/fore_timer.c optional hfa -dev/hfa/fore_transmit.c optional hfa -dev/hfa/fore_vcm.c optional hfa -#dev/hfa/hfa_eisa.c optional hfa eisa -dev/hfa/hfa_freebsd.c optional hfa -dev/hfa/hfa_pci.c optional hfa pci -#dev/hfa/hfa_sbus.c optional hfa sbus +#dev/hfa/fore_buffer.c optional hfa +#dev/hfa/fore_command.c optional hfa +#dev/hfa/fore_globals.c optional hfa +#dev/hfa/fore_if.c optional hfa +#dev/hfa/fore_init.c optional hfa +#dev/hfa/fore_intr.c optional hfa +#dev/hfa/fore_output.c optional hfa +#dev/hfa/fore_receive.c optional hfa +#dev/hfa/fore_stats.c optional hfa +#dev/hfa/fore_timer.c optional hfa +#dev/hfa/fore_transmit.c optional hfa +#dev/hfa/fore_vcm.c optional hfa +##dev/hfa/hfa_eisa.c optional hfa eisa +#dev/hfa/hfa_freebsd.c optional hfa +#dev/hfa/hfa_pci.c optional hfa pci +##dev/hfa/hfa_sbus.c optional hfa sbus dev/hifn/hifn7751.c optional hifn dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci @@ -739,6 +732,16 @@ dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgbe/ixgbe.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_phy.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_api.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_common.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_82598.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard @@ -1148,6 +1151,13 @@ dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +fs/coda/coda_fbsd.c optional vcoda +fs/coda/coda_namecache.c optional vcoda +fs/coda/coda_psdev.c optional vcoda +fs/coda/coda_subr.c optional vcoda +fs/coda/coda_venus.c optional vcoda +fs/coda/coda_vfsops.c optional vcoda +fs/coda/coda_vnops.c optional vcoda fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard @@ -1650,88 +1660,92 @@ netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk -netatm/atm_aal5.c optional atm_core -netatm/atm_cm.c optional atm_core -netatm/atm_device.c optional atm_core -netatm/atm_if.c optional atm_core -netatm/atm_proto.c optional atm_core -netatm/atm_signal.c optional atm_core -netatm/atm_socket.c optional atm_core -netatm/atm_subr.c optional atm_core -netatm/atm_usrreq.c optional atm_core -netatm/ipatm/ipatm_event.c optional atm_ip atm_core -netatm/ipatm/ipatm_if.c optional atm_ip atm_core -netatm/ipatm/ipatm_input.c optional atm_ip atm_core -netatm/ipatm/ipatm_load.c optional atm_ip atm_core -netatm/ipatm/ipatm_output.c optional atm_ip atm_core -netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core -netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core -netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core -netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core -netatm/spans/spans_arp.c optional atm_spans atm_core \ - dependency "spans_xdr.h" -netatm/spans/spans_cls.c optional atm_spans atm_core -netatm/spans/spans_if.c optional atm_spans atm_core -netatm/spans/spans_kxdr.c optional atm_spans atm_core -netatm/spans/spans_msg.c optional atm_spans atm_core -netatm/spans/spans_print.c optional atm_spans atm_core -netatm/spans/spans_proto.c optional atm_spans atm_core -netatm/spans/spans_subr.c optional atm_spans atm_core -netatm/spans/spans_util.c optional atm_spans atm_core -spans_xdr.h optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ - clean "spans_xdr.h" \ - no-obj no-implicit-rule -spans_xdr.c optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ - clean "spans_xdr.c" \ - no-obj no-implicit-rule local -spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "${NORMAL_C}" \ - no-implicit-rule local -netatm/uni/q2110_sigaa.c optional atm_uni atm_core -netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core -netatm/uni/q2110_subr.c optional atm_uni atm_core -netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core -netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core -netatm/uni/qsaal1_subr.c optional atm_uni atm_core -netatm/uni/sscf_uni.c optional atm_uni atm_core -netatm/uni/sscf_uni_lower.c optional atm_uni atm_core -netatm/uni/sscf_uni_upper.c optional atm_uni atm_core -netatm/uni/sscop.c optional atm_uni atm_core -netatm/uni/sscop_lower.c optional atm_uni atm_core -netatm/uni/sscop_pdu.c optional atm_uni atm_core -netatm/uni/sscop_sigaa.c optional atm_uni atm_core -netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core -netatm/uni/sscop_subr.c optional atm_uni atm_core -netatm/uni/sscop_timer.c optional atm_uni atm_core -netatm/uni/sscop_upper.c optional atm_uni atm_core -netatm/uni/uni_load.c optional atm_uni atm_core -netatm/uni/uniarp.c optional atm_uni atm_core -netatm/uni/uniarp_cache.c optional atm_uni atm_core -netatm/uni/uniarp_input.c optional atm_uni atm_core -netatm/uni/uniarp_output.c optional atm_uni atm_core -netatm/uni/uniarp_timer.c optional atm_uni atm_core -netatm/uni/uniarp_vcm.c optional atm_uni atm_core -netatm/uni/uniip.c optional atm_uni atm_core -netatm/uni/unisig_decode.c optional atm_uni atm_core -netatm/uni/unisig_encode.c optional atm_uni atm_core -netatm/uni/unisig_if.c optional atm_uni atm_core -netatm/uni/unisig_mbuf.c optional atm_uni atm_core -netatm/uni/unisig_msg.c optional atm_uni atm_core -netatm/uni/unisig_print.c optional atm_uni atm_core -netatm/uni/unisig_proto.c optional atm_uni atm_core -netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core -netatm/uni/unisig_subr.c optional atm_uni atm_core -netatm/uni/unisig_util.c optional atm_uni atm_core -netatm/uni/unisig_vc_state.c optional atm_uni atm_core -netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif -netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif +# +# netatm has been disconnected from the build until it is MPSAFE, or +# alternatively, until it is removed. +# +#netatm/atm_aal5.c optional atm_core +#netatm/atm_cm.c optional atm_core +#netatm/atm_device.c optional atm_core +#netatm/atm_if.c optional atm_core +#netatm/atm_proto.c optional atm_core +#netatm/atm_signal.c optional atm_core +#netatm/atm_socket.c optional atm_core +#netatm/atm_subr.c optional atm_core +#netatm/atm_usrreq.c optional atm_core +#netatm/ipatm/ipatm_event.c optional atm_ip atm_core +#netatm/ipatm/ipatm_if.c optional atm_ip atm_core +#netatm/ipatm/ipatm_input.c optional atm_ip atm_core +#netatm/ipatm/ipatm_load.c optional atm_ip atm_core +#netatm/ipatm/ipatm_output.c optional atm_ip atm_core +#netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core +#netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core +#netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core +#netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core +#netatm/spans/spans_arp.c optional atm_spans atm_core \ +# dependency "spans_xdr.h" +#netatm/spans/spans_cls.c optional atm_spans atm_core +#netatm/spans/spans_if.c optional atm_spans atm_core +#netatm/spans/spans_kxdr.c optional atm_spans atm_core +#netatm/spans/spans_msg.c optional atm_spans atm_core +#netatm/spans/spans_print.c optional atm_spans atm_core +#netatm/spans/spans_proto.c optional atm_spans atm_core +#netatm/spans/spans_subr.c optional atm_spans atm_core +#netatm/spans/spans_util.c optional atm_spans atm_core +#spans_xdr.h optional atm_spans atm_core \ +# before-depend \ +# dependency "$S/netatm/spans/spans_xdr.x" \ +# compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ +# clean "spans_xdr.h" \ +# no-obj no-implicit-rule +#spans_xdr.c optional atm_spans atm_core \ +# before-depend \ +# dependency "$S/netatm/spans/spans_xdr.x" \ +# compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ +# clean "spans_xdr.c" \ +# no-obj no-implicit-rule local +#spans_xdr.o optional atm_spans atm_core \ +# dependency "$S/netatm/spans/spans_xdr.x" \ +# compile-with "${NORMAL_C}" \ +# no-implicit-rule local +#netatm/uni/q2110_sigaa.c optional atm_uni atm_core +#netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core +#netatm/uni/q2110_subr.c optional atm_uni atm_core +#netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core +#netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core +#netatm/uni/qsaal1_subr.c optional atm_uni atm_core +#netatm/uni/sscf_uni.c optional atm_uni atm_core +#netatm/uni/sscf_uni_lower.c optional atm_uni atm_core +#netatm/uni/sscf_uni_upper.c optional atm_uni atm_core +#netatm/uni/sscop.c optional atm_uni atm_core +#netatm/uni/sscop_lower.c optional atm_uni atm_core +#netatm/uni/sscop_pdu.c optional atm_uni atm_core +#netatm/uni/sscop_sigaa.c optional atm_uni atm_core +#netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core +#netatm/uni/sscop_subr.c optional atm_uni atm_core +#netatm/uni/sscop_timer.c optional atm_uni atm_core +#netatm/uni/sscop_upper.c optional atm_uni atm_core +#netatm/uni/uni_load.c optional atm_uni atm_core +#netatm/uni/uniarp.c optional atm_uni atm_core +#netatm/uni/uniarp_cache.c optional atm_uni atm_core +#netatm/uni/uniarp_input.c optional atm_uni atm_core +#netatm/uni/uniarp_output.c optional atm_uni atm_core +#netatm/uni/uniarp_timer.c optional atm_uni atm_core +#netatm/uni/uniarp_vcm.c optional atm_uni atm_core +#netatm/uni/uniip.c optional atm_uni atm_core +#netatm/uni/unisig_decode.c optional atm_uni atm_core +#netatm/uni/unisig_encode.c optional atm_uni atm_core +#netatm/uni/unisig_if.c optional atm_uni atm_core +#netatm/uni/unisig_mbuf.c optional atm_uni atm_core +#netatm/uni/unisig_msg.c optional atm_uni atm_core +#netatm/uni/unisig_print.c optional atm_uni atm_core +#netatm/uni/unisig_proto.c optional atm_uni atm_core +#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core +#netatm/uni/unisig_subr.c optional atm_uni atm_core +#netatm/uni/unisig_util.c optional atm_uni atm_core +#netatm/uni/unisig_vc_state.c optional atm_uni atm_core +#netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif +#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" netgraph/atm/ng_atm.c optional ngatm_atm @@ -1841,6 +1855,7 @@ netinet/sctp_asconf.c optional inet inet6 sctp netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_bsd_addr.c optional inet inet6 sctp +netinet/sctp_cc_functions.c optional inet inet6 sctp netinet/sctp_crc32.c optional inet inet6 sctp netinet/sctp_indata.c optional inet inet6 sctp netinet/sctp_input.c optional inet inet6 sctp ==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.88 2007/07/06 01:50:58 peter Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.90 2007/07/12 00:01:53 jfv Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -76,9 +76,6 @@ # .. and the same for twa INCLUDES+= -I$S/dev/twa -# .. and the same for em -INCLUDES+= -I$S/dev/em - # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs ==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -145,12 +145,12 @@ ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} @if [ -e ${_firmw:C/\:.*$//} ]; then \ - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ - ${_firmw:C/\:.*$//}; \ + ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \ + -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ else \ ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \ - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ - ${_firmw:C/\:.*$//}; \ + ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \ + -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ rm ${_firmw:C/\:.*$//}; \ fi ==== //depot/projects/soc2007/jbr-syscall/src/sys/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.600 2007/07/06 13:20:43 attilio Exp $ +# $FreeBSD: src/sys/conf/options,v 1.602 2007/07/14 21:49:23 rwatson Exp $ # # On the handling of kernel options # @@ -396,7 +396,6 @@ # SCTP opt_sctp.h SCTP_DEBUG opt_sctp.h # Enable debug printfs -SCTP_HIGH_SPEED opt_sctp.h # Enable Sally Floyds HS TCP CC SCTP_WITH_NO_CSUM opt_sctp.h # Use this at your peril SCTP_LOCK_LOGGING opt_sctp.h # Log to KTR lock activity SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free @@ -481,12 +480,12 @@ TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h -# ATM (HARP version) -ATM_CORE opt_atm.h -ATM_IP opt_atm.h -ATM_SIGPVC opt_atm.h -ATM_SPANS opt_atm.h -ATM_UNI opt_atm.h +# ATM (HARP version) - disabled as not MPSAFE in 7.0 +#ATM_CORE opt_atm.h +#ATM_IP opt_atm.h +#ATM_SIGPVC opt_atm.h +#ATM_SPANS opt_atm.h +#ATM_UNI opt_atm.h >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 15 18:40: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 5E64A16A406; Sun, 15 Jul 2007 18:40: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 280E216A400 for ; Sun, 15 Jul 2007 18:40:14 +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 F36D013C474 for ; Sun, 15 Jul 2007 18:40:13 +0000 (UTC) (envelope-from jbr@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 l6FIeDN6019629 for ; Sun, 15 Jul 2007 18:40:13 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FIeDsH019626 for perforce@freebsd.org; Sun, 15 Jul 2007 18:40:13 GMT (envelope-from jbr@FreeBSD.org) Date: Sun, 15 Jul 2007 18:40:13 GMT Message-Id: <200707151840.l6FIeDsH019626@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 123546 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, 15 Jul 2007 18:40:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=123546 Change 123546 by jbr@jbr_bob on 2007/07/15 18:39:56 typo fix Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#6 edit Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_exec.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -e/*- +/*- * Copyright (c) 1993, David Greenman * All rights reserved. * From owner-p4-projects@FreeBSD.ORG Sun Jul 15 20: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 0F6B816A404; Sun, 15 Jul 2007 20: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 BFBAC16A402 for ; Sun, 15 Jul 2007 20:08:23 +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 B0D7213C481 for ; Sun, 15 Jul 2007 20:08:23 +0000 (UTC) (envelope-from gcooper@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 l6FK8N2t028283 for ; Sun, 15 Jul 2007 20:08:23 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FK8Nr8028280 for perforce@freebsd.org; Sun, 15 Jul 2007 20:08:23 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 20:08:23 GMT Message-Id: <200707152008.l6FK8Nr8028280@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 123550 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, 15 Jul 2007 20:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123550 Change 123550 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:07:45 Quite simply, works with read, but not fread. Or maybe it's just me :)? Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 (text+ko) ==== @@ -223,7 +223,7 @@ contents = (char *)malloc(sb.st_size + 1); - if ((int) fread(contents, sb.st_size, 1, fd) == FAIL) { + if (read(fileno(fd), contents, sb.st_size) == FAIL) { cleanup(0); errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, fname, (long long)sb.st_size); From owner-p4-projects@FreeBSD.ORG Sun Jul 15 20:11: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 172DD16A405; Sun, 15 Jul 2007 20:11: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 C6AB516A404 for ; Sun, 15 Jul 2007 20:11:28 +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 B791E13C478 for ; Sun, 15 Jul 2007 20:11:28 +0000 (UTC) (envelope-from gcooper@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 l6FKBS1c028664 for ; Sun, 15 Jul 2007 20:11:28 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FKBSOJ028661 for perforce@freebsd.org; Sun, 15 Jul 2007 20:11:28 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 20:11:28 GMT Message-Id: <200707152011.l6FKBSOJ028661@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 123551 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, 15 Jul 2007 20:11:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=123551 Change 123551 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:10:53 Bad case to exit on. A return code of 0 from read(2) good, -1 is bad.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#5 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#5 (text+ko) ==== @@ -223,7 +223,7 @@ contents = (char *)malloc(sb.st_size + 1); - if (read(fileno(fd), contents, sb.st_size) == FAIL) { + if (read(fileno(fd), contents, sb.st_size) == -1) { cleanup(0); errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, fname, (long long)sb.st_size); From owner-p4-projects@FreeBSD.ORG Sun Jul 15 20:19: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 D7A9116A409; Sun, 15 Jul 2007 20:19: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 87FF016A404 for ; Sun, 15 Jul 2007 20:19: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 6C73513C46B for ; Sun, 15 Jul 2007 20:19:39 +0000 (UTC) (envelope-from gcooper@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 l6FKJdAs029389 for ; Sun, 15 Jul 2007 20:19:39 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FKJdm4029386 for perforce@freebsd.org; Sun, 15 Jul 2007 20:19:39 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 20:19:39 GMT Message-Id: <200707152019.l6FKJdm4029386@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 123552 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, 15 Jul 2007 20:19:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=123552 Change 123552 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:19:06 Trying to optimize pkg_version. It's broken for now.. perform.old.c is the backed up version of pkg_version's perform.c. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.old.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/version.h#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== @@ -194,9 +194,8 @@ ch = NULL; if (ch == NULL) errx(2, "The INDEX does not appear to be valid!"); - if ((ie = malloc(sizeof(struct index_entry))) == NULL) + if ( (ie = calloc(1, sizeof(struct index_entry))) == NULL ) errx(2, "Unable to allocate memory in %s.", __func__); - bzero(ie, sizeof(struct index_entry)); ie->name = strdup(tmp); ie->origin = strdup(&ch[1]); /* Who really cares if we reverse the index... */ @@ -326,77 +325,122 @@ } int -version_match(char *pattern, const char *pkgname) +version_match(const char *pattern, const char *pkgname) { + + typedef enum { EXACT_PACKAGENAME=0, PATTERN, UNDEF } search_type_e; + typedef enum { UNDETECTED_STREAM=-1, URL, LOCALFILE, STDIN } inputstream_type_e; + + search_type_e trial_index; + inputstream_type_e matchstream = UNDETECTED_STREAM; + int ret = 0; - int matchstream = 0; + FILE *fp = NULL; - Boolean isTMP = FALSE; + + const char *trial_strings[] = { pkgname, pattern, NULL }; + search_type_e trial_categories[] = { EXACT_PACKAGENAME, PATTERN, UNDEF }; + + for(trial_index = EXACT_PACKAGENAME; trial_categories[trial_index] != UNDEF; trial_index++) { + + /** URL provided file? **/ + if (isURL(trial_strings[trial_index])) { + fp = fetchGetURL(trial_strings[trial_index], ""); + if (fp == NULL) + errx(2, "Can't open %s.", trial_strings[trial_index]); + matchstream = URL; + } + /** Open file? **/ + else if (*trial_strings[trial_index] == '/') { + fp = fopen(trial_strings[trial_index], "r"); + if (fp == NULL) + errx(2, "Unable to open %s.", trial_strings[trial_index]); + matchstream = LOCALFILE; + } + /** Check for STDIN provided input **/ + else if (strcmp(trial_strings[trial_index], "-") == 0) { + fp = stdin; + matchstream = STDIN; + } + + if(matchstream != UNDETECTED_STREAM) + break; + + } - if (isURL(pkgname)) { - fp = fetchGetURL(pkgname, ""); - isTMP = TRUE; - matchstream = 1; - if (fp == NULL) - errx(2, "Unable to open %s.", pkgname); - } else if (pkgname[0] == '/') { - fp = fopen(pkgname, "r"); - isTMP = TRUE; - matchstream = 1; - if (fp == NULL) - errx(2, "Unable to open %s.", pkgname); - } else if (strcmp(pkgname, "-") == 0) { - fp = stdin; - matchstream = 1; - } else if (isURL(pattern)) { - fp = fetchGetURL(pattern, ""); - isTMP = TRUE; - matchstream = -1; - if (fp == NULL) - errx(2, "Unable to open %s.", pattern); - } else if (pattern[0] == '/') { - fp = fopen(pattern, "r"); - isTMP = TRUE; - matchstream = -1; - if (fp == NULL) - errx(2, "Unable to open %s.", pattern); - } else if (strcmp(pattern, "-") == 0) { - fp = stdin; - matchstream = -1; - } else { + if(trial_index == UNDEF) ret = pattern_match(MATCH_GLOB, pattern, pkgname); - } + else { - if (fp != NULL) { size_t len; + + char ln[4*FILENAME_MAX+1]; char *line; - while ((line = fgetln(fp, &len)) != NULL) { - int match; - char *ch, ln[2048]; - size_t lnlen; - if (len > 0 && line[len-1] == '\n') - len --; - lnlen = len; - if (lnlen > sizeof(ln)-1) - lnlen = sizeof(ln)-1; - memcpy(ln, line, lnlen); - ln[lnlen] = '\0'; - if ((ch = strchr(ln, '|')) != NULL) - ch[0] = '\0'; - if (matchstream > 0) - match = pattern_match(MATCH_GLOB, pattern, ln); - else - match = pattern_match(MATCH_GLOB, ln, pkgname); - if (match == 1) { - ret = 1; - printf("%.*s\n", (int)len, line); + + /** matchstream's not a real file; have to read line by line **/ + if(matchstream != LOCALFILE) { + + while ( (line = fgetln(fp, &len)) != NULL ) + ret = version_match_service(ln, line, len, trial_strings[trial_index], (Boolean) matchstream); + + if (matchstream != STDIN) + fclose(fp); + + } + /** matchstream's a real file; can completely buffer the file into memory **/ + else { + + char *lines = fileGetContentsByDescriptor(fp, pkgname); + + fclose(fp); + + for( line = strtok(lines, "\n"); line != NULL; line = strtok(NULL, "\n") ) { + len = sizeof(line); + ret = version_match_service(ln, line, len, trial_strings[trial_index], (Boolean) matchstream); } + } - if (isTMP) - fclose(fp); + } return ret; + +} + +int +version_match_service(char *dest, const char *src, size_t src_len, const char *trial_string, Boolean is_package) +{ + + int match; + char *ch; + + size_t dest_len = src_len; + + if(dest_len != 0 && src[dest_len-1] == '\n') + dest_len--; + + if(dest_len > sizeof(src)-1) + dest_len = sizeof(src)-1; + + memcpy(dest, src, dest_len); + + *(dest+dest_len) = '\0'; + + if((ch = strchr(dest, '|')) != NULL) + ch[0] = '\0'; + + if(is_package) + match = pattern_match(MATCH_GLOB, (const char*) trial_string, dest); + else + match = pattern_match(MATCH_GLOB, dest, trial_string); + + if(match == 1) { + printf("%.*s\n", (int)src_len, src); + return 1; + } + + return 0; + } void ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/version.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ extern Boolean UseINDEXOnly; extern Boolean ShowOrigin; -extern int version_match(char *, const char *); +extern int version_match(const char *, const char *); +extern int version_match_service(char *, const char *, size_t, const char *, Boolean); #endif /* _INST_VERSION_H_INCLUDE */ From owner-p4-projects@FreeBSD.ORG Sun Jul 15 21:07: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 4EF8416A408; Sun, 15 Jul 2007 21:07: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 103CE16A400; Sun, 15 Jul 2007 21:07:07 +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 BED9F13C48D; Sun, 15 Jul 2007 21:07:06 +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 l6FL6P2U017602; Sun, 15 Jul 2007 15:06:25 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 15 Jul 2007 15:06:29 -0600 (MDT) Message-Id: <20070715.150629.-457441111.imp@bsdimp.com> To: gcooper@freebsd.org From: "M. Warner Losh" In-Reply-To: <200707152008.l6FK8Nr8028280@repoman.freebsd.org> References: <200707152008.l6FK8Nr8028280@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]); Sun, 15 Jul 2007 15:06:25 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 123550 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, 15 Jul 2007 21:07:07 -0000 In message: <200707152008.l6FK8Nr8028280@repoman.freebsd.org> Garrett Cooper writes: : http://perforce.freebsd.org/chv.cgi?CH=123550 : : Change 123550 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:07:45 : : Quite simply, works with read, but not fread. Or maybe it's just me :)? : : Affected files ... : : .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 edit : : Differences ... : : ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 (text+ko) ==== : : @@ -223,7 +223,7 @@ : : contents = (char *)malloc(sb.st_size + 1); : : - if ((int) fread(contents, sb.st_size, 1, fd) == FAIL) { : + if (read(fileno(fd), contents, sb.st_size) == FAIL) { : cleanup(0); : errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, : fname, (long long)sb.st_size); The functions fread() and fwrite() advance the file position indicator for the stream by the number of bytes read or written. They return the number of objects read or written. If an error occurs, or the end-of- file is reached, the return value is a short object count (or zero). vs If successful, the number of bytes actually read is returned. Upon read- ing end-of-file, zero is returned. Otherwise, a -1 is returned and the global variable errno is set to indicate the error. /me guesses FAIL is defined to be -1... Warner From owner-p4-projects@FreeBSD.ORG Sun Jul 15 22:07: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 39D8516A405; Sun, 15 Jul 2007 22:07: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 10C3516A400; Sun, 15 Jul 2007 22:07:53 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mxout4.cac.washington.edu (mxout4.cac.washington.edu [140.142.33.19]) by mx1.freebsd.org (Postfix) with ESMTP id E270713C474; Sun, 15 Jul 2007 22:07:52 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from smtp.washington.edu (smtp.washington.edu [140.142.33.7] (may be forged)) by mxout4.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.06) with ESMTP id l6FM7oe5020696 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 15 Jul 2007 15:07:50 -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 l6FM7njN012100 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 15 Jul 2007 15:07:49 -0700 Message-ID: <469A9AB4.6050702@gmail.com> Date: Sun, 15 Jul 2007 15:07:48 -0700 From: Garrett Cooper User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: "M. Warner Losh" References: <200707152008.l6FK8Nr8028280@repoman.freebsd.org> <20070715.150629.-457441111.imp@bsdimp.com> In-Reply-To: <20070715.150629.-457441111.imp@bsdimp.com> 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.15.144733 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@freebsd.org, gcooper@freebsd.org Subject: Re: PERFORCE change 123550 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, 15 Jul 2007 22:07:53 -0000 M. Warner Losh wrote: > In message: <200707152008.l6FK8Nr8028280@repoman.freebsd.org> > Garrett Cooper writes: > : http://perforce.freebsd.org/chv.cgi?CH=123550 > : > : Change 123550 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:07:45 > : > : Quite simply, works with read, but not fread. Or maybe it's just me :)? > : > : Affected files ... > : > : .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 edit > : > : Differences ... > : > : ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#4 (text+ko) ==== > : > : @@ -223,7 +223,7 @@ > : > : contents = (char *)malloc(sb.st_size + 1); > : > : - if ((int) fread(contents, sb.st_size, 1, fd) == FAIL) { > : + if (read(fileno(fd), contents, sb.st_size) == FAIL) { > : cleanup(0); > : errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, > : fname, (long long)sb.st_size); > > > The functions fread() and fwrite() advance the file position indicator > for the stream by the number of bytes read or written. They return the > number of objects read or written. If an error occurs, or the end-of- > file is reached, the return value is a short object count (or zero). > > vs > > If successful, the number of bytes actually read is returned. Upon read- > ing end-of-file, zero is returned. Otherwise, a -1 is returned and the > global variable errno is set to indicate the error. > > /me guesses FAIL is defined to be -1... > > Warner > Warner, Yes, FAIL is -1 according to . What I'm ultimately looking for is 0, for the EOF, since this is an attempt to prebuffer as many file lines as possible. Should I be doing additional file checking, i.e. file doesn't have EOF? I know it shouldn't happen with most file writes, but it could (or at least it does from time to time according to vim's status bar), and I want to avoid security risks and/or bugs.. As a sidenote, I was concerned about memory usage but it appears to be fairly minimal. I'll discuss it on relevant lists. Thanks! -Garrett From owner-p4-projects@FreeBSD.ORG Sun Jul 15 22:18: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 B12B616A409; Sun, 15 Jul 2007 22:18: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 6DF8D16A400 for ; Sun, 15 Jul 2007 22:18:07 +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 454DB13C4B4 for ; Sun, 15 Jul 2007 22:18:07 +0000 (UTC) (envelope-from gcooper@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 l6FMI7W6063471 for ; Sun, 15 Jul 2007 22:18:07 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FMI7Yq063468 for perforce@freebsd.org; Sun, 15 Jul 2007 22:18:07 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 22:18:07 GMT Message-Id: <200707152218.l6FMI7Yq063468@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 123553 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, 15 Jul 2007 22:18:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=123553 Change 123553 by gcooper@optimus-revised_pkgtools on 2007/07/15 22:17:41 Important base case I didn't think of before. If the length of the string returned was null, no dice, exit add_plist immediately. This fixes pkg_version. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#10 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#10 (text+ko) ==== @@ -357,19 +357,18 @@ return PLIST_CONFLICTS; /** FALL-THROUGH **/ - case 'e': /** EXEC **/ if (!strcmp(cmd, "exec")) return PLIST_CMD; + /** FALL-THROUGH **/ - case 'u': /** UN(DO)EXEC **/ if (!strcmp(cmd, "unexec")) return PLIST_UNEXEC; + /** FALL-THROUGH **/ - case 'i': /** IGNORE **/ if (!strcmp(cmd, "ignore")) @@ -377,8 +376,8 @@ /** IGNORE_INST **/ else if(!strcmp(cmd, "ignore_inst")) return PLIST_IGNORE_INST; + /** FALL-THROUGH **/ - case 'd': /** DIRRM **/ if (!strcmp(cmd, "dirrm")) @@ -386,8 +385,8 @@ /** DISPLAY **/ else if(!strcmp(cmd, "display")) return PLIST_DISPLAY; + /** FALL-THROUGH **/ - case 'n': /** NAME **/ if(!strcmp(cmd, "name")) @@ -395,8 +394,8 @@ /** NOINST **/ else if (!strcmp(cmd, "noinst")) return PLIST_NOINST; + /** FALL-THROUGH **/ - case 'm': /** MODE **/ if(!strcmp(cmd, "mode")) @@ -404,8 +403,8 @@ /** MTREE **/ else if(!strcmp(cmd, "mtree")) return PLIST_MTREE; + /** FALL-THROUGH **/ - case 'o': /** OWNER **/ if(!strcmp(cmd, "owner")) @@ -413,28 +412,28 @@ /** OPTION **/ else if (!strcmp(cmd, "option")) return PLIST_OPTION; + /** FALL-THROUGH **/ - case 's': /** SRCDIR **/ if(!strcmp(cmd, "srcdir")) return PLIST_SRC; + /** FALL-THROUGH **/ - case 'g': /** GROUP **/ if (!strcmp(cmd, "group")) return PLIST_CHGRP; + /** FALL-THROUGH **/ - case 'p': /** PKGDEP **/ if (!strcmp(cmd, "pkgdep")) return PLIST_PKGDEP; + /** FALL-THROUGH **/ - /** Apparently the command didn't match .. oops **/ - default: + default: /** Apparently the command didn't match anything above .. oops **/ return FAIL; } @@ -461,10 +460,15 @@ pkg->fmtver_mnr = 2; pkg->origin = NULL; - plines = fileGetContentsByDescriptor(fp, "+CONTENTS"); + plines = fileGetContentsByDescriptor(fp, CONTENTS_FNAME); + + if(0 == strlen(plines)) + return; pline = strtok(plines, "\n"); + assert(pline != NULL); + if(0 == trim_end_whitespace(pline)) errx(-1, "Length of first line was 0. This shouldn't happen"); From owner-p4-projects@FreeBSD.ORG Sun Jul 15 22:58: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 3B1E216A406; Sun, 15 Jul 2007 22:58: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 EE88D16A400 for ; Sun, 15 Jul 2007 22:58:57 +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 DF90013C4B5 for ; Sun, 15 Jul 2007 22:58:57 +0000 (UTC) (envelope-from zec@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 l6FMwvQP066881 for ; Sun, 15 Jul 2007 22:58:57 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FMwvTq066878 for perforce@freebsd.org; Sun, 15 Jul 2007 22:58:57 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 15 Jul 2007 22:58:57 GMT Message-Id: <200707152258.l6FMwvTq066878@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 123554 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, 15 Jul 2007 22:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123554 Change 123554 by zec@zec_tpx32 on 2007/07/15 22:58:09 A fix to allow for a nooptions VIMAGE + options IPSEC kernel to be compiled. Affected files ... .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#7 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#7 (text+ko) ==== @@ -2037,8 +2037,10 @@ V_ip4_esp_randpad = -1; V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; +#ifdef REGRESSION V_ipsec_replay = 0; V_ipsec_integrity = 0; +#endif return 0; } ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#5 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jul 15 23:35: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 6F6FE16A405; Sun, 15 Jul 2007 23:35: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 487D816A403 for ; Sun, 15 Jul 2007 23:35:43 +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 20BD313C471 for ; Sun, 15 Jul 2007 23:35:43 +0000 (UTC) (envelope-from gcooper@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 l6FNZg1W072220 for ; Sun, 15 Jul 2007 23:35:43 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FNZg7i072217 for perforce@freebsd.org; Sun, 15 Jul 2007 23:35:42 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 23:35:42 GMT Message-Id: <200707152335.l6FNZg7i072217@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 123555 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, 15 Jul 2007 23:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=123555 Change 123555 by gcooper@optimus-revised_pkgtools on 2007/07/15 23:34:45 Opening for delete (was previously opened). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.old.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.old.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 15 23:40: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 7FB0616A405; Sun, 15 Jul 2007 23:40: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 2F03E16A400 for ; Sun, 15 Jul 2007 23:40:50 +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 1DF7413C442 for ; Sun, 15 Jul 2007 23:40:50 +0000 (UTC) (envelope-from gcooper@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 l6FNenw3072501 for ; Sun, 15 Jul 2007 23:40:49 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6FNensC072498 for perforce@freebsd.org; Sun, 15 Jul 2007 23:40:49 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 15 Jul 2007 23:40:49 GMT Message-Id: <200707152340.l6FNensC072498@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 123556 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, 15 Jul 2007 23:40:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123556 Change 123556 by gcooper@optimus-revised_pkgtools on 2007/07/15 23:40:00 -Section off simple profiler helper code in preparation for comparing vanilla pkg_install vs modified execution times and stats. -Delete old perform.c. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#11 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/version/perform.old.c#3 delete Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#5 (text+ko) ==== @@ -137,7 +137,7 @@ } Home = make_playpen(playpen, sb.st_size * 4); -#if SIMPLE_PROF_TRY +#if SIMPLE_PROF static struct timespec before, after, time_diff; #endif @@ -145,7 +145,7 @@ errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); where_to = Home; -#if SIMPLE_PROF_TRY +#if SIMPLE_PROF clock_gettime(CLOCK_REALTIME, &before); #endif @@ -153,13 +153,13 @@ if (!getenv("_TOP")) setenv("_TOP", Home, 1); -#if SIMPLE_PROF_TRY +#if SIMPLE_PROF 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 ) ); + fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "_TOP setenv", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); #endif if (unpack(pkg_fullname, extract)) { @@ -169,7 +169,7 @@ goto bomb; } -#if SIMPLE_PROF_TRY +#if SIMPLE_PROF clock_gettime(CLOCK_REALTIME, &before); #endif @@ -181,13 +181,13 @@ goto bomb; } -#if SIMPLE_PROF_TRY +#if SIMPLE_PROF 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 ) ); + fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "+CONTENTS fopen", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); #endif read_plist(&Plist, cfile); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#6 (text+ko) ==== @@ -296,9 +296,11 @@ { char cmd[FILENAME_MAX]; +#if SIMPLE_PROF static struct timespec before, after, time_diff; clock_gettime(CLOCK_REALTIME, &before); +#endif if (fname[0] == '/') snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to); @@ -309,6 +311,7 @@ errx(2, "%s: could not perform '%s'", __func__, cmd); } +#if SIMPLE_PROF clock_gettime(CLOCK_REALTIME, &after); time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; @@ -316,6 +319,7 @@ time_diff.tv_sec = after.tv_sec - before.tv_sec; fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "copy_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); +#endif } @@ -324,9 +328,11 @@ { char cmd[FILENAME_MAX]; +#if SIMPLE_PROF static struct timespec before, after, time_diff; clock_gettime(CLOCK_REALTIME, &before); +#endif if (fname[0] == '/') snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to); @@ -337,6 +343,7 @@ errx(2, "%s: could not perform '%s'", __func__, cmd); } +#if SIMPLE_PROF clock_gettime(CLOCK_REALTIME, &after); time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; @@ -344,6 +351,7 @@ time_diff.tv_sec = after.tv_sec - before.tv_sec; fprintf(stderr, "(%s) Difference: %3.20lf secs\n", "move_file", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 ) ); +#endif } @@ -399,9 +407,11 @@ unpack(const char *pkg, const char *flist) { +#if SIMPLE_PROF static struct timespec before, after, time_diff; clock_gettime(CLOCK_REALTIME, &before); +#endif const char *comp, *cp; char suff[80]; @@ -429,6 +439,7 @@ ret_code = 1; } +#if SIMPLE_PROF clock_gettime(CLOCK_REALTIME, &after); time_diff.tv_nsec = after.tv_nsec - before.tv_nsec; @@ -436,6 +447,7 @@ 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 ) ); +#endif return ret_code; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#5 (text+ko) ==== @@ -52,6 +52,10 @@ #define YES 2 #define NO 1 +#ifndef SIMPLE_PROF +#define SIMPLE_PROF 0 +#endif + /* Usually "rm", but often "echo" during debugging! */ #define REMOVE_CMD "/bin/rm" @@ -161,11 +165,13 @@ off_t min_free(const char *); //static char *find_playpen(char *, off_t); +#if SIMPLE_PROF 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 **); @@ -198,7 +204,9 @@ int unpack(const char *, const char *); void format_cmd(char *, int, const char *, const char *, const char *); +#if SIMPLE_PROF int delete_hierarchy_np(const char *, Boolean, Boolean); +#endif /* Msg */ void upchuck(const char *); @@ -224,7 +232,9 @@ int delete_package(Boolean, Boolean, Package *); Boolean make_preserve_name(char *, int, const char *, const char *); +#if SIMPLE_PROF 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); @@ -234,6 +244,8 @@ int delete_package_np(Boolean, Boolean, Package *); void read_plist_np(Package *, FILE *); +#endif + int trim_end_whitespace(char *); /* For all */ @@ -244,7 +256,7 @@ char **matchinstalled(match_t, char **, int *); char **matchbyorigin(const char *, int *); int isinstalledpkg(const char *name); -int pattern_match(match_t MatchType, char *pattern, const char *pkgname); +int pattern_match(match_t MatchType, const char *pattern, const char *pkgname); /* Dependencies */ int sortdeps(char **); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#5 (text+ko) ==== @@ -32,6 +32,7 @@ static char PenLocation[FILENAME_MAX]; static char Previous[FILENAME_MAX]; +#if SIMPLE_PROF char * run_generic_playpen_prof(char *fn_name, ...) { @@ -77,6 +78,7 @@ return ret_string; } +#endif char * where_playpen(void) @@ -84,14 +86,20 @@ return PenLocation; } +#if SIMPLE_PROF static char * find_playpen(char *pen, off_t sz) { return run_generic_playpen_prof("find_playpen", pen, sz); } +#endif /* Find a good place to play. */ char * +#if SIMPLE_PROF find_playpen_np(char *pen, off_t sz) +#else +find_playpen(char *pen, off_t sz) +#endif { char *cp; struct stat sb; @@ -141,19 +149,25 @@ strcpy(pen, pstack[pdepth]); free(pstack[pdepth--]); } - + +#if SIMPLE_PROF char * make_playpen(char *pen, off_t sz) { return run_generic_playpen_prof("make_playpen", pen, sz); } +#endif /* * Make a temporary directory to play in and chdir() to it, returning * pathname of previous working directory. */ char * +#if SIMPLE_PROF make_playpen_np(char *pen, off_t sz) +#else +make_playpen(char *pen, off_t sz) +#endif { if (!find_playpen(pen, sz)) return NULL; @@ -196,15 +210,21 @@ return Previous; } +#if SIMPLE_PROF void leave_playpen() { run_generic_playpen_prof("leave_playpen"); } +#endif /* Convenience routine for getting out of playpen */ void +#if SIMPLE_PROF leave_playpen_np() +#else +leave_playpen() +#endif { void (*oldsig)(int); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#11 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include +#if SIMPLE_PROF int run_generic_plist_prof(char *fn_name, ...) { @@ -119,9 +120,14 @@ { run_generic_plist_prof("add_plist", p, type, arg); } +#endif void +#if SIMPLE_PROF add_plist_np(Package *p, plist_t type, const char *arg) +#else +add_plist(Package *p, plist_t type, const char *arg) +#endif { PackingList tmp; @@ -151,14 +157,20 @@ } +#if SIMPLE_PROF void add_plist_top(Package *p, plist_t type, const char *arg) { run_generic_plist_prof("add_plist_top", p, type, arg); } +#endif void +#if SIMPLE_PROF add_plist_top_np(Package *p, plist_t type, const char *arg) +#else +add_plist_top(Package *p, plist_t type, const char *arg) +#endif { PackingList tmp; @@ -277,18 +289,25 @@ pkg->head = pkg->tail = NULL; } +#if SIMPLE_PROF int plist_cmd(const char *s, char **arg) { return run_generic_plist_prof("plist_cmd", s, arg); } +#endif /* * For an ascii string denoting a plist command, return its code and * optionally its argument(s) */ + int +#if SIMPLE_PROF plist_cmd_np(const char *s, char **arg) +#else +plist_cmd(const char *s, char **arg) +#endif { char cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */ char *cp; @@ -440,14 +459,20 @@ } +#if SIMPLE_PROF void read_plist(Package *pkg, FILE *fp) { run_generic_plist_prof("read_plist", pkg, fp); } +#endif void +#if SIMPLE_PROF read_plist_np(Package *pkg, FILE *fp) +#else +read_plist(Package *pkg, FILE *fp) +#endif { char *plines; @@ -558,15 +583,21 @@ return len; } +#if SIMPLE_PROF void write_plist(Package *pkg, FILE *fp) { run_generic_plist_prof("write_plist", pkg, fp); } +#endif /* Write a packing list to a file, converting commands to ascii equivs */ void +#if SIMPLE_PROF write_plist_np(Package *pkg, FILE *fp) +#else +write_plist(Package *pkg, FILE *fp) +#endif { PackingList plist = pkg->head; @@ -663,11 +694,13 @@ } } +#if SIMPLE_PROF int delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) { return run_generic_plist_prof("delete_package", ign_err, nukedirs, pkg); } +#endif /* * Delete the results of a package installation. @@ -676,7 +709,11 @@ * run it too in cases of failure. */ int +#if SIMPLE_PROF delete_package_np(Boolean ign_err, Boolean nukedirs, Package *pkg) +#else +delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) +#endif { PackingList p; const char *Where = ".", *last_file = ""; @@ -816,15 +853,21 @@ #define REMOVE(file,ie) (remove(file) && !(ie)) #endif +#if SIMPLE_PROF int delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) { return run_generic_plist_prof("delete_hierarchy", dir, ign_err, nukedirs); } +#endif /* Selectively delete a hierarchy */ int +#if SIMPLE_PROF delete_hierarchy_np(const char *dir, Boolean ign_err, Boolean nukedirs) +#else +delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs) +#endif { char *cp1, *cp2; From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:37: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 9B94516A406; Mon, 16 Jul 2007 00:37: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 28D9F16A402 for ; Mon, 16 Jul 2007 00:37:04 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 193EF13C491 for ; Mon, 16 Jul 2007 00:37:04 +0000 (UTC) (envelope-from fli@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 l6G0b3ko077281 for ; Mon, 16 Jul 2007 00:37:03 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0b3sd077278 for perforce@freebsd.org; Mon, 16 Jul 2007 00:37:03 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:37:03 GMT Message-Id: <200707160037.l6G0b3sd077278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123559 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, 16 Jul 2007 00:37:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=123559 Change 123559 by fli@fli_nexus on 2007/07/16 00:36:36 - Style fixes - Make search functions return cache_res {} instead of record_res {} Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#3 (text+ko) ==== @@ -53,7 +53,6 @@ TAILQ_INSERT_HEAD(&c->c_list, cr, cr_next); } else { - while (cr->cr_ttl_rel >= cr2->cr_ttl_rel) { cr->cr_ttl_rel -= cr2->cr_ttl_rel; cr3 = TAILQ_NEXT(cr2, cr_next); @@ -116,7 +115,7 @@ if (--cr->cr_ttl_rel > 0) return; - /* Remove entries with the same ttl */ + /* Remove entries with the same ttl */ do { rr = &cr->cr_res; cache_del(c, rr); @@ -143,13 +142,13 @@ struct cache_res *cr; int rval; - rr = record_res_find(&c->c_recs, rrset->r_name, rrset->r_type); - if (rr != NULL) { - rt = rr->rr_type; - TAILQ_FOREACH(rr, &rt->rt_list, rr_next) { - if (rr->rr_len == rrset->r_datalen) - if (memcmp(rr->rr_data, rrset->r_data, rr->rr_len) == 0) - break; + rr = NULL; + rt = record_type_find(&c->c_recs, rrset->r_name, rrset->r_type); + if (rt != NULL) { + record_type_foreach(rr, rt) { + if (rr->rr_len == rrset->r_datalen && + memcmp(rr->rr_data, rrset->r_data, rr->rr_len) == 0) + break; } } @@ -157,17 +156,18 @@ cache_set_ttl(c, rr, rrset->r_ttl); dprintf(DEBUG_CACHE, "TTL set to %d on name=%s, type=%d, rdatalen=%d", - rrset->r_ttl, rrset->r_name, rrset->r_type, rrset->r_datalen); + rrset->r_ttl, rrset->r_name, rrset->r_type, + rrset->r_datalen); rval = 1; if (new != NULL) - *new = rr; + *new = rr; } else if (rrset->r_ttl > 0) { record_get(&c->c_recs, &r, 0, rrset->r_name); cr = malloc(sizeof(struct cache_res)); rr = &cr->cr_res; - record_res_add(r, &rr, RECORD_NOALLOC, rrset->r_type, rrset->r_data, - rrset->r_datalen); + record_res_add(r, &rr, RECORD_NOALLOC, rrset->r_type, + rrset->r_data, rrset->r_datalen); record_res_setparent(&cr->cr_res, cr); cr->cr_ttl_abs = rrset->r_ttl; cr->cr_ttl_rel = rrset->r_ttl; @@ -176,7 +176,8 @@ enqueue_ttl(c, cr); dprintf(DEBUG_CACHE, "Record added to cache name=%s, type=%d, ttl=%d, dlen=%d", - rrset->r_name, rrset->r_type, rrset->r_ttl, rrset->r_datalen); + rrset->r_name, rrset->r_type, rrset->r_ttl, + rrset->r_datalen); rval = 0; if (new != NULL) *new = &cr->cr_res; @@ -202,10 +203,9 @@ MDNS_INIT_ASSERT(rr, rr_magic); cr = record_res_getparent(rr); - dprintf(DEBUG_CACHE, - "Removed %s from cache, type=%d, dlen=%d, attl=%d, rttl=%d, cached=%d", - r->r_name, rt->rt_type, rr->rr_len, cr->cr_ttl_abs, cr->cr_ttl_rel, - rtime - cr->cr_ctime); + dprintf(DEBUG_CACHE, "Removed %s from cache, type=%d, dlen=%d," + "attl=%d, rttl=%d, cached=%d", r->r_name, rt->rt_type, rr->rr_len, + cr->cr_ttl_abs, cr->cr_ttl_rel, rtime - cr->cr_ctime); MDNS_INIT_ASSERT(cr, cr_magic); dequeue_ttl(c, cr); @@ -221,25 +221,35 @@ * name - Resource name * type - Resource type */ -struct record_res * +struct cache_res * cache_find(struct cache *c, char *name, uint16_t type) { struct record_res *rr; + struct record_type *rt; + + rt = record_type_find(&c->c_recs, name, type); + if (rt == NULL) + return (NULL); - MDNS_INIT_ASSERT(rr, rr_magic); - rr = record_res_find(&c->c_recs, name, type); - return (rr); + rr = record_type_first(rt); + return (record_res_getparent(rr)); } /* * Given a resource record, return the next if multiple resources * are available per (name,type) pair. */ -struct record_res * -cache_find_next(struct record_res *rr) +struct cache_res * +cache_find_next(struct cache_res *cr) { + struct record_res *rr; - return (TAILQ_NEXT(rr, rr_next)); + rr = &cr->cr_res; + rr = record_type_next(rr); + if (rr != NULL) + return (record_res_getparent(rr)); + else + return (NULL); } /* @@ -257,12 +267,11 @@ struct record_type *rt; time_t cur; - rr = record_res_find(&c->c_recs, name, type); - if (rr == NULL) + rt = record_type_find(&c->c_recs, name, type); + if (rt == NULL) return; - MDNS_INIT_ASSERT(rr, rr_magic); - rt = rr->rr_type; + MDNS_INIT_ASSERT(rt, rt_magic); cur = time(NULL); TAILQ_FOREACH_SAFE(rr, &rt->rt_list, rr_next, rr2) { cr = record_res_getparent(rr); From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:41: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 EB60016A402; Mon, 16 Jul 2007 00:41: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 C0E8616A400 for ; Mon, 16 Jul 2007 00:41:09 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AFC3413C474 for ; Mon, 16 Jul 2007 00:41:09 +0000 (UTC) (envelope-from fli@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 l6G0f9nw077612 for ; Mon, 16 Jul 2007 00:41:09 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0f97i077608 for perforce@freebsd.org; Mon, 16 Jul 2007 00:41:09 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:41:09 GMT Message-Id: <200707160041.l6G0f97i077608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123560 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, 16 Jul 2007 00:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123560 Change 123560 by fli@fli_nexus on 2007/07/16 00:40:38 Locking and style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#6 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#6 (text+ko) ==== @@ -132,7 +132,7 @@ mdns_bufpool_setsize(bp, md->md_maxpkgsz); TAILQ_INIT(&md->md_pkglist); - + RW_INIT(md, md_lock, NULL); MDNS_INIT_SET(md, md_magic); return (0); error: @@ -146,8 +146,6 @@ mdns_destroy(struct mdns *md) { - if (md == NULL) - return; MDNS_INIT_ASSERT(md, md_magic); mdns_udp_close(md, PF_INET); @@ -158,6 +156,7 @@ #endif MDNS_INIT_UNSET(md, md_magic); + RW_DESTROY(md, md_lock); } /* @@ -246,6 +245,8 @@ sock = socket(family, SOCK_DGRAM, 0); if (sock < 0) return (-1); + + RW_WLOCK(md, md_lock); error = fcntl(sock, F_SETFL, O_NONBLOCK); if (error != 0) goto out; @@ -265,7 +266,8 @@ setsockopt(sock, IPPROTO_IP, IP_TTL, &so, sizeof(so)); so = 1; - error = setsockopt(sock, IPPROTO_IP, IP_RECVIF, &so, sizeof(so)); + error = + setsockopt(sock, IPPROTO_IP, IP_RECVIF, &so, sizeof(so)); if (error != 0) goto out; /* Ignore our own multicast packets */ @@ -281,8 +283,8 @@ if (error != 0) goto out; sinptr = (struct sockaddr_in *)&ifreq.ifr_addr; - setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, &sinptr->sin_addr.s_addr, - sizeof(sinptr->sin_addr.s_addr)); + setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + &sinptr->sin_addr.s_addr, sizeof(sinptr->sin_addr.s_addr)); if (error != 0) goto out; @@ -349,8 +351,10 @@ goto out; } + RW_UNLOCK(md, md_lock); return (0); out: + RW_UNLOCK(md, md_lock); close(sock); return (-1); } @@ -366,12 +370,13 @@ int sock; MDNS_INIT_ASSERT(md, md_magic); + RW_RLOCK(md, md_lock); switch (family) { case PF_INET: if (!(md->md_flags & MDNS_UDP4)) { errno = ENOTCONN; - return (-1); + goto out; } sock = md->md_udp4; md->md_flags &= ~MDNS_UDP4; @@ -380,7 +385,7 @@ case PF_INET6: if (!(md->md_flags & MDNS_UDP6)) { errno = ENOTCONN; - return (-1); + goto out; } sock = md->md_udp6; md->md_flags &= ~MDNS_UDP6; @@ -388,12 +393,16 @@ break; default: errno = EPROTONOSUPPORT; - return (-1); + goto out; } mcast_leave(sock, md->md_ifindex, family); close(sock); + RW_UNLOCK(md, md_lock); return (0); +out: + RW_UNLOCK(md, md_lock); + return (-1); } @@ -434,6 +443,7 @@ addrs++; } + RW_WLOCK(md, md_lock); sockp = malloc(sizeof(int) * addrs); if (sockp == NULL) goto out; @@ -448,17 +458,17 @@ md->md_tcp4_sz = addrs; i = 0; for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - if (strncmp(ifa->ifa_name, md->md_ifnam, IFNAMSIZ) == 0) - if (ifa->ifa_addr->sa_family == family) { - sinptr = (struct sockaddr_in *)ifa->ifa_addr; - sock = socket(PF_INET, SOCK_STREAM, 0); - - sin.sin_addr.s_addr = sinptr->sin_addr.s_addr; - error = bind(sock, (const struct sockaddr *)&sin, - sizeof(struct sockaddr_in)); - listen(sock, 10); - md->md_tcp4[i++] = sock; - } + if (ifa->ifa_addr->sa_family != family) + continue; + if (strncmp(ifa->ifa_name, md->md_ifnam, IFNAMSIZ) != 0) + continue; + sinptr = (struct sockaddr_in *)ifa->ifa_addr; + sock = socket(PF_INET, SOCK_STREAM, 0); + sin.sin_addr.s_addr = sinptr->sin_addr.s_addr; + error = bind(sock, (const struct sockaddr *)&sin, + sizeof(struct sockaddr_in)); + listen(sock, 10); + md->md_tcp4[i++] = sock; } md->md_flags |= MDNS_TCP4; break; @@ -472,19 +482,18 @@ md->md_tcp6_sz = addrs; i = 0; for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - if (strncmp(ifa->ifa_name, md->md_ifnam, IFNAMSIZ) == 0) - if (ifa->ifa_addr->sa_family == family) { - sin6ptr = (struct sockaddr_in6 *)ifa->ifa_addr; - sock = socket(PF_INET6, SOCK_STREAM, 0); - - memcpy(&sin6.sin6_addr, &sin6ptr->sin6_addr, - sizeof(struct in6_addr)); - - error = bind(sock, (const struct sockaddr *)&sin6, - sizeof(struct sockaddr_in6)); - listen(sock, 10); - md->md_tcp6[i++] = sock; - } + if (ifa->ifa_addr->sa_family != family) + continue; + if (strncmp(ifa->ifa_name, md->md_ifnam, IFNAMSIZ) != 0) + continue; + sin6ptr = (struct sockaddr_in6 *)ifa->ifa_addr; + sock = socket(PF_INET6, SOCK_STREAM, 0); + memcpy(&sin6.sin6_addr, &sin6ptr->sin6_addr, + sizeof(struct in6_addr)); + error = bind(sock, (const struct sockaddr *)&sin6, + sizeof(struct sockaddr_in6)); + listen(sock, 10); + md->md_tcp6[i++] = sock; } md->md_flags |= MDNS_TCP6; break; @@ -494,9 +503,11 @@ goto out; } + RW_UNLOCK(md, md_lock); freeifaddrs(ifap); return (0); out: + RW_UNLOCK(md, md_lock); freeifaddrs(ifap); return (-1); } @@ -512,12 +523,13 @@ int i; MDNS_INIT_ASSERT(md, md_magic); + RW_WLOCK(md, md_lock); switch (family) { case PF_INET: if (!(md->md_flags & MDNS_TCP4)) { errno = ENOTCONN; - return (-1); + goto out; } for (i = 0; i < md->md_tcp4_sz; i++) close(md->md_tcp4[i]); @@ -529,7 +541,7 @@ case PF_INET6: if (!(md->md_flags & MDNS_TCP6)) { errno = ENOTCONN; - return (-1); + goto out; } for (i = 0; i < md->md_tcp6_sz; i++) close(md->md_tcp6[i]); @@ -540,9 +552,13 @@ #endif default: errno = EPROTONOSUPPORT; - return (-1); + goto out; } + RW_UNLOCK(md, md_lock); return (0); +out: + RW_UNLOCK(md, md_lock); + return (-1); } /* @@ -559,6 +575,7 @@ int *ret = NULL; MDNS_INIT_ASSERT(md, md_magic); + RW_RLOCK(md, md_lock); *len = 0; switch (family) { @@ -587,6 +604,7 @@ default: errno = EPROTONOSUPPORT; } + RW_UNLOCK(md, md_lock); return (ret); } @@ -613,7 +631,8 @@ msg.msg_controllen = 0; TAILQ_FOREACH(pkg, &pc->pc_head, p_list) { - iov = malloc(sizeof(struct iovec) * MDNS_BUFHSZ(&pkg->p_buflist)); + iov = malloc(sizeof(struct iovec) * + MDNS_BUFHSZ(&pkg->p_buflist)); i = 0; TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_next) { iov[i].iov_base = MDNS_BUF(buf); @@ -643,9 +662,10 @@ { struct sockaddr *sa; socklen_t salen; - int sock; + int sock, error; MDNS_INIT_ASSERT(md, md_magic); + RW_WLOCK(md, md_lock); switch (family) { case PF_INET: @@ -662,10 +682,13 @@ #endif default: errno = EPROTONOSUPPORT; - return (-1); + goto out; } - return (write_pkgchain(sock, pc, sa, salen)); + error = write_pkgchain(sock, pc, sa, salen); + RW_UNLOCK(md, md_lock); +out: + return (error); } @@ -680,9 +703,10 @@ mdns_send_unicast(struct mdns *md, struct mdns_pkgchain *pc, struct sockaddr *sa, socklen_t salen) { - int sock; + int sock, error; MDNS_INIT_ASSERT(md, md_magic); + RW_RLOCK(md, md_lock); switch (sa->sa_family) { case AF_INET: @@ -695,10 +719,14 @@ #endif default: errno = EPROTONOSUPPORT; - return (-1); + goto out; } - return (write_pkgchain(sock, pc, sa, salen)); + error = write_pkgchain(sock, pc, sa, salen); + RW_UNLOCK(md, md_lock); + return (error); +out: + return (-1); } /* @@ -735,6 +763,7 @@ MDNS_INIT_ASSERT(md, md_magic); MDNS_INIT_ASSERT(pc, pc_magic); + RW_RLOCK(md, md_lock); switch (family) { case PF_INET: @@ -751,17 +780,17 @@ #endif default: errno = EPROTONOSUPPORT; - return (-1); + goto error2; } pkg = pc->pc_pkg != NULL ? pc->pc_pkg : pkg_alloc(pc); if (pkg == NULL) - return (-1); + goto error2; buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, MDNS_BP_HUGE); if (buf == NULL) - return (-1); + goto error2; iov[0].iov_base = MDNS_BUF(buf); iov[0].iov_len = MDNS_BUFSZ(buf); @@ -793,9 +822,12 @@ } #endif + RW_UNLOCK(md, md_lock); return (pkg->p_len); error: mdns_buf_free(md->md_bp, &pkg->p_buflist, buf, 0); +error2: + RW_UNLOCK(md, md_lock); return (-1); } @@ -864,7 +896,8 @@ MDNS_INIT_ASSERT(pc, pc_magic); TAILQ_FOREACH(pkg, &pc->pc_head, p_list) { - iov = malloc(sizeof(struct iovec) * MDNS_BUFHSZ(&pkg->p_buflist)); + iov = malloc(sizeof(struct iovec) * + MDNS_BUFHSZ(&pkg->p_buflist)); i = 0; TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_next) { iov[i].iov_base = MDNS_BUF(buf); @@ -894,15 +927,16 @@ MDNS_INIT_ASSERT(md, md_magic); MDNS_INIT_ASSERT(pc, pc_magic); + RW_RLOCK(md, md_lock); pkg = pc->pc_pkg != NULL ? pc->pc_pkg : pkg_alloc(pc); if (pkg == NULL) - return (-1); + goto error; buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, MDNS_BP_HUGE); if (buf == NULL) - return (-1); + goto error; for (;;) { n = read(sock, MDNS_BUF(buf), MDNS_BUFSZ(buf)); @@ -910,12 +944,13 @@ break; pkg->p_len += n; MDNS_BUFLEN(buf) = n; - if ((size_t)n < MDNS_BUFSZ(buf) || pkg->p_len >= MDNS_PKG_MAX_LEN) + if ((size_t)n < MDNS_BUFSZ(buf) || + pkg->p_len >= MDNS_PKG_MAX_LEN) break; buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); if (buf == NULL) - return (-1); + goto error; } /* @@ -926,9 +961,13 @@ */ buf = mdns_buf_merge(md->md_bp, &pkg->p_buflist, 0); if (buf == NULL) - return (-1); - + goto error; + + RW_UNLOCK(md, md_lock); return (pkg->p_len); +error: + RW_UNLOCK(md, md_lock); + return (-1); } /* @@ -954,37 +993,38 @@ switch (family) { case PF_INET: { - struct ip_mreq mreq; - struct ifreq ifreq; + struct ip_mreq mreq; + struct ifreq ifreq; - error = inet_pton(family, MDNS_MCAST_INET, &mreq.imr_multiaddr); - if (error != 1) - goto error; - if (if_indextoname(ifidx, ifreq.ifr_name) == NULL) - goto error; - error = ioctl(sock, SIOCGIFADDR, &ifreq); - if (error < 0) - goto error; - memcpy(&mreq.imr_interface, - &((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr, - sizeof(struct in_addr)); - error = setsockopt(sock, IPPROTO_IP, - (what ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP), - &mreq, sizeof(struct ip_mreq)); + error = inet_pton(family, MDNS_MCAST_INET, + &mreq.imr_multiaddr); + if (error != 1) + goto error; + if (if_indextoname(ifidx, ifreq.ifr_name) == NULL) + goto error; + error = ioctl(sock, SIOCGIFADDR, &ifreq); + if (error < 0) + goto error; + memcpy(&mreq.imr_interface, + &((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr, + sizeof(struct in_addr)); + error = setsockopt(sock, IPPROTO_IP, + (what ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP), + &mreq, sizeof(struct ip_mreq)); } break; #ifdef INET6 case PF_INET6: { - struct ipv6_mreq mreq6; + struct ipv6_mreq mreq6; - error = inet_pton(family, MDNS_MCAST_INET6, - &mreq6.ipv6mr_multiaddr); - if (error != 1) - goto error; - mreq6.ipv6mr_interface = ifidx; - error = setsockopt(sock, IPPROTO_IPV6, - (what ? IPV6_JOIN_GROUP : IPV6_LEAVE_GROUP), - &mreq6, sizeof(struct ipv6_mreq)); + error = inet_pton(family, MDNS_MCAST_INET6, + &mreq6.ipv6mr_multiaddr); + if (error != 1) + goto error; + mreq6.ipv6mr_interface = ifidx; + error = setsockopt(sock, IPPROTO_IPV6, + (what ? IPV6_JOIN_GROUP : IPV6_LEAVE_GROUP), + &mreq6, sizeof(struct ipv6_mreq)); } break; #endif From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:42:11 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 BDBCC16A403; Mon, 16 Jul 2007 00:42: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 9B58016A401 for ; Mon, 16 Jul 2007 00:42:11 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 742A113C46B for ; Mon, 16 Jul 2007 00:42:11 +0000 (UTC) (envelope-from fli@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 l6G0gBic077737 for ; Mon, 16 Jul 2007 00:42:11 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0gBpJ077734 for perforce@freebsd.org; Mon, 16 Jul 2007 00:42:11 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:42:11 GMT Message-Id: <200707160042.l6G0gBpJ077734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123561 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, 16 Jul 2007 00:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=123561 Change 123561 by fli@fli_nexus on 2007/07/16 00:41:52 Move thread/locking macros into its own file instead of keeping them in the quite heavy weight mdnsd.h Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/threads.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:46: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 5BB4F16A408; Mon, 16 Jul 2007 00:46: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 2867316A403 for ; Mon, 16 Jul 2007 00:46:17 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0112613C4A7 for ; Mon, 16 Jul 2007 00:46:17 +0000 (UTC) (envelope-from fli@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 l6G0kGha077913 for ; Mon, 16 Jul 2007 00:46:16 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0kG6K077910 for perforce@freebsd.org; Mon, 16 Jul 2007 00:46:16 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:46:16 GMT Message-Id: <200707160046.l6G0kG6K077910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123562 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, 16 Jul 2007 00:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123562 Change 123562 by fli@fli_nexus on 2007/07/16 00:45:36 Add an "object allocator", it's used to allocate, common, fixed sized structures that requires many allocations. When an object is freed they are put on a free list for further use, memory is re-claimed when objects haven't been used for a certain amount of time. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:53: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 E942F16A404; Mon, 16 Jul 2007 00:53: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 BE7FB16A402 for ; Mon, 16 Jul 2007 00:53:30 +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 ADE5513C461 for ; Mon, 16 Jul 2007 00:53:30 +0000 (UTC) (envelope-from chub@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 l6G0rUkK087056 for ; Mon, 16 Jul 2007 00:53:30 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0rUmU087053 for perforce@freebsd.org; Mon, 16 Jul 2007 00:53:30 GMT (envelope-from chub@FreeBSD.org) Date: Mon, 16 Jul 2007 00:53:30 GMT Message-Id: <200707160053.l6G0rUmU087053@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 123564 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, 16 Jul 2007 00:53:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=123564 Change 123564 by chub@chub-msdosfs on 2007/07/16 00:52:56 Fixes the spaced indentations to tabs, carrier lines are 4 spaces deeper than previous line. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/boot.c#3 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#4 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bpb.h#3 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/direntry.h#3 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#5 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/boot.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #ifndef lint __RCSID("$NetBSD: boot.c,v 1.9 2003/07/24 19:25:46 ws Exp $"); static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.4 2004/04/20 11:41:57 tjr Exp $"; +"$FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.4 2004/04/20 11:41:57 tjr Exp $"; #endif /* not lint */ #include @@ -52,38 +52,38 @@ int readboot(int dosfs, struct bootblock *boot) { - union bootsector buffer; - union bootsector backup; - struct byte_bpb50 *pfat50; - struct byte_bpb710 *pfat710; - struct byte_Extboot *pfatext; - struct fsinfo fsstruct; + 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, &buffer, sizeof(union bootsector)) - < sizeof(union bootsector)) { + < sizeof(union bootsector)) { perror("could not read boot block"); return FSFATAL; } if (buffer.bs50.bsBootSectSig0 != BOOTSIG0 || - buffer.bs50.bsBootSectSig1 != BOOTSIG1) { + buffer.bs50.bsBootSectSig1 != BOOTSIG1) { pfatal("Invalid signature in boot block: %02x%02x", - buffer.bs50.bsBootSectSig1, - buffer.bs50.bsBootSectSig0); + 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; + /* 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(struct bootblock)); boot->ValidFat = -1; /* decode bios parameter block and store in a compacted - * architecture independent data structure for future use - */ + * architecture independent data structure for future use + */ boot->BytesPerSec = getushort(pfat50->bpbBytesPerSec); boot->SecPerClust = pfat50->bpbSecPerClust; boot->ResSectors = getushort(pfat50->bpbResSectors); @@ -96,23 +96,23 @@ boot->HiddenSecs = getulong(pfat50->bpbHiddenSecs); boot->HugeSectors = getulong(pfat50->bpbHugeSectors); - /* first defaulting to FAT12/FAT16 for number of FAT sectors */ + /* first defaulting to FAT12/FAT16 for number of FAT sectors */ boot->FATsecs = getushort(pfat50->bpbFATsecs); if (boot->RootDirEnts == 0) { - /* FAT32 parsing */ + /* FAT32 parsing */ boot->flags |= FAT32; boot->FATsecs = getulong(pfat710->bpbBigFATsecs); if (pfat710->bpbExtFlags[0] & 0x80) { boot->ValidFat = pfat710->bpbExtFlags[0] & 0x0f; - } + } /* check version number: */ - if (pfat710->bpbFSVers[0] != 0 || - pfat710->bpbFSVers[1] != 0) { + if (pfat710->bpbFSVers[0] != 0 || + pfat710->bpbFSVers[1] != 0) { pfatal("Unknown file system version: %x.%x", - pfat710->bpbFSVers[1], - pfat710->bpbFSVers[0]); + pfat710->bpbFSVers[1], + pfat710->bpbFSVers[0]); return FSFATAL; } @@ -122,27 +122,27 @@ if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET) != boot->FSInfo * boot->BytesPerSec) { - perror("could not seek to fsinfo block to read"); - return FSFATAL; - } + perror("could not seek to fsinfo block to read"); + return FSFATAL; + } - if (read(dosfs, &fsstruct, sizeof(struct fsinfo)) - != sizeof(struct fsinfo)) { + if (read(dosfs, &fsstruct, sizeof(struct fsinfo)) + != sizeof(struct fsinfo)) { perror("could not read fsinfo block"); return FSFATAL; } 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)) { + 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(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); + 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) { @@ -150,7 +150,7 @@ return FSFATAL; } - if (write(dosfs, &fsstruct, sizeof(struct fsinfo)) + if (write(dosfs, &fsstruct, sizeof(struct fsinfo)) != sizeof(struct fsinfo)) { perror("could not write fixed fsinfo"); return FSFATAL; @@ -158,10 +158,10 @@ ret = FSBOOTMOD; } - else { - /* we didn't fix the corrupted FSInfo block */ + else { + /* we didn't fix the corrupted FSInfo block */ boot->FSInfo = 0; - } + } } if (boot->FSInfo != 0) { @@ -175,21 +175,21 @@ return FSFATAL; } - if (read(dosfs, &backup, sizeof(union bootsector)) - != sizeof(union bootsector)) { + if (read(dosfs, &backup, sizeof(union bootsector)) + != sizeof(union bootsector)) { perror("could not read backup bootblock"); return FSFATAL; } - // never written back to disk - //backup.bs710.bsExt.exReserved1 = buffer.bs710.bsExt.exReserved1; + // 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))) { + 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) @@ -198,10 +198,10 @@ return FSFATAL; } - /* 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. - */ + /* 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) @@ -224,7 +224,7 @@ } else boot->NumSectors = boot->HugeSectors; boot->NumClusters = (boot->NumSectors - boot->ClusterOffset) - / boot->SecPerClust; + / boot->SecPerClust; if (boot->flags & FAT32) boot->ClustMask = CLUST32_MASK; @@ -234,7 +234,7 @@ boot->ClustMask = CLUST16_MASK; else { pfatal("Filesystem too big (%u clusters) for non-FAT32 partition", - boot->NumClusters); + boot->NumClusters); return FSFATAL; } @@ -252,7 +252,7 @@ if (boot->NumFatEntries < boot->NumClusters) { pfatal("FAT size too small, %u entries won't fit into %u sectors\n", - boot->NumClusters, boot->FATsecs); + boot->NumClusters, boot->FATsecs); return FSFATAL; } boot->ClusterSize = boot->BytesPerSec * boot->SecPerClust; @@ -266,33 +266,33 @@ int writefsinfo(int dosfs, struct bootblock *boot) { - struct fsinfo fsstruct; + struct fsinfo fsstruct; u_char fsinfo[2 * DOSBOOTBLOCKSIZE]; - 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 (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; - } + 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); + 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 (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"); + perror("could not write fixed fsinfo"); return FSFATAL; } ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#4 (text+ko) ==== @@ -30,8 +30,7 @@ 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 */ - struct bpb33 bsBPB; /* 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; @@ -63,8 +62,8 @@ struct bootsector50 { u_int8_t bsJump[3]; /* jump inst E9xxxx or EBxx90 */ int8_t bsOemName[8]; /* OEM name and version */ - struct bpb50 bsBPB; /* BIOS parameter block */ - struct extboot bsExt; /* 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; @@ -75,8 +74,8 @@ struct bootsector710 { u_int8_t bsJump[3]; /* jump inst E9xxxx or EBxx90 */ int8_t bsOEMName[8]; /* OEM name and version */ - struct bpb710 bsBPB; /* BIOS parameter block */ - struct extboot bsExt; /* 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; ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bpb.h#3 (text+ko) ==== @@ -81,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 */ - u_int8_t bpbReserved[12]; /* 12 byte filler here */ + u_int8_t bpbReserved[12];/* 12 byte filler here */ }; /* @@ -156,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 */ - u_int8_t bpbReserved[12]; /* 12 byte filler here */ + u_int8_t bpbReserved[12]; /* 12 byte filler here */ }; /* ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/direntry.h#3 (text+ko) ==== @@ -88,7 +88,7 @@ #define WIN_CNT 0x3f u_int8_t wePart1[10]; u_int8_t weAttributes; -#define ATTR_WIN95 0x0f /* Long directory entryies */ +#define ATTR_WIN95 0x0f /* Long directory entryies */ u_int8_t weReserved1; u_int8_t weChksum; u_int8_t wePart2[12]; ==== //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#5 (text+ko) ==== @@ -50,11 +50,11 @@ g_label_msdosfs_taste(struct g_consumer *cp, char *label, size_t size) { struct g_provider *pp; - union bootsector *bsp; - struct byte_bpb50 *pfat_bpb50; - struct byte_bpb710 *pfat_bpb710; - struct extboot *pfat_extboot; - struct direntry* pfat_entry; + union bootsector *bsp; + struct byte_bpb50 *pfat_bpb50; + struct byte_bpb710 *pfat_bpb710; + struct extboot *pfat_extboot; + struct direntry* pfat_entry; uint8_t *sector0, *sector; uint32_t i; @@ -82,17 +82,15 @@ if (sector0 == NULL) return; - /* 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; + /* 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; /* Check for the FAT boot sector signature. */ if (bsp->bs50.bsBootSectSig0 != BOOTSIG0 || - bsp->bs50.bsBootSectSig1 != BOOTSIG1) { - G_LABEL_DEBUG(1, - "MSDOSFS: %s: no FAT signature found.", - pp->name); + bsp->bs50.bsBootSectSig1 != BOOTSIG1) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT signature found.", pp->name); goto error; } @@ -101,52 +99,51 @@ * Test if this is really a FAT volume and determine the FAT type. */ if (getushort(pfat_bpb50->bpbFATsecs) != 0) { - /* The extended boot record is one place for FAT12/FAT16 - * and another for FAT32. - */ + /* + * The extended boot record is one place for FAT12/FAT16 + * 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 - * the string "FAT" is at the right place, this should - * be a FAT12 or FAT16 volume. + * the string "FAT" is at the right place, this should + * be a FAT12 or FAT16 volume. */ if (strncmp(pfat_extboot->exFileSysType, "FAT", 3) != 0) { - G_LABEL_DEBUG(1, - "MSDOSFS: %s: FAT12/16 volume not valid.", + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT12/16 volume not valid.", pp->name); goto error; } - G_LABEL_DEBUG(1, - "MSDOSFS: %s: FAT12/FAT16 volume detected.", - pp->name); + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT12/FAT16 volume detected.", + pp->name); /* A volume with no name should have "NO NAME " as label. */ if (strncmp(pfat_extboot->exVolumeLabel, LABEL_NO_NAME, - sizeof(pfat_extboot->exVolumeLabel)) == 0) { - G_LABEL_DEBUG(1, - "MSDOSFS: %s: FAT12/16 volume has no name.", + sizeof(pfat_extboot->exVolumeLabel)) == 0) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT12/16 volume has no name.", pp->name); goto error; } strlcpy(label, pfat_extboot->exVolumeLabel, MIN(size, sizeof(pfat_extboot->exVolumeLabel) + 1)); } - else if (getulong(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 - * and another for FAT32. - */ + /* + * The extended boot record is one place for FAT12/FAT16 + * 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 - * and the string "FAT" is at the right place, this - * should be a FAT32 volume. + * and the string "FAT" is at the right place, this + * should be a FAT32 volume. */ if (strncmp(pfat_extboot->exFileSysType, "FAT", 3) != 0) { @@ -154,14 +151,13 @@ pp->name); goto error; } - G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume detected.", - pp->name); + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume detected.", pp->name); /* * If the volume label is not "NO NAME " we're done. */ if (strncmp(pfat_extboot->exVolumeLabel, LABEL_NO_NAME, - sizeof(pfat_extboot->exVolumeLabel)) == 0) { + sizeof(pfat_extboot->exVolumeLabel)) == 0) { strlcpy(label, pfat_extboot->exVolumeLabel, MIN(size, sizeof(pfat_extboot->exVolumeLabel) + 1)); goto endofchecks; @@ -175,7 +171,7 @@ fat_FirstDataSector = getushort(pfat_bpb710->bpbResSectors) + (pfat_bpb710->bpbFATs * - getulong(pfat_bpb710->bpbBigFATsecs)); + getulong(pfat_bpb710->bpbBigFATsecs)); fat_BytesPerSector = getushort(pfat_bpb710->bpbBytesPerSec); G_LABEL_DEBUG(2, @@ -183,7 +179,7 @@ fat_FirstDataSector, fat_BytesPerSector); for (offset = fat_BytesPerSector * fat_FirstDataSector;; - offset += fat_BytesPerSector) { + offset += fat_BytesPerSector) { sector = (uint8_t *)g_read_data(cp, offset, fat_BytesPerSector, NULL); if (sector == NULL) @@ -214,7 +210,7 @@ ATTR_DIRECTORY) { strlcpy(label, pfat_entry->deName, MIN(size, - sizeof(pfat_extboot->exVolumeLabel) + 1)); + sizeof(pfat_extboot->exVolumeLabel) + 1)); goto endofchecks; } } while((uint8_t *)(++pfat_entry) < From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:55: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 F146716A404; Mon, 16 Jul 2007 00:55: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 B655416A402 for ; Mon, 16 Jul 2007 00:55:33 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A627313C441 for ; Mon, 16 Jul 2007 00:55:33 +0000 (UTC) (envelope-from fli@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 l6G0tX6p087198 for ; Mon, 16 Jul 2007 00:55:33 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0tXwn087195 for perforce@freebsd.org; Mon, 16 Jul 2007 00:55:33 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:55:33 GMT Message-Id: <200707160055.l6G0tXwn087195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123565 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, 16 Jul 2007 00:55:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=123565 Change 123565 by fli@fli_nexus on 2007/07/16 00:54:49 - Revisit packet construction. Instead of writing raw packets directly into a buffer, rrset/qset objects are kept on a list and the packet is written first when mdns_pkgchain_finalize(). is called. This simplifies packet constructions, allows resources to be both added and removed from a packet during construction. It also have the neat side effect that the heavy finalizing step can be moved to the output queue thread. - Use object allocator for packets. - Style fixes Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#6 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#7 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#6 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include "stack_buf.h" +#include "threads.h" /* * Multicast DNS handle, holds socket and buffer information @@ -43,6 +44,7 @@ struct mdns { MAGIC(md_magic); char md_ifnam[IFNAMSIZ + 1]; + DEF_RW(md_lock); int md_ifindex; int md_flags; #define MDNS_UDP4 0x0001 /* udp inet4 socket open */ @@ -74,16 +76,17 @@ */ enum { MDNS_UDP, MDNS_TCP }; + /* * Packet buffer */ -struct mdns_namcomp; struct mdns_pkgchain; +struct mdns_pkg_res; struct mdns_packet { - uint32_t p_magic; + MAGIC(p_magic); struct mdns_pkgchain *p_pc; TAILQ_ENTRY(mdns_packet) p_list; /* packet list */ - size_t p_len; /* total packet length */ + size_t p_len; /* total packet length (without compression) */ struct mdns_bufhead p_buflist; /* @@ -96,37 +99,37 @@ char *bufptr; /* Direct buffer data pointer */ char **offsets; /* Section offset pointers */ int last_offset; + TAILQ_HEAD(, mdns_pkg_res) res_head; } p_data[4]; #define p_buf(x) p_data[x].bufptr #define p_bufseg(x) p_data[x].buf #define p_secoff(x) p_data[x].offsets #define p_loff(x) p_data[x].last_offset; +#define p_res(x) p_data[x].res_head; #define p_hdr 0 #define p_questions 1 #define p_answers 2 #define p_auths 3 #define p_isrrset(x) ((x) > 1) /* 0 = qset, 1 = rrset */ +}; - struct hashtbl *p_nc_tbl; /* Name compression hash */ -}; +/* + * Packet construction flags + */ +#define MDNS_PKG_NOAE 0x01 /* Do not auto-expand pkg chain */ +#define MDNS_PKG_DUP 0x02 /* Duplicate rrset/qset */ /* * Packet chain */ -typedef int (*md_lock)(void *); -typedef int (*md_unlock)(void *); struct mdns_pkgchain { MAGIC(pc_magic); TAILQ_HEAD(, mdns_packet) pc_head; /* packet list */ - int pc_list_len; /* packet list length */ int pc_flags; #define MDNS_PC_NONE 0x0 #define MDNS_PC_CONT 0x1 struct mdns *pc_md; /* back pointer */ struct mdns_packet *pc_pkg; /* current pkg buffer */ - md_lock pc_lock; /* lock function */ - md_unlock pc_unlock; /* lock function */ - void *pc_lockarg; /* lock argument */ }; @@ -183,7 +186,8 @@ * MDNS resource set */ struct mdns_rrset { - char r_name[MDNS_RECORD_LEN + 1]; /* rrset name */ + char name[MDNS_RECORD_LEN + 1]; /* rrset name */ + char *r_name; uint16_t r_class; /* rrset class */ uint16_t r_type; /* Record type */ int r_cflush; /* cache flush */ @@ -192,16 +196,42 @@ char *r_data; /* Resource data */ }; +#define mdns_rrset_name(rr, str) (rr)->r_name = str +#define mdns_rrset_name_dup(rr, str) \ + strncpy((rr)->name, str, MDNS_RECORD_LEN); \ + (rr)->r_name = (rr)->name; + /* * MDNS question/query set */ struct mdns_qset { - char q_name[MDNS_RECORD_LEN + 1]; /* qname */ + char name[MDNS_RECORD_LEN + 1]; /* qname */ + char *q_name; uint16_t q_class; /* qset class */ uint16_t q_type; /* query type */ int q_unicast; /* unicast desired */ }; +#define mdns_qset_name(qs, str) (qs)->q_name = str +#define mdns_qset_name_dup(qs, str) \ + strncpy((qs)->name, str, MDNS_RECORD_LEN); \ + (qs)->q_name = (qs)->name; + +/* + * Packet resource + * Used during packet construction + */ +struct mdns_pkg_res { + MAGIC(pr_magic); + TAILQ_ENTRY(mdns_pkg_res) pr_next; + int pr_what; /* rrset/qset */ + size_t pr_namlen; /* record name length */ + union { + struct mdns_rrset rs; + struct mdns_qset qs; + } pr_res; +}; + /* * Name/Resource encoding flags */ @@ -234,16 +264,27 @@ void *); int mdns_bufpool_destroy(struct mdns_bufpool *); -void mdns_pkgchain_init(struct mdns *, struct mdns_pkgchain *, - int, md_lock, md_unlock, void *); -void mdns_pkgchain_free(struct mdns *, struct mdns_pkgchain *); +void mdns_pkgchain_init(struct mdns *, struct mdns_pkgchain *, int); +void mdns_pkgchain_free(struct mdns_pkgchain *); struct mdns_packet * mdns_pkgchain_curpkg(struct mdns_pkgchain *); +void mdns_pkgchain_expand(struct mdns_pkgchain *); + +struct mdns_rrset * mdns_pkg_getrrset(void); +struct mdns_qset * mdns_pkg_getqset(void); +void mdns_pkg_freeset(void *); int mdns_pkg_sethdr(struct mdns_pkgchain *, uint16_t, int); int mdns_pkg_gethdr(struct mdns_packet *, struct mdns_head *); int mdns_pkg_addquestion(struct mdns_pkgchain *, struct mdns_qset *, int); +struct mdns_qset * mdns_pkg_delquestion(struct mdns_pkgchain *, + struct mdns_qset *); int mdns_pkg_addanswer(struct mdns_pkgchain *, struct mdns_rrset *, int); +struct mdns_rrset * mdns_pkg_delanswer(struct mdns_pkgchain *, + struct mdns_rrset *); int mdns_pkg_addauth(struct mdns_pkgchain *, struct mdns_rrset *, int); +struct mdns_rrset * mdns_pkg_delauth(struct mdns_pkgchain *, + struct mdns_rrset *); +int mdns_pkgchain_finalize(struct mdns_pkgchain *); int mdns_pkg_getquestion(struct mdns_packet *, int, struct mdns_qset *); int mdns_pkg_getanswer(struct mdns_packet *, int, struct mdns_rrset *); int mdns_pkg_getauth(struct mdns_packet *, int, struct mdns_rrset *); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#7 (text+ko) ==== @@ -36,9 +36,12 @@ #include #include +#include "debug.h" +#include "hash.h" +#include "log.h" #include "mdns.h" +#include "objalloc.h" #include "stack_mdns.h" -#include "hash.h" static inline char * skipname(char *, char *); static int name_compress(struct hashtbl *, char *, size_t, char *, @@ -48,9 +51,13 @@ static inline void res_encode(struct hashtbl *, char *, uint16_t, char *, size_t *, int); -static inline void free_pkg(struct mdns_packet *, struct mdns_bufpool *); +static void pkg_free(struct mdns_pkgchain *, struct mdns_packet *); +static int pkg_write(struct mdns_packet *, struct mdns_bufpool *); -static int addres(struct mdns_pkgchain *pc, int, struct mdns_rrset *, int); +static int addres(struct mdns_pkgchain *, int, void *, int, + struct mdns_packet **); +static struct mdns_pkg_res * delres(struct mdns_pkgchain *, int, void *, + struct mdns_packet **); static int getres(struct mdns_packet *, int, int, void *); enum { @@ -66,46 +73,68 @@ struct mdns_packet * pkg_alloc(struct mdns_pkgchain *pc) { - struct mdns *md; struct mdns_packet *pkg; - struct mdns_bufpool *bp; + int i; - md = pc->pc_md; - if (pc->pc_lock != NULL) - pc->pc_lock(pc->pc_lockarg); - - bp = md->md_bp; - - if (!TAILQ_EMPTY(&md->md_pkglist)) { - pkg = TAILQ_FIRST(&md->md_pkglist); - TAILQ_REMOVE(&md->md_pkglist, pkg, p_list); - md->md_pkgfree--; - } - else { - pkg = malloc(sizeof(struct mdns_packet)); - if (pkg == NULL) - goto error; - md->md_pkgtotal++; - } - + MDNS_INIT_ASSERT(pc, pc_magic); + pkg = obj_alloc(OBJ_PKG); bzero(pkg, sizeof(struct mdns_packet)); pkg->p_pc = pc; pc->pc_pkg = pkg; + for (i = 0; i < 4; i++) + TAILQ_INIT(&pkg->p_data[i].res_head); + MDNS_INIT_SET(pkg, p_magic); TAILQ_INSERT_TAIL(&pc->pc_head, pkg, p_list); - pc->pc_list_len++; - if (pc->pc_unlock != NULL) - pc->pc_unlock(pc->pc_lockarg); - + dprintf(DEBUG_STACK, "Allocated packet pkg=%x (pc=%x)", pkg, pc); return (pkg); -error: - if (pc->pc_unlock != NULL) - pc->pc_unlock(pc->pc_lockarg); - return (NULL); } /* + * Deallocates a packet from a packet chain and releases any + * allocted resources. + * pc - Packet chain + * pkg - Packet to remove (it's assumed that pkg belongs to pc) + */ +static void +pkg_free(struct mdns_pkgchain *pc, struct mdns_packet *pkg) +{ + struct mdns_pkg_res *pr, *pr2; + struct mdns_bufpool *bp; + struct mdns_buf *buf; + struct mdns *md; + int i; + + MDNS_INIT_ASSERT(pkg, p_magic); + MDNS_INIT_ASSERT(pc, pc_magic); + md = pc->pc_md; + MDNS_INIT_ASSERT(md, md_magic); + bp = md->md_bp; + + TAILQ_REMOVE(&pc->pc_head, pkg, p_list); + + /* Return buffers allocated to this packet */ + while (!TAILQ_EMPTY(&pkg->p_buflist.bh_list)) { + buf = TAILQ_FIRST(&pkg->p_buflist.bh_list); + mdns_buf_free(bp, &pkg->p_buflist, buf, 1); + } + + for (i = 0; i < 4; i++) { + /* Free saved pointers if any */ + if (pkg->p_data[i].offsets != NULL) + free(pkg->p_data[i].offsets); + /* Release pkg_res {} objects allocated during pkg creation */ + TAILQ_FOREACH_SAFE(pr, &pkg->p_data[i].res_head, pr_next, pr2) { + TAILQ_REMOVE(&pkg->p_data[i].res_head, pr, pr_next); + obj_free(OBJ_PKGRES, pr); + } + } + dprintf(DEBUG_STACK, "Packet pkg=%x freed (bp=%x)", pkg, bp); + obj_free(OBJ_PKG, pkg); +} + +/* * Initialize a packet chain. * A packet chain consists of one or more packets, each packet is built * using one or more buffer segments. @@ -118,95 +147,59 @@ * arg - locking argument */ void -mdns_pkgchain_init(struct mdns *md, struct mdns_pkgchain *pc, - int flags, md_lock lock, md_unlock unlock, void *arg) +mdns_pkgchain_init(struct mdns *md, struct mdns_pkgchain *pc, int flags) { - assert((lock == NULL && unlock == NULL) || (lock != unlock)); + MDNS_INIT_ASSERT(md, md_magic); pc->pc_md = md; - pc->pc_lock = lock; - pc->pc_unlock = unlock; - pc->pc_lockarg = arg; pc->pc_pkg = NULL; - pc->pc_list_len = 0; pc->pc_flags = flags; TAILQ_INIT(&pc->pc_head); MDNS_INIT_SET(pc, pc_magic); + dprintf(DEBUG_STACK, "Packet chain pc=%x initialized", pc); } /* - * Release resources allocated to a packet - */ -static inline void -free_pkg(struct mdns_packet *pkg, struct mdns_bufpool *bp) -{ - struct mdns_buf *buf; - int i; - - /* Return buffers allocated to this packet */ - while (!TAILQ_EMPTY(&pkg->p_buflist.bh_list)) { - buf = TAILQ_FIRST(&pkg->p_buflist.bh_list); - mdns_buf_free(bp, &pkg->p_buflist, buf, 1); - } - - /* Free saved pointers if any */ - for (i = 0; i < 4; i++) { - if (pkg->p_data[i].offsets != NULL) - free(pkg->p_data[i].offsets); - } - - /* Free name compression hash if any */ - if (pkg->p_nc_tbl != NULL) { - hashtbl_destroy(pkg->p_nc_tbl); - free(pkg->p_nc_tbl); - } -} - -/* * Release resources allocated to a packet chain * md - mdns handle * pc - packet chain */ void -mdns_pkgchain_free(struct mdns *md, struct mdns_pkgchain *pc) +mdns_pkgchain_free(struct mdns_pkgchain *pc) { - struct mdns_packet *pkg; - int i; + struct mdns_packet *pkg, *pkg2; MDNS_INIT_ASSERT(pc, pc_magic); - - while (!TAILQ_EMPTY(&pc->pc_head)) { - pkg = TAILQ_FIRST(&pc->pc_head); - TAILQ_REMOVE(&pc->pc_head, pkg, p_list); - free_pkg(pkg, md->md_bp); - TAILQ_INSERT_TAIL(&md->md_pkglist, pkg, p_list); - md->md_pkgfree++; + TAILQ_FOREACH_SAFE(pkg, &pc->pc_head, p_list, pkg2) { + pkg_free(pc, pkg); } - - i = (md->md_pkgfree - 1) / 2; - for (; i > 0; i--) { - pkg = TAILQ_FIRST(&md->md_pkglist); - if (pkg == NULL) - break; - TAILQ_REMOVE(&md->md_pkglist, pkg, p_list); - free(pkg); - md->md_pkgtotal--; - md->md_pkgfree--; - } - - MDNS_INIT_UNSET(pc, pc_magic); } +/* + * Return the current packet from a packet chain + */ struct mdns_packet * mdns_pkgchain_curpkg(struct mdns_pkgchain *pc) { + MDNS_INIT_ASSERT(pc, pc_magic); return (pc->pc_pkg); } /* + * Expand a chain with a new packet + */ +void +mdns_pkgchain_expand(struct mdns_pkgchain *pc) +{ + + MDNS_INIT_ASSERT(pc, pc_magic); + pkg_alloc(pc); +} + +/* * Returns a pointer to the last byte in a dns name * str - Start of dns name * end - End of buffer @@ -276,9 +269,9 @@ res = NULL; /* - * Perform a longest-sub-label match against the hash table, if a match - * is found the labels already exists within the packet and a pointer - * can be created. + * Perform a longest-sub-label match against the hash table, if a + * match is found the labels already exists within the packet and + * a pointer can be created. * As we test and miss we insert the sub-labels tested into the * hash table for further use. */ @@ -288,14 +281,14 @@ break; offset = pkg_offset; - hashtbl_add(ht, p, q - p, (void *)(int)offset, 0); + hashtbl_add(ht, p, q - p, (void *)(long)offset, 0); pkg_offset += (*p + 1); p += *p + 1; } /* A match was found, setup a pointer in `dst' and adjust length */ if (res != NULL) { - offset = 0xc000 + (int)res; + offset = 0xc000 + ((long)res & ~0xc000); MDNS_WRITE2(&dst[p - dst], htons(offset)); *dlen = p - dst + 2; } @@ -318,7 +311,7 @@ */ static int name_decompress(char *name, char *dst, size_t dstlen, char *buf, - size_t pkglen) + size_t pkglen) { char *p, *q, val; uint16_t offset; @@ -369,7 +362,8 @@ if (p == NULL) return (NULL); memcpy(p, res, 6); - error = name_decompress(res + 6, p + 6, MDNS_RECORD_LEN, buf, pkglen); + error = name_decompress(res + 6, p + 6, MDNS_RECORD_LEN, + buf, pkglen); if (error != 0) { free(p); return (NULL); @@ -400,7 +394,7 @@ /* * Labelize (and name compress) resource data that needs it */ -static inline void +static inline void res_encode(struct hashtbl *ht, char *buf, uint16_t type, char *res, size_t *rlen, int plen) { @@ -408,7 +402,7 @@ switch (type) { case mdns_in_ptr: case mdns_in_cname: - name_compress(ht, res, *rlen, buf, rlen, plen); + name_compress(ht, res, *rlen, buf, rlen, plen); break; default: memcpy(buf, res, *rlen); @@ -429,16 +423,18 @@ struct mdns_buf *buf; struct mdns_header *h; + MDNS_INIT_ASSERT(pc, pc_magic); pkg = pc->pc_pkg; if (pkg == NULL) pkg = pkg_alloc(pc); + MDNS_INIT_ASSERT(pkg, p_magic); buf = MDNS_BUFH(&pkg->p_buflist); - if (buf == NULL) + if (buf == NULL) { buf = mdns_buf_alloc(pc->pc_md->md_bp, &pkg->p_buflist, 0, 0); - - bzero(MDNS_BUF(buf), MDNS_HEADER_LEN); + bzero(MDNS_BUF(buf), MDNS_HEADER_LEN); + } pkg->p_bufseg(p_hdr) = buf; pkg->p_buf(p_hdr) = MDNS_BUF(buf); @@ -462,6 +458,8 @@ struct mdns_header *h; struct mdns_buf *buf; + MDNS_INIT_ASSERT(pkg, p_magic); + if (pkg->p_len < MDNS_HEADER_LEN) { errno = EBADMSG; return (-1); @@ -497,299 +495,517 @@ } /* - * Add a question to a packet chain - * pc - Package chain - * qs - Question set - * unicast - Unicast response desired + * Allocate a mdns_pkg_res {} object + */ +static inline struct mdns_pkg_res * +get_resource(void) +{ + struct mdns_pkg_res *pr; + + pr = obj_alloc(OBJ_PKGRES); + MDNS_INIT_SET(pr, pr_magic); + return (pr); +} + +/* + * Free a mdns_pkg_res {} object + * pr - Pointer to previously allocated object + */ +static inline void +free_resource(struct mdns_pkg_res *pr) +{ + + MDNS_INIT_UNSET(pr, pr_magic); + obj_free(OBJ_PKGRES, pr); +} + +/* + * Allocate a mdns_rrset {} object + * In reality, a mdns_pkg_res {} object is allocated and a pointer to + * its mdns_rrset member is returned. + */ +struct mdns_rrset * +mdns_pkg_getrrset(void) +{ + struct mdns_pkg_res *pr; + + pr = get_resource(); + pr->pr_what = 1; + return (&pr->pr_res.rs); +} + +/* + * Allocate a mdns_qset {} object + * In reality, a mdns_pkg_res {} object is allocated and a pointer to + * its mdns_qset member is returned. + */ +struct mdns_qset * +mdns_pkg_getqset(void) +{ + struct mdns_pkg_res *pr; + + pr = get_resource(); + pr->pr_what = 0; + return (&pr->pr_res.qs); +} + +/* + * Free a {rr,q}set obtained from mdns_pkg_get{rrset,qset} + */ +void +mdns_pkg_freeset(void *res) +{ + struct mdns_pkg_res *pr; + + pr = (struct mdns_pkg_res *)((char *)res - + (sizeof(struct mdns_pkg_res) - sizeof(pr->pr_res))); + + MDNS_INIT_ASSERT(pr, pr_magic); + free_resource(pr); +} + +/* + * Add a resource to a packet chain + * pc - Packet chain + * sec - Packet section (SEC_{QUESTIONS,AUTHORITY,ANSWERS} + * set - A pointer to either mdns_{rrset,qset} + * flags - Construction flags + * hpkg - Will be set to the packet where the header is + * + * This works as a wrapper around mdns_add_{question,answer,auth} */ -int -mdns_pkg_addquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs, - int unicast) +static int +addres(struct mdns_pkgchain *pc, int sec, void *set, int flags, + struct mdns_packet **hpkg) { - char namc[MDNS_RECORD_LEN]; - struct mdns_packet *pkg, *hpkg; - struct mdns_bufpool *bp; - struct mdns_buf *buf; + struct mdns_pkg_res *pr; + struct mdns_packet *pkg; + struct mdns *md; struct mdns_header *h; - struct mdns_qsec qsec; - size_t namlen, namclen; - int i, error, flags; - uint16_t class; + size_t slen; + struct mdns_head head; + + MDNS_INIT_ASSERT(pc, pc_magic); + md = pc->pc_md; + MDNS_INIT_ASSERT(md, md_magic); - bp = pc->pc_md->md_bp; - pkg = pc->pc_pkg; - if (pkg == NULL) { - errno = EINVAL; - return (-1); + /* + * Duplicate the resource set if the duplicate flags was passed, + * this should only be done if `set' wasn't allocated using + * mdns_get_{rrset,qset}. + */ + if (flags & MDNS_PKG_DUP) { + pr = get_resource(); + if (sec == SEC_QUESTIONS) { + memcpy(&pr->pr_res.qs, (char *)set, + sizeof(struct mdns_qset)); + pr->pr_what = 0; + } + else { + memcpy(&pr->pr_res.rs, (char *)set, + sizeof(struct mdns_rrset)); + pr->pr_what = 1; + } } - - if (pkg->p_bufseg(p_questions) == NULL) { - pkg->p_bufseg(p_questions) = mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0); - pkg->p_buf(p_questions) = MDNS_BUF(pkg->p_bufseg(p_questions)); + else { + pr = (struct mdns_pkg_res *)((char *)set - + (sizeof(struct mdns_pkg_res) - sizeof(pr->pr_res))); } - buf = pkg->p_bufseg(p_questions); + MDNS_INIT_ASSERT(pr, pr_magic); - namlen = strlen(qs->q_name); - i = namlen + 1 + MDNS_QSET_HLEN; + pkg = pc->pc_pkg; + if (pkg == NULL) + pkg = pkg_alloc(pc); /* - * Expand packet chains, buffer chains and buffers if needed + * This is safe as the record name is the first member of + * both mdns_rrset {} and mdns_qset {} */ - if (pc->pc_flags & MDNS_PC_CONT) { - if ((i + MDNS_BUFLEN(buf)) > MDNS_BUFSZ(buf)) { - error = mdns_buf_expand(buf, 0); - if (error != 0) + slen = pr->pr_namlen = strlen(pr->pr_res.qs.q_name); + if (pr->pr_what) + slen += MDNS_RRSET_HLEN + pr->pr_res.rs.r_datalen; + else + slen += MDNS_QSET_HLEN; + + if (!(pc->pc_flags & MDNS_PC_CONT)) { + if (pkg->p_len + slen > md->md_maxpkgsz) { + if (flags & MDNS_PKG_NOAE) { + errno = EMSGSIZE; return (-1); - pkg->p_buf(p_questions) = MDNS_BUF(buf); - } - } - else { - if (pkg->p_len + i > pc->pc_md->md_maxpkgsz) { + } h = (struct mdns_header *)pkg->p_buf(p_hdr); h->h_tc = 1; + mdns_pkg_gethdr(pkg, &head); pkg = pkg_alloc(pc); - flags = MDNS_HEAD_QUERY; - if (h->h_aa) - flags |= MDNS_HEAD_AA; - mdns_pkg_sethdr(pc, 0, flags); - buf = mdns_buf_alloc(pc->pc_md->md_bp, &pkg->p_buflist, 0, 0); - pkg->p_bufseg(p_questions) = buf; - pkg->p_buf(p_questions) = MDNS_BUF(buf); + mdns_pkg_sethdr(pc, head.h_id, head.h_flags); + + /* + * Only one resource record is allowed in + * super-sized packets, make sure the next + * record/query gets a new packet. + */ + if (pr->pr_what && pr->pr_res.rs.r_datalen > + md->md_maxpkgsz) { + pkg_alloc(pc); + mdns_pkg_sethdr(pc, head.h_id, head.h_flags); + } } - else if ((i + MDNS_BUFLEN(buf)) > MDNS_BUFSZ(buf)) { - error = mdns_buf_expand(buf, 0); - if (error != 0) - return (-1); - pkg->p_buf(p_questions) = MDNS_BUF(buf); - } + } + + TAILQ_INSERT_TAIL(&pkg->p_data[sec].res_head, pr, pr_next); + pkg->p_len += slen; + + if (pc->pc_flags & MDNS_PC_CONT) + *hpkg = TAILQ_FIRST(&pc->pc_head); + else + *hpkg = pkg; + if (*hpkg == NULL) { + mdns_pkg_sethdr(pc, 0, MDNS_HEAD_AA | + (sec == SEC_QUESTIONS ? MDNS_HEAD_QUERY : MDNS_HEAD_RESP)); + *hpkg = pkg; } + return (0); +} + +/* + * Remove a resource from a packet chain + * pc - Packet chain + * sec - Section + * hpkg - Will be set to header packet + * + */ +static struct mdns_pkg_res * +delres(struct mdns_pkgchain *pc, int sec, void *set, + struct mdns_packet **hpkg) +{ + struct mdns_pkg_res *pr; + struct mdns_packet *pkg; + size_t slen; + struct mdns_qset *qs = set; + struct mdns_rrset *rs = set; - if (pkg->p_nc_tbl == NULL) { - pkg->p_nc_tbl = malloc(sizeof(struct hashtbl)); - hashtbl_init(pkg->p_nc_tbl, 8, 256, 5); + MDNS_INIT_ASSERT(pc, pc_magic); + pkg = pc->pc_pkg; + + /* + * The fields class, type and names are identical in mdns_{qset,rrset} + */ + TAILQ_FOREACH(pr, &pkg->p_data[sec].res_head, pr_next) { + if (pr->pr_res.qs.q_class != qs->q_class || + pr->pr_res.qs.q_type != qs->q_type) + continue; + if (strncmp(pr->pr_res.qs.q_name, qs->q_name, + MDNS_RECORD_LEN) == 0) { + if (sec == SEC_QUESTIONS) + break; + if (pr->pr_res.rs.r_datalen != rs->r_datalen) + continue; + if (memcmp(pr->pr_res.rs.r_data, rs->r_data, + rs->r_datalen) == 0) + break; + } + else { + continue; + } } - namclen = MDNS_RECORD_LEN; - error = name_compress(pkg->p_nc_tbl, qs->q_name, namlen, namc, &namclen, - pkg->p_len); - if (error != 0) - return (-1); + if (pr == NULL) + return (NULL); + MDNS_INIT_ASSERT(pr, pr_magic); - memcpy(MDNS_BUFPOS(buf), namc, namlen); - MDNS_BUFLEN(buf) += namlen; + slen = pr->pr_namlen = strlen(pr->pr_res.qs.q_name); + if (pr->pr_what) + slen += MDNS_RRSET_HLEN + pr->pr_res.rs.r_datalen; + else + slen += MDNS_QSET_HLEN; - class = qs->q_class; - if (unicast) - class |= 0x8000; - qsec.qs_class = ntohs(class); - qsec.qs_type = htons(qs->q_type); + pkg->p_len -= slen; + TAILQ_REMOVE(&pkg->p_data[sec].res_head, pr, pr_next); - memcpy(MDNS_BUFPOS(buf), &qsec, sizeof(struct mdns_qsec)); - MDNS_BUFLEN(buf) += MDNS_QSET_HLEN; - pkg->p_len += MDNS_QSET_HLEN + namlen; - if (pc->pc_flags & MDNS_PC_CONT) - hpkg = TAILQ_FIRST(&pc->pc_head); + *hpkg = TAILQ_FIRST(&pc->pc_head); else - hpkg = pkg; + *hpkg = pkg; + return (pr); +} + +/* + * Adds a question to a packet chain + * pc - Packet chain + * qs - Pointer to mdns_qset {} containing construction information + * flags - Construction flags + * + * `qs' must be allocated using mdns_get_qset{}, else MDNS_PKG_DUP must + * be passed as one of the flags. + */ +int +mdns_pkg_addquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs, + int flags) +{ + struct mdns_header *h; + struct mdns_packet *hpkg; + int error; - h = (struct mdns_header *)pkg->p_buf(p_hdr); + error = addres(pc, SEC_QUESTIONS, qs, flags, &hpkg); + if (error != 0) + return (error); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); h->h_qcount = htons(ntohs(h->h_qcount) + 1); - return (0); } - -int -mdns_pkg_addanswer(struct mdns_pkgchain *pc, struct mdns_rrset *rs, int flush) +/* + * Remove a question from a packet chain + * pc - Packet chain + * qs - Pointer to mdns_qset {} previsouly added + */ +struct mdns_qset * +mdns_pkg_delquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs) { + struct mdns_header *h; + struct mdns_packet *hpkg; + struct mdns_pkg_res *pr; - return (addres(pc, SEC_ANSWERS, rs, flush)); + pr = delres(pc, SEC_QUESTIONS, qs, &hpkg); + if (pr == NULL) + return (NULL); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); + h->h_qcount = htons(ntohs(h->h_qcount) - 1); + return (&pr->pr_res.qs); } +/* + * Adds an authority resource to a packet chain + * pc - Packet chain + * qs - Pointer to mdns_rrset {} containing construction information + * flags - Construction flags + * + * `rs' must be allocated using mdns_get_rrset{}, else MDNS_PKG_DUP must + * be passed as one of the flags. + */ int -mdns_pkg_addauth(struct mdns_pkgchain *pc, struct mdns_rrset *rs, int flush) +mdns_pkg_addauth(struct mdns_pkgchain *pc, struct mdns_rrset *rs, + int flags) { + struct mdns_header *h; + struct mdns_packet *hpkg; + int error; - return (addres(pc, SEC_AUTHORITY, rs, flush)); + error = addres(pc, SEC_AUTHORITY, rs, flags, &hpkg); + if (error != 0) + return (error); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); + h->h_nscount = htons(ntohs(h->h_nscount) + 1); + return (0); } -int -mdns_pkg_getquestion(struct mdns_packet *pkg, int offset, struct mdns_qset *qs) +/* + * Remove an authority resource from a packet chain + * pc - Packet chain + * qs - Pointer to mdns_rrset {} previsouly added + */ +struct mdns_rrset * +mdns_pkg_delauth(struct mdns_pkgchain *pc, struct mdns_rrset *rs) { + struct mdns_header *h; + struct mdns_packet *hpkg; + struct mdns_pkg_res *pr; - return (getres(pkg, SEC_QUESTIONS, offset, (void *)qs)); + pr = delres(pc, SEC_AUTHORITY, rs, &hpkg); + if (pr == NULL) + return (NULL); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); + h->h_nscount = htons(ntohs(h->h_nscount) - 1); + return (&pr->pr_res.rs); } +/* + * Adds an answer resource to a packet chain + * pc - Packet chain + * qs - Pointer to mdns_rrsetset {} containing construction information + * flags - Construction flags + * + * `rs' must be allocated using mdns_get_rrset{}, else MDNS_PKG_DUP must + * be passed as one of the flags. + */ int -mdns_pkg_getanswer(struct mdns_packet *pkg, int offset, struct mdns_rrset *rs) +mdns_pkg_addanswer(struct mdns_pkgchain *pc, struct mdns_rrset *rs, + int flags) { + struct mdns_header *h; + struct mdns_packet *hpkg; + int error; - return (getres(pkg, SEC_ANSWERS, offset, (void *)rs)); + error = addres(pc, SEC_ANSWERS, rs, flags, &hpkg); + if (error != 0) + return (error); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); + h->h_acount = htons(ntohs(h->h_acount) + 1); + return (0); } -int -mdns_pkg_getauth(struct mdns_packet *pkg, int offset, struct mdns_rrset *rs) +/* + * Remove an answer resource from a packet chain + * pc - Packet chain + * qs - Pointer to mdns_rrset {} previsouly added + */ +struct mdns_rrset * +mdns_pkg_delanswer(struct mdns_pkgchain *pc, struct mdns_rrset *rs) { + struct mdns_header *h; + struct mdns_packet *hpkg; + struct mdns_pkg_res *pr; - return (getres(pkg, SEC_AUTHORITY, offset, (void *)rs)); + pr = delres(pc, SEC_ANSWERS, rs, &hpkg); + if (pr == NULL) + return (NULL); + assert(hpkg != NULL); + h = (struct mdns_header *)hpkg->p_buf(p_hdr); + h->h_acount = htons(ntohs(h->h_acount) - 1); + return (&pr->pr_res.rs); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 16 00:57:37 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 887DF16A404; Mon, 16 Jul 2007 00:57:37 +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 4702E16A403 for ; Mon, 16 Jul 2007 00:57:37 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1EFAA13C428 for ; Mon, 16 Jul 2007 00:57:37 +0000 (UTC) (envelope-from fli@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 l6G0vbDH087284 for ; Mon, 16 Jul 2007 00:57:37 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G0va6T087281 for perforce@freebsd.org; Mon, 16 Jul 2007 00:57:36 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 00:57:36 GMT Message-Id: <200707160057.l6G0va6T087281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123566 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, 16 Jul 2007 00:57:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=123566 Change 123566 by fli@fli_nexus on 2007/07/16 00:56:36 Add an output queue, it takes care of the last finalizing step in the packet creation and hands the created packets to the stack for transmission. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:02: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 B938716A405; Mon, 16 Jul 2007 01:02: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 7A0FA16A400 for ; Mon, 16 Jul 2007 01:02:44 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 51EAB13C491 for ; Mon, 16 Jul 2007 01:02:44 +0000 (UTC) (envelope-from fli@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 l6G12iPq087811 for ; Mon, 16 Jul 2007 01:02:44 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G12iu8087808 for perforce@freebsd.org; Mon, 16 Jul 2007 01:02:44 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:02:44 GMT Message-Id: <200707160102.l6G12iu8087808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123567 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, 16 Jul 2007 01:02:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123567 Change 123567 by fli@fli_nexus on 2007/07/16 01:01:48 Add an "aggregation queue". This queue allows objects with different delay characteristics to be aggregated into one "object". This is used to aggregate multicast responses into one mDNS packet. Responses to incoming queries with certain properties are supposed to be delayed a specified amount of time + and additional 500ms if aggregation is possible. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output_aggr.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output_aggr.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:12: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 C7DEF16A404; Mon, 16 Jul 2007 01:12:57 +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 9C94C16A403 for ; Mon, 16 Jul 2007 01:12:57 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B9C713C491 for ; Mon, 16 Jul 2007 01:12:57 +0000 (UTC) (envelope-from fli@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 l6G1Cvne089618 for ; Mon, 16 Jul 2007 01:12:57 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1CvWc089615 for perforce@freebsd.org; Mon, 16 Jul 2007 01:12:57 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:12:57 GMT Message-Id: <200707160112.l6G1CvWc089615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123568 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, 16 Jul 2007 01:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123568 Change 123568 by fli@fli_nexus on 2007/07/16 01:12:45 - Revisit/fix record and resource construction, they now properly follow the system state. - Introduce a "pointer" concept where the resource data of one record can point to name of another record. This useful for PTR records that should follow a coresponding A/AAAA record automatically. - Add record probing and annoucing. When probing for a new name a "probe context" is created to which records are added, upon collision the record is removed from the context which will self-destruct when no records are left. A probe is initiated when ever a record changes name. The "announce context" works in a similar way. - Style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.h#1 add Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#2 (text+ko) ==== @@ -26,14 +26,33 @@ #include #include +#include #include "mdnsd.h" +#include "objalloc.h" +#include "output.h" #include "record.h" #include "log.h" #include "var.h" static void record_type_del_cb(struct record_type *, void *); +static void rec_update(struct dbr_rec *, struct vt_data *, size_t); +static void rec_var_update(void *); +static inline void rec_pastop(struct dbr_rec *); +static void rec_del(struct dbr_rec *); +static void res_update(struct dbr_res *, wchar_t **, size_t); +static void res_var_update(void *); +static void res_del(struct dbr_res *); + +static int dbr_pac_add(struct dbr_pac *, struct dbr_rec *, int); +static int dbr_pac_del(struct dbr_rec *, int); +static void dbr_pac_start(struct dbr_pac *, int, int, void *); +static int probe_step(const struct event_tmr *, const ev_arg); +static int an_step(const struct event_tmr *, const ev_arg); +/* + * Initialize a database record system + */ void dbr_init(struct dbr *dbr, void *context) { @@ -41,6 +60,7 @@ dbr->dbr_ctx = context; MDNS_INIT_SET(dbr, dbr_magic); + hashtbl_init(&dbr->dbr_ident, 8, 512, 3); var_init(&dbr->dbr_vars, mif->mif_glob->g_evl, dbr); /* We only do the IN class */ @@ -58,6 +78,9 @@ dbr_del(dr); } +/* + * Destroy a database record system + */ void dbr_destroy(struct dbr *dbr) { @@ -69,179 +92,211 @@ records_foreach(&dbr->dbr_recs, record_del_cb, NULL); records_destroy(&dbr->dbr_recs); var_destroy(&dbr->dbr_vars, mif->mif_glob->g_evl); + hashtbl_destroy(&dbr->dbr_ident); MDNS_INIT_UNSET(dbr, dbr_magic); + dprintf(DEBUG_DBR, "Database records destroyed"); } -static struct dbr_res * -clone_res(struct dbr_res *orig) +/* + * Clone a record + */ +static struct dbr_rec * +clone_rec(struct dbr_rec *orig) +{ + struct dbr_rec *dr; + + dr = malloc(sizeof(struct dbr_rec)); + if (dr == NULL) + return (NULL); + memcpy(dr, orig, sizeof(struct dbr_rec)); + dr->dr_flags |= DR_CLONE; + TAILQ_INSERT_TAIL(&orig->dr_clone.head, dr, dr_clone.next); + dprintf(DEBUG_DBR, "Database record cloned dr=%x, source=%x", dr, orig); + return (dr); +} + +/* + * Clone all resources from `orig' onto `dr' + */ +static void +clone_rec_res(struct dbr_rec *orig, struct dbr_rec *dr) { + struct record *r; + struct record_type *rt; + struct record_res *rr; struct dbr_res *ds; + struct dbr_rec *dr2; + void *res; + int ptr; - ds = malloc(sizeof(struct dbr_res)); - if (ds == NULL) - return (NULL); - memcpy(ds, orig, sizeof(struct dbr_res)); - ds->ds_data = NULL; - ds->ds_flags |= DS_CLONE; - TAILQ_INSERT_TAIL(&orig->ds_clone.head, ds, ds_clone.next); - dprintf(DEBUG_DBR, "Database resource cloned ds=%x, source=%x", ds, orig); - return (ds); + MDNS_INIT_ASSERT(dr, dr_magic); + MDNS_INIT_ASSERT(orig, dr_magic); + r = &orig->dr_rec; + MDNS_INIT_ASSERT(r, r_magic); + + record_foreach(rt, r) { + record_type_foreach(rr, rt) { + ds = record_res_getparent(rr); + ptr = ds->ds_flags & DS_POINTER; + if (ptr) { + dr2 = ds->ds_vdata.rec; + res = dr2->dr_ident; + } + else + res = ds->ds_vdata.wp; + + dbr_res_add(dr, rt->rt_type, ds->ds_ttl, res, ptr); + } + } + dprintf(DEBUG_DBR, "Cloned resources from %x to %x", orig, dr); } /* - * Variable update handler to resource data, will re-expand vaiables - * and update affected resources. - * This is an asynchronous callback routine which is called from the - * variable event system. + * Update a database record + * dr - Database record + * vtd - Arrays of expanded names + * vtd_len - Array length * - * ptr - Opaque pointer passed to var_reg(), to this routine it's - * always of type dbr_res {} + * A record clone will be created for each excessive member of `vtd', if + * there currently are more clones than the length of the provided array, + * then those clones are removed. */ static void -res_var_update(void *ptr) +rec_update(struct dbr_rec *dr, struct vt_data *vtd, size_t vtd_len) { - struct dbr_res *ds, *ds_clone, *ds_tmp; - struct dbr_type *dt; - struct dbr_rec *dr; + struct dbr_rec *dr_clone, *dr_tmp; + struct dbr_res *ds, *ds2; struct dbr *dbr; - struct record_type *rt; - struct record_res *rr; struct record *r; - struct vt_data *vtd; - size_t vtd_len, rlen; uint32_t i; int32_t diff; - char *p; + wchar_t **names; + char *nam; - ds = ptr; - MDNS_INIT_ASSERT(ds, ds_magic); - dt = ds->ds_type; - MDNS_INIT_ASSERT(dt, dt_magic); - dr = dt->dt_rec; MDNS_INIT_ASSERT(dr, dr_magic); dbr = dr->dr_dbr; MDNS_INIT_ASSERT(dbr, dbr_magic); - rt = &dt->dt_type; + assert(dr == dr->dr_chead); - /* TODO: locking */ + /* Stop pending probes/announces */ + rec_pastop(dr); - vtd = var_expand(&dbr->dbr_vars, ds->ds_vdata, &vtd_len); + /* + * If the provided array length is 0 there are no available + * names, invalidate record and remove all clones. + */ + if (vtd_len == 0) { + if (dr->dr_name != NULL) + free(dr->dr_name); + dr->dr_name = NULL; + dr->dr_flags |= DR_INVALID; + dr->dr_flags &= ~DR_OK; - if (vtd_len == 0) { - if (!(ds->ds_flags & DS_INVALID)) { - /* TODO: annonuce old res with ttl 0 */ - free(ds->ds_data); + TAILQ_FOREACH_SAFE(dr_clone, &dr->dr_clone.head, + dr_clone.next, dr_tmp) { + rec_del(dr_clone); } - record_res_setdata(&ds->ds_res, NULL, 0); - ds->ds_flags |= DS_INVALID; - dprintf(DEBUG_DBR, "Removing clones on %x, clones=%d", - ds, ds->ds_clones); - TAILQ_FOREACH(ds_clone, &ds->ds_clone.head, ds_clone.next) { - TAILQ_REMOVE(&ds->ds_clone.head, ds_clone, ds_clone.next); - record_res_del(&ds_clone->ds_res); + + /* + * Invalidate all database resources that are using this + * record name as their data source. + */ + TAILQ_FOREACH(ds, &dr->dr_res_ptr, ds_ptr_next) { + ds->ds_flags |= DS_INVALID; free(ds->ds_data); - free(ds_clone); - ds->ds_clones--; + ds->ds_data = NULL; } - goto out; + return; + } + + i = 1; + nam = mdns_name_encode(vtd[0].vtd_str, vtd[0].vtd_len, MDNS_ENC_AUTO); + r = &dr->dr_rec; + if (dr->dr_name != NULL) + free(dr->dr_name); + record_setname(r, nam); + + free(nam); + dr->dr_name = vtd[0].vtd_str; + dr->dr_flags &= ~(DR_OK | DR_INVALID); + + /* + * Replace names as long as there are enough clones + * and results available. + */ + TAILQ_FOREACH(dr_clone, &dr->dr_clone.head, dr_clone.next) { + if ((i - 1) == dr->dr_clones || i == vtd_len) + break; + r = &dr_clone->dr_rec; + nam = mdns_name_encode(vtd[i].vtd_str, vtd[i].vtd_len, + MDNS_ENC_AUTO); + record_setname(r, nam); + free(nam); + if (dr_clone->dr_name != NULL) + free(dr_clone->dr_name); + dr_clone->dr_name = vtd[i].vtd_str; + dr_clone->dr_flags &= ~DR_OK; + i++; } - else if (vtd_len >= 1) { - if (!(ds->ds_flags & DS_INVALID)) - free(ds->ds_data); - ds->ds_data = vtd[0].vtd_str; - p = mdns_res_encode(mdns_c_in, rt->rt_type, ds->ds_data, - MDNS_ENC_WCHAR, vtd[0].vtd_len, &rlen); - record_res_setdata(&ds->ds_res, p, rlen); - i = 1; - /* - * Replace resource data as long as there is enough clones - * and results available. - */ - TAILQ_FOREACH(ds_clone, &ds->ds_clone.head, ds_clone.next) { - if (i == ds->ds_clones || i == vtd_len) - break; - free(ds_clone->ds_data); - ds->ds_data = vtd[i].vtd_str; - p = mdns_res_encode(mdns_c_in, rt->rt_type, ds->ds_data, - MDNS_ENC_WCHAR, vtd[i].vtd_len, &rlen); - record_res_setdata(&ds->ds_res, p, rlen); + /* More results than clones, expand */ + if (vtd_len > i) { + diff = vtd_len - i; + while (diff-- > 0) { + dr_clone = clone_rec(dr); + dr_clone->dr_clones = 0; + dr->dr_clones++; + r = &dr_clone->dr_rec; + nam = mdns_name_encode(vtd[i].vtd_str, vtd[i].vtd_len, + MDNS_ENC_AUTO); + record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, nam); + record_setparent(r, dr_clone); + clone_rec_res(dr, dr_clone); + free(nam); + dr_clone->dr_name = vtd[i].vtd_str; i++; } + } + /* More clones than results, shrink */ + else if (dr->dr_clones >= i) { + diff = dr->dr_clones - i; + while (diff-- >= 0) { + dr_tmp = TAILQ_LAST(&dr->dr_clone.head, recclone_head); + rec_del(dr_tmp); + } + } - /* More results than clones, expand */ - if (vtd_len > i) { - diff = vtd_len - i; - r = ds->ds_res.rr_type->rt_record; - MDNS_INIT_ASSERT(r, r_magic); - while (diff-- > 0) { - ds_clone = clone_res(ds); - ds_clone->ds_clones = 0; - ds->ds_clones++; - ds_clone->ds_data = vtd[i].vtd_str; - rr = &ds_clone->ds_res; - p = mdns_res_encode(mdns_c_in, rt->rt_type, ds_clone->ds_data, - MDNS_ENC_WCHAR, vtd[i].vtd_len, &rlen); - record_res_add(r, &rr, RECORD_NOALLOC, rt->rt_type, p, rlen); - record_res_setparent(&ds_clone->ds_res, ds); - i++; - } - } - /* More clones than results, shrink */ - else if (ds->ds_clones >= i) { - diff = ds->ds_clones - i; - while (diff-- >= 0) { - ds_tmp = TAILQ_LAST(&ds->ds_clone.head, clone_head); - TAILQ_REMOVE(&ds->ds_clone.head, ds_tmp, ds_clone.next); - record_res_del(&ds_tmp->ds_res); - free(ds_tmp); - ds->ds_clones--; - } - } + /* Update resources that points to this record */ + names = malloc(sizeof(wchar_t *) * vtd_len); + TAILQ_FOREACH_SAFE(ds, &dr->dr_res_ptr, ds_ptr_next, ds2) { + for (i = 0; i < vtd_len; i++) + names[i] = _wcsdup(vtd[i].vtd_str); + res_update(ds, names, vtd_len); } + free(names); - ds->ds_flags &= ~DS_INVALID; - /* TODO: cache flush annonuce */ - free(vtd); dprintf(DEBUG_DBR, - "Database resource %x updated, type=%d, ttl=%d, clones=%d", - ds, rt->rt_type, ds->ds_ttl, vtd_len-1); - return; -out: - var_vtdfree(vtd, vtd_len); - dprintf(DEBUG_DBR, "Database resource %x marked as invalid", ds); + "Database record r=%x, (%ls) updated, flags=%x, clones=%d", + dr, dr->dr_names[dr->dr_cur], dr->dr_flags, dr->dr_clones); } -static struct dbr_rec * -clone_rec(struct dbr_rec *orig) -{ - struct dbr_rec *dr; - - dr = malloc(sizeof(struct dbr_rec)); - if (dr == NULL) - return (NULL); - memcpy(dr, orig, sizeof(struct dbr_rec)); - dr->dr_flags |= DR_CLONE; - TAILQ_INSERT_TAIL(&orig->dr_clone.head, dr, dr_clone.next); - dprintf(DEBUG_DBR, "Database record cloned dr=%x, source=%x", dr, orig); - return (dr); -} - - +/* + * Variable update handler to record names, callback routine from + * variable system. + */ static void rec_var_update(void *ptr) { - struct dbr_rec *dr, *dr_clone, *dr_tmp; struct dbr *dbr; + struct dbr_rec *dr, *dr2; + struct dbr_pac *pac; + struct dbr_res *ds; struct record *r; struct vt_data *vtd; size_t vtd_len; wchar_t *wp; - char *nam; - uint32_t i; - int32_t diff; dr = ptr; MDNS_INIT_ASSERT(dr, dr_magic); @@ -249,91 +304,58 @@ MDNS_INIT_ASSERT(dbr, dbr_magic); r = &dr->dr_rec; + assert(dr == dr->dr_chead); + wp = dr->dr_names[dr->dr_cur]; vtd = var_expand(&dbr->dbr_vars, wp, &vtd_len); - if (vtd_len >= 1) { - nam = mdns_name_encode(vtd[0].vtd_str, vtd[0].vtd_len, - MDNS_ENC_AUTO); - record_setname(r, nam); - free(nam); - i = 1; + rec_update(dr, vtd, vtd_len); + free(vtd); - /* - * Replace names as long as there are enough clones - * and results available. - */ - TAILQ_FOREACH(dr_clone, &dr->dr_clone.head, dr_clone.next) { - if (i == dr->dr_clones || i == vtd_len) - break; - nam = mdns_name_encode(vtd[i].vtd_str, vtd[i].vtd_len, - MDNS_ENC_AUTO); - record_setname(r, nam); - free(nam); - i++; - } - - /* More results than clones, expand */ - if (vtd_len > i) { - diff = vtd_len - i; - while (diff-- > 0) { - dr_clone = clone_rec(dr); - dr_clone->dr_clones = 0; - dr->dr_clones++; - r = &dr_clone->dr_rec; - nam = mdns_name_encode(vtd[i].vtd_str, vtd[i].vtd_len, - MDNS_ENC_AUTO); - record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, nam); - record_setparent(r, dr_clone); -// FIXME clone all resource data - free(nam); - i++; - } - } - /* More clones than results, shrink */ - else if (dr->dr_clones >= i) { - diff = dr->dr_clones - i; - while (diff-- >= 0) { - dr_tmp = TAILQ_LAST(&dr->dr_clone.head, recclone_head); - TAILQ_REMOVE(&dr->dr_clone.head, dr_tmp, dr_clone.next); - r = &dr_tmp->dr_rec; - record_foreach_type(r, record_type_del_cb, NULL); - record_release(r); - MDNS_INIT_UNSET(dr_tmp, dr_magic); - free(dr_tmp); - dr->dr_clones--; - } - } - - if (dr->dr_type == DR_SHARED) - dr->dr_state = DR_OK; - else { - dr->dr_state = DR_TENTATIVE; - /* TODO: relaunch probe */ - } + /* + * Create a probe context and and affected records to it + */ + pac = dbr_pac_new(dbr, PAC_PROBE); + dbr_probe_add(pac, dr); + TAILQ_FOREACH(dr2, &dr->dr_clone.head, dr_clone.next) { + dbr_probe_add(pac, dr2); } - else { - dr->dr_state = DR_INVALID; + /* Resources pointing to this record */ + TAILQ_FOREACH(ds, &dr->dr_res_ptr, ds_ptr_next) { + MDNS_INIT_ASSERT(ds, ds_magic); + dr2 = ds->ds_type->dt_rec; + MDNS_INIT_ASSERT(dr2, dr_magic); + dbr_probe_add(pac, dr2); } - - if (vtd != NULL) - var_vtdfree(vtd, vtd_len); - - dprintf(DEBUG_DBR, - "Database record r=%x updated name=%ls, state=%d, clones=%d", - dr, wp, dr->dr_state, dr->dr_clones); + dbr_probe_start(pac); } +/* + * Add a new database record + * dbr - Record database + * ident - Unique record set identifier + * names - Array of un-expanded alternativ names (NULL-terminated) + * shared - Shared record? + * + */ struct dbr_rec * -dbr_add(struct dbr *dbr, wchar_t **names, int type) +dbr_add(struct dbr *dbr, char *ident, wchar_t **names, int shared) { wchar_t *wp; struct vt_data *vtd; size_t vtd_len; - struct dbr_rec *dr, *dr_clone; + struct dbr_rec *dr; struct record *r; - char *nam; int error; - uint32_t i, j; + uint32_t i; + + dr = hashtbl_find(&dbr->dbr_ident, ident, strlen(ident)); + if (dr != NULL) { + dprintf(DEBUG_DBR, "Record set %s does already exists dr=%x", + ident, dr); + return (dr); + } + else if (names[0] == NULL) + return (NULL); i = 0; error = -1; @@ -341,78 +363,61 @@ TAILQ_INIT(&dr->dr_clone.head); dr->dr_clones = 0; dr->dr_dbr = dbr; + dr->dr_name = NULL; + dr->dr_ident = strdup(ident); dr->dr_names = names; - dr->dr_type = type; dr->dr_cur = 0; + dr->dr_cols = 0; + dr->dr_col_ts = 0; dr->dr_chead = dr; + dr->dr_flags = DR_INVALID; + r = &dr->dr_rec; + record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, ident); + record_setparent(r, dr); + + if (shared) + dr->dr_flags |= DR_SHARED; + TAILQ_INIT(&dr->dr_res_ptr); MDNS_INIT_SET(dr, dr_magic); - r = &dr->dr_rec; + do { wp = names[i++]; if (wp == NULL) break; vtd = var_expand(&dbr->dbr_vars, wp, &vtd_len); - if (vtd_len >= 1) { - nam = mdns_name_encode(vtd[0].vtd_str, vtd[0].vtd_len, - MDNS_ENC_AUTO); - record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, nam); - record_setparent(r, dr); - free(nam); - } - error = var_reg(&dbr->dbr_vars, wp, rec_var_update, dr); - if (error != 0) { - dprintf(DEBUG_DBR, "Variable registration failed"); - var_dereg(&dbr->dbr_vars, wp, dr); - if (vtd_len >= 1) - record_release(r); + if (vtd_len > 0) { + var_reg(&dbr->dbr_vars, wp, rec_var_update, dr); + rec_update(dr, vtd, vtd_len); } else { - dr->dr_cur = i - 1; - for (j = 1; j < vtd_len; j++) { - nam = mdns_name_encode(vtd[j].vtd_str, vtd[j].vtd_len, - MDNS_ENC_AUTO); - dr_clone = clone_rec(dr); - dr->dr_clones++; - dr_clone->dr_chead = dr; - r = &dr_clone->dr_rec; - record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, nam); - record_setparent(r, dr_clone); - free(nam); - } + var_vtdfree(vtd, vtd_len); } + } while (vtd_len == 0); - var_vtdfree(vtd, vtd_len); - } while (error != 0); - /* * If all alternative names fail to expand just set it to the * first name and mark the record as invalid. */ - if (error != 0) { + if (vtd_len == 0) { wp = names[0]; var_reg(&dbr->dbr_vars, wp, rec_var_update, dr); - dr->dr_state = DR_INVALID; dr->dr_cur = 0; - - /* - * This is slightly "incorrect" as we add the unexpanded - * name to the record database, but if we do not add it - * we can't add any resources to this record. - */ - nam = mdns_name_encode(wp, wcslen(wp), MDNS_ENC_WCHAR); - record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, nam); - record_setparent(&dr->dr_rec, r); } else { - dr->dr_state = DR_TENTATIVE; + dr->dr_cur = i - 1; } - if (type == DR_SHARED && dr->dr_state == DR_TENTATIVE) - dr->dr_state = DR_OK; + dr->dr_flags &= ~DR_OK; + hashtbl_add(&dbr->dbr_ident, dr->dr_ident, strlen(dr->dr_ident), dr, 0); + + if ((dr->dr_flags & DR_SHARED) && !(dr->dr_flags & DR_INVALID)) + dr->dr_flags |= DR_OK; - dprintf(DEBUG_DBR, "New database record dr=%x, name=%ls, clones=%d", - dr, dr->dr_names[dr->dr_cur], dr->dr_clones); + dprintf(DEBUG_DBR, + "New database record ident=%s, dr=%x, name=%ls, clones=%d, " + "flags=%x", dr->dr_ident, dr, dr->dr_names[dr->dr_cur], + dr->dr_clones, dr->dr_flags); return (dr); } @@ -434,20 +439,68 @@ MDNS_INIT_ASSERT(rt, rt_magic); dt = record_type_getparent(rt); - record_type_foreach_res(rt, record_res_del_cb, NULL); assert(record_type_refcnt(rt) == 0); free(dt); } +/* + * Free a database record and resources allocated to it + * dr - Database record + */ +static void +rec_del(struct dbr_rec *dr) +{ + struct dbr_rec *drh; + struct record *r; + wchar_t *wp; + int i; + + MDNS_INIT_ASSERT(dr, dr_magic); + r = &dr->dr_rec; + drh = dr->dr_chead; + MDNS_INIT_ASSERT(drh, dr_magic); + + if (dr->dr_flags & DR_PROBING) + dbr_probe_del(dr); + if (dr->dr_flags & DR_ANNOUNCE) + dbr_an_del(dr); + + if (dr->dr_flags & DR_CLONE) { + TAILQ_REMOVE(&drh->dr_clone.head, dr, dr_clone.next); + drh->dr_clones--; + } + else { + i = 0; + do { + wp = dr->dr_names[i++]; + if (wp != NULL) + free(wp); + } while(wp != NULL); + free(dr->dr_names); + free(dr->dr_ident); + } + + record_foreach_type(r, record_type_del_cb, NULL); + record_release(r); + assert(record_refcnt(r) == 0); + if (!(dr->dr_flags & DR_INVALID)) + free(dr->dr_name); + MDNS_INIT_UNSET(dr, dr_magic); + free(dr); +} + +/* + * Remove a database record, any existing clones and also removes + * resources that are using this record name as their resource data. + * dr - Database record + */ void dbr_del(struct dbr_rec *dr) { - struct record *r; struct dbr *dbr; struct dbr_rec *dr2, *dr_tmp; - int i; - wchar_t *wp; + struct dbr_res *ds, *ds2; MDNS_INIT_ASSERT(dr, dr_magic); dbr = dr->dr_dbr; @@ -455,58 +508,253 @@ dr = dr->dr_chead; var_dereg(&dbr->dbr_vars, dr->dr_names[dr->dr_cur], dr); + /* + * Remove any resources that are using this records name + * as their resource data. + */ + TAILQ_FOREACH_SAFE(ds, &dr->dr_res_ptr, ds_ptr_next, ds2) + dbr_res_del(ds); TAILQ_FOREACH_SAFE(dr2, &dr->dr_clone.head, dr_clone.next, dr_tmp) { - /* TODO: clear ouput queue */ - MDNS_INIT_ASSERT(dr2, dr_magic); - r = &dr2->dr_rec; - TAILQ_REMOVE(&dr->dr_clone.head, dr2, dr_clone.next); - dr->dr_clones--; - dprintf(DEBUG_DBR, "Removing record clone dr=%x, orig=%x", dr2, dr); - record_foreach_type(r, record_type_del_cb, NULL); - record_release(r); - assert(record_refcnt(r) == 0); - MDNS_INIT_UNSET(dr2, dr_magic); - free(dr2); + rec_del(dr2); + } + rec_del(dr); + dprintf(DEBUG_DBR, "Removed record dr=%x", dr); +} + +/* + * Clone a resource + */ +static struct dbr_res * +clone_res(struct dbr_res *orig) +{ + struct dbr_res *ds; + + ds = malloc(sizeof(struct dbr_res)); + if (ds == NULL) + return (NULL); + memcpy(ds, orig, sizeof(struct dbr_res)); + ds->ds_data = NULL; + ds->ds_flags |= DS_CLONE | DS_INVALID; + ds->ds_time.tv_nsec = ds->ds_time.tv_sec = 0; + TAILQ_INSERT_TAIL(&orig->ds_clone.head, ds, ds_clone.next); + dprintf(DEBUG_DBR, "Database resource cloned ds=%x, source=%x", + ds, orig); + return (ds); +} + +/* + * Update a resource with new data + */ +static void +res_update(struct dbr_res *ds, wchar_t **res, size_t reslen) +{ + struct dbr_rec *dr; + struct dbr_type *dt; + struct dbr_res *ds_clone, *ds_tmp; + struct record *r; + struct record_type *rt; + struct record_res *rr; + char *p; + size_t rlen; + int32_t diff; + uint32_t i; + + MDNS_INIT_ASSERT(ds, ds_magic); + dt = ds->ds_type; + MDNS_INIT_ASSERT(dt, dt_magic); + dr = dt->dt_rec; + MDNS_INIT_ASSERT(dr, dr_magic); + rt = &dt->dt_type; + rr = &ds->ds_res; + r = rt->rt_record; + + assert(ds == ds->ds_chead); + + /* + * If there are no resources available in the provided array, + * invalidate the record and remove existing clones. + */ + if (reslen == 0) { + if (ds->ds_data != NULL) + free(ds->ds_data); + record_res_setdata(&ds->ds_res, NULL, 0); + ds->ds_data = NULL; + ds->ds_flags |= DS_INVALID; + + TAILQ_FOREACH_SAFE(ds_clone, &ds->ds_clone.head, + ds_clone.next, ds_tmp) { + res_del(ds_clone); + } + return; + } + + i = 1; + p = mdns_res_encode(mdns_c_in, rt->rt_type, res[0], + MDNS_ENC_WCHAR, wcslen(res[0]), &rlen); + if (ds->ds_data != NULL) + free(ds->ds_data); + record_res_setdata(&ds->ds_res, p, rlen); + ds->ds_flags &= ~DS_INVALID; + ds->ds_data = res[0]; + + /* + * Replace resource data as long as there is enough clones + * and results available. + */ + TAILQ_FOREACH(ds_clone, &ds->ds_clone.head, ds_clone.next) { + if ((i - 1) == ds->ds_clones || i == reslen) + break; + if (!(ds_clone->ds_flags & DS_INVALID)) + free(ds_clone->ds_data); + ds_clone->ds_data = res[i]; + p = mdns_res_encode(mdns_c_in, rt->rt_type, res[i], + MDNS_ENC_WCHAR, wcslen(res[i]), &rlen); + record_res_setdata(&ds_clone->ds_res, p, rlen); + ds_clone->ds_flags &= ~DS_INVALID; + i++; + } + + /* More results than clones, expand */ + if (reslen > i) { + diff = reslen - i; + r = ds->ds_res.rr_type->rt_record; + MDNS_INIT_ASSERT(r, r_magic); + while (diff-- > 0) { + ds_clone = clone_res(ds); + ds_clone->ds_clones = 0; + ds->ds_clones++; + ds_clone->ds_data = res[i]; + rr = &ds_clone->ds_res; + p = mdns_res_encode(mdns_c_in, rt->rt_type, + res[i], MDNS_ENC_WCHAR, wcslen(res[i]), &rlen); + record_res_add(r, &rr, RECORD_NOALLOC, rt->rt_type, + p, rlen); + record_res_setparent(&ds_clone->ds_res, ds); + i++; + ds_clone->ds_flags &= ~DS_INVALID; + } + } + /* More clones than results, shrink */ + else if (ds->ds_clones >= i) { + diff = ds->ds_clones - i; + while (diff-- >= 0) { + ds_tmp = TAILQ_LAST(&ds->ds_clone.head, clone_head); + res_del(ds_tmp); + } } - r = &dr->dr_rec; - record_foreach_type(r, record_type_del_cb, NULL); - record_release(r); - assert(record_refcnt(r) == 0); - i = 0; - do { - wp = dr->dr_names[i++]; - if (wp != NULL) - free(wp); - } while(wp != NULL); - free(dr->dr_names); - MDNS_INIT_UNSET(dr, dr_magic); - free(dr); - dprintf(DEBUG_DBR, "Removed record dr=%x", dr); + dprintf(DEBUG_DBR, "Resource ds=%x updated, clones=%d", + ds, ds->ds_clones); } +/* + * Variable update handler to resource data, will re-expand vaiables + * and update affected resources. + * This is an asynchronous callback routine which is called from the + * variable event system. + * + * ptr - Opaque pointer passed to var_reg(), to this routine it's + * always of type dbr_res {} + */ +static void +res_var_update(void *ptr) +{ + struct dbr *dbr; + struct dbr_rec *dr; + struct dbr_type *dt; + struct dbr_res *ds; + struct dbr_pac *pac; + struct vt_data *vtd; + size_t vtd_len; + uint32_t i; + wchar_t **names; + + ds = ptr; + MDNS_INIT_ASSERT(ds, ds_magic); + dt = ds->ds_type; + MDNS_INIT_ASSERT(dt, dt_magic); + dr = dt->dt_rec; + MDNS_INIT_ASSERT(dr, dr_magic); + dbr = dr->dr_dbr; + MDNS_INIT_ASSERT(dbr, dbr_magic); + + /* + * We should never get a "pointer resource" here, they are updated + * when the rrset they point to are updated. + */ + assert(!(ds->ds_flags & DS_POINTER)); + + if (dr->dr_flags & DR_PROBING) + dbr_probe_del(dr); + if (dr->dr_flags & DR_ANNOUNCE) + dbr_an_del(dr); + + vtd = var_expand(&dbr->dbr_vars, ds->ds_vdata.wp, &vtd_len); + names = malloc(sizeof(wchar_t *) * vtd_len); + for (i = 0; i < vtd_len; i++) { + names[i] = vtd[i].vtd_str; + } + res_update(ds, names, vtd_len); + free(vtd); + + if (dr->dr_flags & DR_OK) { + pac = dbr_pac_new(dbr, PAC_ANNOUNCE); + dbr_an_add(pac, dr); + dbr_an_start(pac); + } + else { + pac = dbr_pac_new(dbr, PAC_PROBE); + dbr_probe_add(pac, dr); + dbr_probe_start(pac); + } +} +/* + * Add a resource to database record + * dr - Parent database record + * type - DNS type + * ttl - Resource TTL + * res - Unexpanded resource string + */ struct dbr_res * -dbr_res_add(struct dbr_rec *dr, uint16_t type, uint32_t ttl, wchar_t *res) +dbr_res_add(struct dbr_rec *dr, uint16_t type, uint32_t ttl, void *res, int ptr) { struct record *r; + struct record_type *rt, *rt2; struct record_res *rr; - struct record_type *rt, *rt2; struct dbr *dbr; - struct dbr_rec *dr_orig; - struct dbr_res *ds, *ds2; + struct dbr_rec *dr_orig, *drp, *drp2; + struct dbr_res *ds; struct dbr_type *dt; struct vt_data *vtd; - size_t vtd_len, i, j, rlen; - char *p; + size_t vtd_len, j, namlen; + wchar_t *wp, **names; + char *ident; MDNS_INIT_ASSERT(dr, dr_magic); dbr = dr->dr_dbr; MDNS_INIT_ASSERT(dbr, dbr_magic); + wp = res; + ident = res; + names = NULL; + namlen = 0; + + /* + * If we where passed a pointer, make sure it exists. + */ + if (ptr) { + drp = hashtbl_find(&dbr->dbr_ident, ident, strlen(ident)); + if (drp == NULL) + return (NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:18: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 CC95916A405; Mon, 16 Jul 2007 01:18: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 8586516A400 for ; Mon, 16 Jul 2007 01:18:06 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 69FA913C471 for ; Mon, 16 Jul 2007 01:18:06 +0000 (UTC) (envelope-from fli@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 l6G1I6Q6089878 for ; Mon, 16 Jul 2007 01:18:06 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1I6Ac089875 for perforce@freebsd.org; Mon, 16 Jul 2007 01:18:06 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:18:06 GMT Message-Id: <200707160118.l6G1I6Ac089875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123569 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, 16 Jul 2007 01:18:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=123569 Change 123569 by fli@fli_nexus on 2007/07/16 01:17:06 - Add the necessary bits needed for the "pointer" function. - A rrset now has a uniqe identifier instead of a "primary name", the primary name and alternative names are simply listed in the priority order using the "name"-option. The "alt"-option used for alternative names is therefore removed. - Style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/parse.y#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/token.l#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/parse.y#2 (text+ko) ==== @@ -36,8 +36,8 @@ %token IFACE ZONE RRSET RES OBRACE EBRACE EQ SEMI %token DEF_TTL DEF_TTL_SHARED -%token RRSET_ALT RRSET_SHARED RRSET_TTL -%token RES_DATA RES_TTL +%token RRSET_NAME RRSET_SHARED RRSET_TTL +%token RES_DATA RES_TTL RES_RECORD %token STRING LVALUE %{ @@ -80,6 +80,7 @@ struct cfg_resdata { TAILQ_ENTRY(cfg_resdata) csd_next; char *csd_data; + int csd_auto; }; struct cfg_res { @@ -92,6 +93,7 @@ struct cfg_rrset { TAILQ_HEAD(, cfg_name) cr_names; TAILQ_HEAD(, cfg_res) cr_res; + char *cr_ident; int cr_shared; int cr_namcount; uint32_t cr_ttl;; @@ -206,8 +208,6 @@ rrset_set: RRSET STRING OBRACE { - struct cfg_name *cn; - if (!cfg_ifvalid && cfg_ifpassed) break; @@ -216,15 +216,8 @@ bzero(&cfg_rrset, sizeof(struct cfg_rrset)); TAILQ_INIT(&cfg_rrset.cr_names); TAILQ_INIT(&cfg_rrset.cr_res); - cn = malloc(sizeof(struct cfg_name)); - if (cfg_zone == NULL) - cn->cn_name = $2; - else { - asprintf(&cn->cn_name, "%s.%s", $2, cfg_zone); - free($2); - } - TAILQ_INSERT_TAIL(&cfg_rrset.cr_names, cn, cn_next); - cfg_rrset.cr_namcount = 1; + cfg_rrset.cr_namcount = 0; + cfg_rrset.cr_ident = $2; } rrset_content EBRACE { struct cfg_name *cn; @@ -238,8 +231,15 @@ if (!cfg_ifvalid && cfg_ifpassed) break; - dprintf(DEBUG_CFGPARSE, "rrset names%s", - (cfg_rrset.cr_shared ? " (shared)" : "")); + if (cfg_rrset.cr_namcount == 0) { + dprintf(DEBUG_CFGPARSE, "No names on rrset %s", + cfg_rrset.cr_ident); + break; + } + + dprintf(DEBUG_CFGPARSE, "rrset \"%s\" names%s (%d)", + cfg_rrset.cr_ident, (cfg_rrset.cr_shared ? + " (shared)" : ""), cfg_rrset.cr_namcount); /* Do not free names, its in use by dbr_add() */ names = malloc(sizeof(wchar_t *) * (cfg_rrset.cr_namcount + 1)); @@ -253,7 +253,8 @@ } names[i] = NULL; - dr = dbr_add(dbr, names, cfg_rrset.cr_shared ? DR_SHARED : DR_UNIQUE); + dr = dbr_add(dbr, cfg_rrset.cr_ident, names, + cfg_rrset.cr_shared); assert(dr != NULL); dprintf(DEBUG_CFGPARSE, "rrset resources"); @@ -266,11 +267,17 @@ dprintf(DEBUG_CFGPARSE, " data = %s, ttl = %d", csd->csd_data, ttl); - len = strlen(csd->csd_data) + 1; - wp = malloc(len * sizeof(wchar_t)); - mbstowcs(wp, csd->csd_data, len); - dbr_res_add(dr, cs->cs_type, ttl, wp); - free(wp); + if (csd->csd_auto) { + dbr_res_add(dr, cs->cs_type, ttl, + csd->csd_data, 1); + } + else { + len = strlen(csd->csd_data) + 1; + wp = malloc(len * sizeof(wchar_t)); + mbstowcs(wp, csd->csd_data, len); + dbr_res_add(dr, cs->cs_type, ttl, + wp, 0); + } } } @@ -297,7 +304,8 @@ TAILQ_INIT(&cs->cs_data); TAILQ_INSERT_TAIL(&cfg_rrset.cr_res, cs, cs_next); cfg_res = cs; - dprintf(DEBUG_CFGPARSE, "res %s (%d) statement\n", $2, cs->cs_type); + dprintf(DEBUG_CFGPARSE, "res %s (%d) statement\n", + $2, cs->cs_type); } res_content EBRACE { if (!cfg_ifvalid && cfg_ifpassed) @@ -323,13 +331,13 @@ free($3); } | - RRSET_ALT EQ STRING SEMI { + RRSET_NAME EQ STRING SEMI { struct cfg_name *cn; if (!cfg_ifvalid && cfg_ifpassed) break; - dprintf(DEBUG_CFGPARSE, "rrset alt = %s", $3); + dprintf(DEBUG_CFGPARSE, "rrset name = %s", $3); cn = malloc(sizeof(struct cfg_name)); if (cfg_zone == NULL) cn->cn_name = $3; @@ -358,6 +366,20 @@ dprintf(DEBUG_CFGPARSE, "res data = %s", $3); csd = malloc(sizeof(struct cfg_resdata)); csd->csd_data = $3; + csd->csd_auto = 0; + TAILQ_INSERT_TAIL(&cfg_res->cs_data, csd, csd_next); + } + | + RES_RECORD EQ STRING SEMI { + struct cfg_resdata *csd; + + if (!cfg_ifvalid && cfg_ifpassed) + break; + + dprintf(DEBUG_CFGPARSE, "res record pointer = %s", $3); + csd = malloc(sizeof(struct cfg_resdata)); + csd->csd_data = $3; + csd->csd_auto = 1; TAILQ_INSERT_TAIL(&cfg_res->cs_data, csd, csd_next); } | ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/token.l#2 (text+ko) ==== @@ -67,7 +67,7 @@ } . { yymore(); } -alt { yy_push_state(LVAL); return RRSET_ALT; } +name { yy_push_state(LVAL); return RRSET_NAME; } ttl { yy_push_state(LVAL); return RRSET_TTL; } shared { yy_push_state(LVAL); return RRSET_SHARED; } [a-zA-Z0-9\_\$\(\)]+ { @@ -77,6 +77,7 @@ data { yy_push_state(LVAL); return RES_DATA; } ttl { yy_push_state(LVAL); return RES_TTL; } +record { yy_push_state(LVAL); return RES_RECORD; } [a-zA-Z0-9\_]+ { yy_push_state(LVAL); yylval.ptr = strdup(yytext); return LVALUE; From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:22: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 9D9EA16A403; Mon, 16 Jul 2007 01:22: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 2925116A401 for ; Mon, 16 Jul 2007 01:22:12 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 18AF313C4AA for ; Mon, 16 Jul 2007 01:22:12 +0000 (UTC) (envelope-from fli@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 l6G1MCqV090333 for ; Mon, 16 Jul 2007 01:22:12 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1MCEK090328 for perforce@freebsd.org; Mon, 16 Jul 2007 01:22:12 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:22:12 GMT Message-Id: <200707160122.l6G1MCEK090328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123570 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, 16 Jul 2007 01:22:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=123570 Change 123570 by fli@fli_nexus on 2007/07/16 01:22:06 Style fixes (long lines) and debugging output tweaks only. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#4 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#6 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#6 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#8 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#5 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#4 (text+ko) ==== @@ -140,13 +140,16 @@ again: switch (ev->ev_type) { case EVENT_TYPE_IO: - ret = ev->ev_cb.ev_handler.io(&ev->ev_data.io, ev->ev_handler_arg); + ret = ev->ev_cb.ev_handler.io(&ev->ev_data.io, + ev->ev_handler_arg); break; case EVENT_TYPE_TMR: - ret = ev->ev_cb.ev_handler.tmr(&ev->ev_data.tmr, ev->ev_handler_arg); + ret = ev->ev_cb.ev_handler.tmr(&ev->ev_data.tmr, + ev->ev_handler_arg); break; case EVENT_TYPE_SIG: - ret = ev->ev_cb.ev_handler.sig(&ev->ev_data.sig, ev->ev_handler_arg); + ret = ev->ev_cb.ev_handler.sig(&ev->ev_data.sig, + ev->ev_handler_arg); break; } @@ -235,7 +238,7 @@ /* Exclusive event already in progress */ if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_refcnt > 0) { dprintf(DEBUG_EVENT, - "Exclusive event already in progress ev=%x", ev); + "Exclusive event already in progress ev=%x", ev); ev->ev_redo++; EV_UNLOCK(ev); continue; @@ -243,8 +246,8 @@ ev->ev_refcnt++; EV_UNLOCK(ev); - dprintf(DEBUG_EVENT, "Event fired, dispatched to queue=%x, ev=%x", - wq, ev); + dprintf(DEBUG_EVENT, + "Event fired, dispatched to queue=%x, ev=%x", wq, ev); wa.ptr = ev; #ifdef HAVE_PTHREAD error = wq_enqueue(wq, event_engine, &wa); @@ -293,7 +296,7 @@ */ int event_add(struct eventlist *evl, int type, void *handler, ev_arg *handler_arg, - void *init, ev_arg *init_arg) + void *init, ev_arg *init_arg) { int ret; struct event *ev; @@ -333,8 +336,8 @@ switch (type) { case EVENT_TYPE_IO: if (init != NULL) - ret = ev->ev_cb.ev_init.io(EVENT_INIT_OPEN, &ev->ev_data.io, - ev_arg_init); + ret = ev->ev_cb.ev_init.io(EVENT_INIT_OPEN, + &ev->ev_data.io, ev_arg_init); if (ev->ev_data.io.evio_dir == EVENT_IO_READ) kev.filter = EVFILT_READ; else if (ev->ev_data.io.evio_dir == EVENT_IO_WRITE) @@ -345,8 +348,8 @@ break; case EVENT_TYPE_TMR: if (init != NULL) - ret = ev->ev_cb.ev_init.tmr(EVENT_INIT_OPEN, &ev->ev_data.tmr, - ev_arg_init); + ret = ev->ev_cb.ev_init.tmr(EVENT_INIT_OPEN, + &ev->ev_data.tmr, ev_arg_init); kev.filter = EVFILT_TIMER; if (ev->ev_data.tmr.evtmr_oneshot) kev.flags |= EV_ONESHOT; @@ -356,8 +359,8 @@ break; case EVENT_TYPE_SIG: if (init != NULL) - ret = ev->ev_cb.ev_init.sig(EVENT_INIT_OPEN, &ev->ev_data.sig, - ev_arg_init); + ret = ev->ev_cb.ev_init.sig(EVENT_INIT_OPEN, + &ev->ev_data.sig, ev_arg_init); kev.filter = EVFILT_SIGNAL; signal(ev->ev_data.sig.evsig_signo, SIG_IGN); kev.ident = ev->ev_data.sig.evsig_signo; @@ -445,7 +448,8 @@ MDNS_INIT_ASSERT(ev, ev_magic); if (ev->ev_refcnt > 0) { - dprintf(DEBUG_EVENT, "Event busy ev=%x, refcnt=%d", ev, ev->ev_refcnt); + dprintf(DEBUG_EVENT, "Event busy ev=%x, refcnt=%d", + ev, ev->ev_refcnt); ev->ev_flags |= EVENT_FLAG_DYING; return (1); } ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#6 (text+ko) ==== @@ -80,16 +80,20 @@ hash(const void *key, size_t length, uint32_t initval) { uint32_t a, b, c; /* internal state */ - union { const void *ptr; size_t i; } u; /* needed for Mac Powerbook G4 */ - + /* needed for Mac Powerbook G4 */ + union { const void *ptr; size_t i; } u; /* Set up the internal state */ a = b = c = 0xdeadbeef + ((uint32_t)length) + initval; u.ptr = key; if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) { - const uint32_t *k = (const uint32_t *)key; /* read 32-bit chunks */ + /* read 32-bit chunks */ + const uint32_t *k = (const uint32_t *)key; - /* all but last block: aligned reads and affect 32 bits of (a,b,c) */ + /* + * all but last block: aligned reads and + * affect 32 bits of (a,b,c) + */ while (length > 12) { a += k[0]; b += k[1]; @@ -100,13 +104,14 @@ } /* - * handle the last (probably partial) block - * "k[2]&0xffffff" actually reads beyond the end of the string, but - * then masks off the part it's not allowed to read. Because the - * string is aligned, the masked-off tail is in the same word as the - * rest of the string. Every machine with memory protection I've seen - * does it on word boundaries, so is OK with this. But VALGRIND will - * still catch it and complain. The masking trick does make the hash + * handle the last (probably partial) block * "k[2]&0xffffff" + * actually reads beyond the end of the string, but + * then masks off the part it's not allowed to read. + * Because the string is aligned, the masked-off tail is in the + * same word as the rest of the string. Every machine with + * memory protection I've seen does it on word boundaries, + * so is OK with this. But VALGRIND will still catch it and + * complain. The masking trick does make the hash * noticably faster for short strings (like English words). */ @@ -127,7 +132,8 @@ } } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) { - const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */ + /* read 16-bit chunks */ + const uint16_t *k = (const uint16_t *)key; const uint8_t *k8; /* all but last block: aligned reads and different mixing */ @@ -240,7 +246,8 @@ hep = SLIST_FIRST(&ht->ht_new); if (hep == NULL || hep->hep_pos >= hep->hep_size) { len = 1 << ht->ht_alloc_size; - hep = malloc(sizeof(struct he_pool) + (sizeof(struct hashentry) * len)); + hep = malloc(sizeof(struct he_pool) + + (sizeof(struct hashentry) * len)); hep->hep_size = len; hep->hep_pos = 0; SLIST_INSERT_HEAD(&ht->ht_new, hep, hep_next); @@ -274,7 +281,7 @@ static void grow(struct hashtbl *ht) { - struct hashbkt *buckets; + struct hashbkt *bkts; struct hashentry *he, *he2; size_t i, len; uint32_t hval; @@ -283,23 +290,23 @@ ht->ht_tblsz *= 2; ht->ht_mask = ht->ht_tblsz - 1; - buckets = malloc(sizeof(struct hashbkt) * ht->ht_tblsz); + bkts = malloc(sizeof(struct hashbkt) * ht->ht_tblsz); for (i = 0; i < ht->ht_tblsz; i++) { - TAILQ_INIT(&buckets[i].hb_table); - buckets[i].hb_len = 0; + TAILQ_INIT(&bkts[i].hb_table); + bkts[i].hb_len = 0; } for (i = 0; i < len; i++) { - TAILQ_FOREACH_SAFE(he, &ht->ht_buckets[i].hb_table, he_next, he2) { + TAILQ_FOREACH_SAFE(he, &ht->ht_bkts[i].hb_table, he_next, he2) { hval = he->he_hash & ht->ht_mask; - TAILQ_REMOVE(&ht->ht_buckets[i].hb_table, he, he_next); - TAILQ_INSERT_TAIL(&buckets[hval].hb_table, he, he_next); - buckets[hval].hb_len++; + TAILQ_REMOVE(&ht->ht_bkts[i].hb_table, he, he_next); + TAILQ_INSERT_TAIL(&bkts[hval].hb_table, he, he_next); + bkts[hval].hb_len++; } } - free(ht->ht_buckets); - ht->ht_buckets = buckets; + free(ht->ht_bkts); + ht->ht_bkts = bkts; } /* @@ -312,7 +319,7 @@ { size_t i; - ht->ht_buckets = malloc(sizeof(struct hashbkt) * len); + ht->ht_bkts = malloc(sizeof(struct hashbkt) * len); ht->ht_tblsz = len; ht->ht_grow = growsz; ht->ht_col = col; @@ -322,8 +329,8 @@ SLIST_INIT(&ht->ht_free); for (i = 0; i < len; i++) { - TAILQ_INIT(&ht->ht_buckets[i].hb_table); - ht->ht_buckets[i].hb_len = 0; + TAILQ_INIT(&ht->ht_bkts[i].hb_table); + ht->ht_bkts[i].hb_len = 0; } return (0); @@ -340,7 +347,7 @@ size_t i; for (i = 0; i < ht->ht_tblsz; i++) { - TAILQ_FOREACH(he, &ht->ht_buckets[i].hb_table, he_next) { + TAILQ_FOREACH(he, &ht->ht_bkts[i].hb_table, he_next) { if (he->he_flags & HASHTBL_KEYDUP) free(he->he_key.vol); } @@ -348,7 +355,7 @@ SLIST_FOREACH_SAFE(hep, &ht->ht_new, hep_next, hep2) { free(hep); } - free(ht->ht_buckets); + free(ht->ht_bkts); } /* @@ -363,7 +370,7 @@ { struct hashentry *he; - TAILQ_FOREACH(he, &ht->ht_buckets[hval].hb_table, he_next) { + TAILQ_FOREACH(he, &ht->ht_bkts[hval].hb_table, he_next) { if (keylen == he->he_keylen) { if (memcmp(key, he->he_key.con, keylen) == 0) break; @@ -408,12 +415,12 @@ } he->he_keylen = keylen; he->he_data = data; - TAILQ_INSERT_TAIL(&ht->ht_buckets[hval].hb_table, he, he_next); - ht->ht_buckets[hval].hb_len++; + TAILQ_INSERT_TAIL(&ht->ht_bkts[hval].hb_table, he, he_next); + ht->ht_bkts[hval].hb_len++; /* Attempt to grow table if needed */ if ((ht->ht_grow > ht->ht_tblsz) && - (ht->ht_buckets[hval].hb_len >= ht->ht_col)) + (ht->ht_bkts[hval].hb_len >= ht->ht_col)) grow(ht); return (0); @@ -438,7 +445,7 @@ he = find(ht, hval, key, keylen); if (he != NULL) { - TAILQ_REMOVE(&ht->ht_buckets[hval].hb_table, he, he_next); + TAILQ_REMOVE(&ht->ht_bkts[hval].hb_table, he, he_next); if (he->he_flags & HASHTBL_KEYDUP) free(he->he_key.vol); free_he(ht, he); @@ -482,20 +489,22 @@ size_t i; for (i = 0; i < ht->ht_tblsz; i++) { - he = he_head = TAILQ_FIRST(&ht->ht_buckets[i].hb_table); + he = he_head = TAILQ_FIRST(&ht->ht_bkts[i].hb_table); while (he != NULL) { he_next = TAILQ_NEXT(he, he_next); he_prev = TAILQ_PREV(he, hashbkt_head, he_next); cb(ht, he->he_key.con, he->he_keylen, he->he_data, arg); - if (he_head != TAILQ_FIRST(&ht->ht_buckets[i].hb_table)) { - he = he_head = TAILQ_FIRST(&ht->ht_buckets[i].hb_table); + if (he_head != TAILQ_FIRST(&ht->ht_bkts[i].hb_table)) { + he = TAILQ_FIRST(&ht->ht_bkts[i].hb_table); + he_head = he; } else { he = he_next; if (he_prev != NULL) { - he_tmp = TAILQ_NEXT(TAILQ_NEXT(he_prev, he_next), he_next); + he_tmp = TAILQ_NEXT(TAILQ_NEXT(he_prev, + he_next), he_next); if (he_tmp != NULL && he_tmp != he_next) he = he_tmp; } ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#6 (text+ko) ==== @@ -66,10 +66,10 @@ * Hash table */ struct hashtbl { - struct hashbkt *ht_buckets; /* Bucket array */ + struct hashbkt *ht_bkts; /* Bucket array */ size_t ht_tblsz; /* Size of table */ - size_t ht_grow; /* Allowed grow size */ - size_t ht_col; /* Allowed collisions */ + size_t ht_grow; /* Allowed grow size */ + size_t ht_col; /* Allowed collisions */ uint32_t ht_mask; uint8_t ht_alloc_size; SLIST_HEAD(, he_pool) ht_new; /* new hashentry objs */ ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#8 (text+ko) ==== @@ -154,7 +154,8 @@ buf->b_flags = 0; buf->b_sz = (len == 0) ? - ((flags & MDNS_BP_HUGE) ? MDNS_PKG_MAX_LEN : bp->bp_defsz) : len; + ((flags & MDNS_BP_HUGE) ? + MDNS_PKG_MAX_LEN : bp->bp_defsz) : len; buf->b_buf = malloc(buf->b_sz); if (buf->b_buf == NULL) { free(buf); @@ -183,8 +184,9 @@ TAILQ_INSERT_TAIL(&bh->bh_list, buf, b_next); bh->bh_size++; - dprintf(DEBUG_BUF, "Blocks in use %d, free normal=%d, huge=%d", - bp->bp_allocs, bp->bp_buffree[0], bp->bp_buffree[1]); + dprintf(DEBUG_BUF, + "Alloced buf=%x, blocks in use %d, free normal=%d, huge=%d", + buf, bp->bp_allocs, bp->bp_buffree[0], bp->bp_buffree[1]); out: if (!(flags & MDNS_BP_LOCKED)) ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ #include "stack_buf.h" /* Multicast DNS constants */ -#define MDNS_MCAST_INET "224.0.0.251" /* IPv4 multicast address */ +#define MDNS_MCAST_INET "224.0.0.251" /* IPv4 multicast address */ #define MDNS_MCAST_INET6 "ff02::fb" /* IPv6 multicast address */ #define MDNS_MCAST_PORT 5353 /* Port number */ @@ -58,7 +58,7 @@ * r= specifies the value for this field in response messages */ struct mdns_header { - unsigned int h_id:16; /* 0 for multicast query/resp, unicast as normal */ + unsigned int h_id:16; /* 0 for multicast, unicast as normal */ #if BYTE_ORDER == LITTLE_ENDIAN /* byte 3 */ unsigned int h_rd:1; /* Recursion desired, q/r=0 ignore on recv */ ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.c#3 (text+ko) ==== @@ -78,14 +78,14 @@ bzero(wqt, sizeof(struct wq_tag)); wq->wq_tags++; } - else { wqt = TAILQ_FIRST(&wq->wq_free); TAILQ_REMOVE(&wq->wq_free, wqt, wqt_list); } MDNS_INIT_SET(wqt, wqt_magic); wq->wq_tags_used++; - dprintf(DEBUG_WQUEUE, "%d tags, used %d", wq->wq_tags, wq->wq_tags_used); + dprintf(DEBUG_WQUEUE, "%d tags, used %d", + wq->wq_tags, wq->wq_tags_used); return (wqt); } #endif @@ -121,8 +121,8 @@ } wq->wq_tags_used--; - - dprintf(DEBUG_WQUEUE, "%d tags, used %d", wq->wq_tags, wq->wq_tags_used); + dprintf(DEBUG_WQUEUE, "%d tags, used %d", wq->wq_tags, + wq->wq_tags_used); } #endif @@ -248,11 +248,12 @@ */ thr = new_worker(wq); if (thr == NULL) - logger(LOG_WARNING, "Failed to create new worker thread"); + logger(LOG_WARNING, + "Failed to create new worker thread"); } dprintf(DEBUG_WQUEUE, "Enqueued func=%x on queue=%x", - func, wq); + func, wq); WQ_UNLOCK(wq); #else @@ -286,7 +287,7 @@ return (NULL); dprintf(DEBUG_WQUEUE, "New queue worker created, thr=%x, workers=%d", - thr->wqthr_id, wq->wq_workers); + thr->wqthr_id, wq->wq_workers); return (thr); } @@ -307,7 +308,7 @@ TAILQ_REMOVE(&wq->wq_threads, wqthr, wqthr_list); wq->wq_workers--; dprintf(DEBUG_WQUEUE, "Queue worker destroyed, thr=%x, workers=%d", - wqthr->wqthr_id, wq->wq_workers); + wqthr->wqthr_id, wq->wq_workers); free(wqthr); } #endif @@ -340,10 +341,10 @@ wqt = TAILQ_FIRST(&wq->wq_queue); TAILQ_REMOVE(&wq->wq_queue, wqt, wqt_list); - dprintf(DEBUG_WQUEUE, - "Worker executing, thr=%x, func=%x, workers=%d, idle=%d", - wqthr->wqthr_id, wqt->wqt_func, wq->wq_workers, - wq->wq_workers_idle); + dprintf(DEBUG_WQUEUE, "Worker executing," + "thr=%x, func=%x, workers=%d, idle=%d", + wqthr->wqthr_id, wqt->wqt_func, wq->wq_workers, + wq->wq_workers_idle); WQ_UNLOCK(wq); /* Execute job function */ @@ -363,13 +364,15 @@ clock_gettime(CLOCK_REALTIME, &timeout); timeout.tv_sec += 3; - error = pthread_cond_timedwait(&wq->wq_cond, &wq->wq_mtx, &timeout); + error = pthread_cond_timedwait(&wq->wq_cond, &wq->wq_mtx, + &timeout); /* - * Commit suicide if we have been idle too long and there are enough - * other workers around. + * Commit suicide if we have been idle too long and there + * are enough other workers around. */ - if (error == ETIMEDOUT && wq->wq_workers >= wq->wq_workers_min) { + if (error == ETIMEDOUT && + wq->wq_workers >= wq->wq_workers_min) { wq->wq_workers_idle--; break; } From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:26: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 A8DC216A407; Mon, 16 Jul 2007 01:26: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 3861B16A402 for ; Mon, 16 Jul 2007 01:26:18 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D034413C441 for ; Mon, 16 Jul 2007 01:26:17 +0000 (UTC) (envelope-from fli@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 l6G1QH2l090850 for ; Mon, 16 Jul 2007 01:26:17 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1QHsf090847 for perforce@freebsd.org; Mon, 16 Jul 2007 01:26:17 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:26:17 GMT Message-Id: <200707160126.l6G1QHsf090847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123571 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, 16 Jul 2007 01:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123571 Change 123571 by fli@fli_nexus on 2007/07/16 01:26:07 - Add record_type_find() which returns the given record type - Change record_res_find() to find an exact match to a resource exists. - Add some convenient macros to traverse types and resources. - Style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#3 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#3 (text+ko) ==== @@ -28,11 +28,17 @@ #include #include +#include "debug.h" +#include "log.h" #include "record.h" -#include "log.h" + +#define record_aquire(r) (r)->r_refcnt++; \ + dprintf(DEBUG_REC, "Refcount on r=%x increased to %d",\ + r, (r)->r_refcnt); -#define record_aquire(r) (r)->r_refcnt++; -#define record_type_aquire(rt) (rt)->rt_refcnt++; +#define record_type_aquire(rt) (rt)->rt_refcnt++; \ + dprintf(DEBUG_REC, "Refcount on rt=%x increased to %d",\ + rt, (rt)->rt_refcnt); /* * Initialize a record set for `class' @@ -84,7 +90,7 @@ * recs - Record set * r - Pointer to record * name - Resource name - * flags - RECORD_NOALLOC will supress memory allocation + * flags - RECORD_NOALLOC will supress memory allocation */ int record_get(struct records *recs, struct record **r, int flags, char *name) @@ -123,7 +129,8 @@ *r = rec; } record_aquire(*r); - dprintf(DEBUG_REC, "Record aquired r=%x, refcnt=%d", *r, (*r)->r_refcnt); + dprintf(DEBUG_REC, "Record aquired r=%x, name=%s, refcnt=%d", + *r, (*r)->r_name, (*r)->r_refcnt); return (0); } @@ -152,7 +159,8 @@ dprintf(DEBUG_REC, "References cleared on r=%x, removed", r); } else { - dprintf(DEBUG_REC, "Record released r=%x, refs=%d", r, r->r_refcnt); + dprintf(DEBUG_REC, "Record released r=%x, refs=%d", + r, r->r_refcnt); } } @@ -198,7 +206,7 @@ * Get a record type for a record, will be intialized if needed * r - Record * rt - Pointer to the new record type - * flags - RECORD_NOALLOC will supress memory allocation + * flags - RECORD_NOALLOC will supress memory allocation * type - DNS type */ int @@ -327,6 +335,12 @@ dprintf(DEBUG_REC, "Resource rr=%x removed, rt=%x", rr, rt); } +/* + * Set resource data on a resource record + * rr - Resource record + * data - Data pointer + * dlen - Length of data + */ void record_res_setdata(struct record_res *rr, void *data, size_t dlen) { @@ -347,7 +361,8 @@ * type - Resource type */ struct record_res * -record_res_find(struct records *recs, char *name, uint16_t type) +record_res_find(struct records *recs, char *name, uint16_t type, char *data, + size_t dlen) { struct record *r; struct record_type *rt; @@ -368,10 +383,35 @@ if (rt == NULL) return (NULL); - rr = TAILQ_FIRST(&rt->rt_list); + TAILQ_FOREACH(rr, &rt->rt_list, rr_next) { + if (rr->rr_len == dlen) + if (memcmp(rr->rr_data, data, dlen) == 0) + break; + } return (rr); } +struct record_type * +record_type_find(struct records *recs, char *name, uint16_t type) +{ + struct record *r; + struct record_type *rt; + size_t len; + + MDNS_INIT_ASSERT(recs, r_magic); + + len = strlen(name); + r = hashtbl_find(&recs->r_recs, name, len); + if (r == NULL) + return (NULL); + + TAILQ_FOREACH(rt, &r->r_list, rt_next) { + if (rt->rt_type == type) + break; + } + return (rt); +} + static void rec_walk(__unused struct hashtbl *ht, __unused const void *key, __unused size_t keylen, void *data, void *arg) @@ -426,7 +466,8 @@ rr = rr_head = TAILQ_FIRST(&rt->rt_list); } else { - rr_tmp = TAILQ_NEXT(TAILQ_NEXT(rr_prev, rr_next), rr_next); + rr_tmp = TAILQ_NEXT( + TAILQ_NEXT(rr_prev, rr_next), rr_next); if (rr_tmp != NULL && rr_tmp != rr_next) rr = rr_tmp; else ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#3 (text+ko) ==== @@ -71,7 +71,7 @@ struct record *rt_record; void *rt_parent; TAILQ_ENTRY(record_type) rt_next; - int rt_type; + uint16_t rt_type; int rt_flags; size_t rt_refcnt; TAILQ_HEAD(record_res_head, record_res) rt_list; @@ -111,7 +111,9 @@ int record_res_add(struct record *, struct record_res **, int, uint16_t, void *, size_t); void record_res_del(struct record_res *); -struct record_res * record_res_find(struct records *, char *, uint16_t); +struct record_res * record_res_find(struct records *, char *, uint16_t, + char *, size_t); +struct record_type * record_type_find(struct records *, char *, uint16_t); void record_res_setdata(struct record_res *, void *, size_t); typedef void (*record_foreach)(struct record *, void *); @@ -132,4 +134,13 @@ #define record_res_setparent(x, y) __getparent(x, rr_parent) = y #define record_res_getparent(x) __getparent(x, rr_parent) +#define record_type_foreach(rr, rt) \ + TAILQ_FOREACH(rr, &((rt)->rt_list), rr_next) +#define record_type_first(rt) TAILQ_FIRST(&(rt)->rt_list) +#define record_type_next(rr) TAILQ_NEXT((rr), rr_next) +#define record_foreach(rt, r) \ + TAILQ_FOREACH(rt, &((r)->r_list), rt_next) +#define record_first(r) TAILQ_FIRST(&(r)->r_list) +#define record_next(r) TAILQ_NEXT((r), rt_next) + #endif /* _RECORD_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:28:21 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 3865416A407; Mon, 16 Jul 2007 01:28: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 EA8FD16A400 for ; Mon, 16 Jul 2007 01:28:20 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA12A13C4BB for ; Mon, 16 Jul 2007 01:28:20 +0000 (UTC) (envelope-from fli@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 l6G1SKmS091414 for ; Mon, 16 Jul 2007 01:28:20 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1SKkA091411 for perforce@freebsd.org; Mon, 16 Jul 2007 01:28:20 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:28:20 GMT Message-Id: <200707160128.l6G1SKkA091411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123572 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, 16 Jul 2007 01:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=123572 Change 123572 by fli@fli_nexus on 2007/07/16 01:27:33 - Fix encoding of IPv6 addresses - Style fixes (long lines). Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_util.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_util.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -127,6 +128,7 @@ else { if (flags & MDNS_ENC_WCHAR) { wcstombs(addr, data, INET6_ADDRSTRLEN+1); + p = addr; } r = malloc(16); /* ipv6 address */ inet_pton(AF_INET6, p, r); @@ -150,6 +152,49 @@ return (found); } +/* Create a ip6.arpa ptr record */ +static char * +ip6ptr(char *p) +{ + char *q, *s, *r; + int cnt, cols; + + cols = stroc(p, ':'); + if (cols < 2) + return (NULL); + + /* + * 74 bytes is enough to hold a ip6.arpa domain pointer + * including terminating '\0'. + */ + r = s = malloc(74); + q = p + strlen(p) - 1; + cnt = 0; + while (q >= p) { + if (s - r == 64) + break; + *s++ = *q--; + *s++ = '.'; + cnt++; + if (*q == ':') { + for (; cnt < 4; cnt++) { + *s++ = '0'; *s++ = '.'; + } + if (q != p && *(q - 1) == ':') { + while (cols++ <= 7) { + for (cnt = 0; cnt < 4; cnt++) { + *s++ = '0'; *s++ = '.'; + } + } + q--; + } + cnt = 0; + q--; + } + } + strcpy(s, "ip6.arpa."); + return (r); +} /* * (IN, PTR) resource data encoder @@ -194,48 +239,13 @@ q = strdup(p); for (i = 0; i < 4; i++) parts[i] = strsep(&p, "."); - asprintf(&r, "%s.%s.%s.%s.in-addr.arpa.", parts[3], parts[2], - parts[1], parts[0]); + asprintf(&r, "%s.%s.%s.%s.in-addr.arpa.", + parts[3], parts[2], parts[1], parts[0]); free(q); } #ifdef INET6 else if (flags & MDNS_ENC_INET6) { - char *q, *s; - int cnt, cols; - - cols = stroc(p, ':'); - if (cols < 2) - return (NULL); - /* - * 74 bytes is enough to hold a ip6.arpa domain pointer - * including terminating '\0'. - */ - r = s = malloc(74); - q = p + strlen(p) - 1; - cnt = 0; - while (q >= p) { - if (s - r == 64) - break; - *s++ = *q--; - *s++ = '.'; - cnt++; - if (*q == ':') { - for (; cnt < 4; cnt++) { - *s++ = '0'; *s++ = '.'; - } - if (q != p && *(q - 1) == ':') { - while (cols++ <= 7) { - for (cnt = 0; cnt < 4; cnt++) { - *s++ = '0'; *s++ = '.'; - } - } - q--; - } - cnt = 0; - q--; - } - } - strcpy(s, "ip6.arpa."); + r = ip6ptr(p); } #endif } @@ -310,7 +320,8 @@ for (i = 0; i < res_enc_table_size; i++) { if (res_enc_table[i].em_type == type) { - res = res_enc_table[i].em_encoder(data, flags, dlen, rlen); + res = res_enc_table[i].em_encoder(data, flags, dlen, + rlen); break; } } From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:30: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 A135216A404; Mon, 16 Jul 2007 01:30: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 5FFD316A401 for ; Mon, 16 Jul 2007 01:30:24 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4FBF813C4A5 for ; Mon, 16 Jul 2007 01:30:24 +0000 (UTC) (envelope-from fli@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 l6G1UOhC091543 for ; Mon, 16 Jul 2007 01:30:24 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1UNOT091539 for perforce@freebsd.org; Mon, 16 Jul 2007 01:30:23 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:30:23 GMT Message-Id: <200707160130.l6G1UNOT091539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123573 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, 16 Jul 2007 01:30:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=123573 Change 123573 by fli@fli_nexus on 2007/07/16 01:29:43 - Change wcsdup() to own-rolled _wcsup() as the former only exists in -current. - Fix a nasty bug in var_expand() which caused it to allocated insufficient memory. - Style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#2 (text+ko) ==== @@ -113,7 +113,8 @@ i = vt->vt_size; vt->vt_size++; - vt->vt_data = realloc(vt->vt_data, sizeof(struct vt_data) * vt->vt_size); + vt->vt_data = realloc(vt->vt_data, + sizeof(struct vt_data) * vt->vt_size); if (flags & VD_CHAR) { p = data; @@ -123,7 +124,7 @@ } else if (flags & VD_WCHAR) { if (flags & VD_COPY) - wp = wcsdup((wchar_t *)data); + wp = _wcsdup((wchar_t *)data); else wp = data; } @@ -168,7 +169,8 @@ for (i = 0; i < varev_table_size; i++) { if (varev_table[i].ve_handler == vt->vt_event) { MTX_LOCK(&varev_table[i], ve_mtx); - TAILQ_INSERT_TAIL(&varev_table[i].ve_vartags, vt, vt_evlist); + TAILQ_INSERT_TAIL(&varev_table[i].ve_vartags, + vt, vt_evlist); MTX_UNLOCK(&varev_table[i], ve_mtx); break; } @@ -225,14 +227,18 @@ error = vt->vt_update(vt, flags); if (error == 0) { if (vt->vt_size == 1) { - dprintf(DEBUG_VAR, "Variable %s set to %ls", vt->vt_name, - vt->vt_data[0].vtd_str); + dprintf(DEBUG_VAR, "Variable %s set to %ls %x", + vt->vt_name, vt->vt_data[0].vtd_str, +vt->vt_data[0].vtd_str); } else { dprintf(DEBUG_VAR, "Variable %s set to", vt->vt_name); +#ifdef DEBUG for (i = 0; i < vt->vt_size; i++) { - dprintf(DEBUG_VAR, "\t%ls", vt->vt_data[i].vtd_str); + dprintf(DEBUG_VAR, "\t%ls", + vt->vt_data[i].vtd_str); } +#endif } } else if (error < 0) { @@ -380,7 +386,8 @@ ifm->ifm_type != RTM_IFINFO) continue; MTX_LOCK(ve, ve_mtx); - TAILQ_FOREACH_SAFE(vt, &ve->ve_vartags, vt_evlist, vt2) { + TAILQ_FOREACH_SAFE(vt, &ve->ve_vartags, vt_evlist, + vt2) { update_var(vt, VTUF_UPDATE); } MTX_UNLOCK(ve, ve_mtx); @@ -415,26 +422,26 @@ wp = NULL; error = getifaddrs(&ifap); for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family == family) { - if (strncmp(ifa->ifa_name, ifnam, IFNAMSIZ) == 0) { + if (ifa->ifa_addr->sa_family != family) + continue; + if (strncmp(ifa->ifa_name, ifnam, IFNAMSIZ) != 0) + continue; - wp = realloc(wp, sizeof(wchar_t *) * (*len + 1)); - sa = ifa->ifa_addr; - sinaddr = NULL; - if (family == AF_INET) - sinaddr = &((struct sockaddr_in *)sa)->sin_addr; + wp = realloc(wp, sizeof(wchar_t *) * (*len + 1)); + sa = ifa->ifa_addr; + sinaddr = NULL; + if (family == AF_INET) + sinaddr = &((struct sockaddr_in *)sa)->sin_addr; #ifdef INET6 - else if (family == AF_INET6) - sinaddr = &((struct sockaddr_in6 *)sa)->sin6_addr; + else if (family == AF_INET6) + sinaddr = &((struct sockaddr_in6 *)sa)->sin6_addr; #endif - assert(sinaddr != NULL); - inet_ntop(family, sinaddr, addr, __ADDRSTRLEN); - plen = strlen(addr) + 1; - wp[*len] = malloc(plen * sizeof(wchar_t)); - mbstowcs(wp[*len], addr, plen); - (*len)++; - } - } + assert(sinaddr != NULL); + inet_ntop(family, sinaddr, addr, __ADDRSTRLEN); + plen = strlen(addr) + 1; + wp[*len] = malloc(plen * sizeof(wchar_t)); + mbstowcs(wp[*len], addr, plen); + (*len)++; } freeifaddrs(ifap); return (wp); @@ -511,7 +518,7 @@ { wchar_t **addrs; int error = 0; - size_t alen, i; + size_t alen, i, j; struct md_if *mif; struct dbr *dbr; struct vars *v; @@ -544,9 +551,11 @@ if (alen != vt->vt_size) clr_data(vt); else { - for (i = 0; i < alen; i++) - if (wcscmp(addrs[i], vt->vt_data[i].vtd_str) != 0) + for (i = 0; i < alen; i++) { + j = wcscmp(addrs[i], vt->vt_data[i].vtd_str); + if (j != 0) break; + } if (alen == i) { error = 1; for (i = 0; i < alen; i++) @@ -883,87 +892,103 @@ break; case VARIABLE: - if (*q == ')') { - varlen = (q - var); - vname = malloc(varlen + 1); - wcstombs(vname, var, varlen); - vname[varlen] = '\0'; - vt = get_variable(vars, vname, varlen); - if (vt == NULL) { - logger(LOG_ERR, "Unknown variable %s", vname); - free(vname); - state = NORMAL; - continue; - } - else if (!(vt->vt_flags & VT_OK)) { - dprintf(DEBUG_VAR, "Variable data on %s not ok", vname); - free(vname); - state = NORMAL; - goto error; - } + if (*q != ')') + break; - RW_RLOCK(vt, vt_lock); + varlen = (q - var); + vname = malloc(varlen + 1); + wcstombs(vname, var, varlen); + vname[varlen] = '\0'; + vt = get_variable(vars, vname, varlen); + if (vt == NULL) { + logger(LOG_ERR, + "Unknown variable %s", vname); + free(vname); + state = NORMAL; + continue; + } + else if (!(vt->vt_flags & VT_OK)) { + dprintf(DEBUG_VAR, + "Variable data on %s not ok", + vname); + free(vname); + state = NORMAL; + goto error; + } - /* - * For each existing string we append all variable data - * returned from this variable. - * (n-1) new strings are created in each loop where n - * is the number of data elements the variable holds. - */ - k = vtdl; - for (i = 0; i < vtdl; i++) { - j = vt->vt_size; - while (--j > 0) { - alen = realloc(alen, sizeof(size_t) * (k+1)); - alen[k] = alen[i]; - vtd = realloc(vtd, sizeof(struct vt_data) * (k+1)); + RW_RLOCK(vt, vt_lock); - /* - * Use the data in string (i) as template to - * our new string - */ - vtd[k].vtd_str = malloc(alen[k] * sizeof(wchar_t)); - vtd[k].vtd_len = vtd[i].vtd_len; - memcpy(vtd[k].vtd_str, vtd[i].vtd_str, - vtd[i].vtd_len * sizeof(wchar_t)); + /* + * For each existing string we append all + * variable data returned from this variable. + * (n-1) new strings are created in each loop + * where n is the number of data elements the + * variable holds. + */ + k = vtdl; + for (i = 0; i < vtdl; i++) { + j = vt->vt_size; + while (--j > 0) { + alen = realloc(alen, + sizeof(size_t) * (k+1)); + alen[k] = alen[i]; + vtd = realloc(vtd, + sizeof(struct vt_data) * (k+1)); - /* - * Expand (if needed) and append variable data - * to this string. - */ - if ((vtd[k].vtd_len + vt->vt_data[j].vtd_len) >= - alen[k]) { - alen[k] *= 2; - vtd[k].vtd_str = realloc(vtd[k].vtd_str, - alen[k] * sizeof(wchar_t)); - } - tmp = vtd[k].vtd_str + vtd[k].vtd_len; - memcpy(tmp, vt->vt_data[j].vtd_str, - vt->vt_data[j].vtd_len * sizeof(wchar_t)); - vtd[k].vtd_len += vt->vt_data[j].vtd_len; - k++; - } + /* + * Use the data in string (i) as + * template to our new string + */ + vtd[k].vtd_str = + malloc(alen[k] * sizeof(wchar_t)); + vtd[k].vtd_len = vtd[i].vtd_len; + memcpy(vtd[k].vtd_str, vtd[i].vtd_str, + vtd[i].vtd_len * sizeof(wchar_t)); /* - * At this point there are only one variable data - * element left, append it to the existing string (i). + * Expand (if needed) and append + * variable data to this string. */ - if ((vtd[i].vtd_len + vt->vt_data[i].vtd_len) >= alen[i]) { - alen[i] *= 2; - vtd[i].vtd_str = realloc(vtd[i].vtd_str, - alen[i] * sizeof(wchar_t)); + if ((vtd[k].vtd_len + + vt->vt_data[j].vtd_len) >= + alen[k]) { + alen[k] = vtd[k].vtd_len + + vt->vt_data[j].vtd_len + 1; + vtd[k].vtd_str = + realloc(vtd[k].vtd_str, + alen[k] * sizeof(wchar_t)); } - tmp = vtd[i].vtd_str + vtd[i].vtd_len; + tmp = vtd[k].vtd_str + vtd[k].vtd_len; memcpy(tmp, vt->vt_data[j].vtd_str, - vt->vt_data[j].vtd_len * sizeof(wchar_t)); - vtd[i].vtd_len += vt->vt_data[j].vtd_len; + vt->vt_data[j].vtd_len * + sizeof(wchar_t)); + vtd[k].vtd_len += + vt->vt_data[j].vtd_len; + k++; + } + + /* + * At this point there are only one + * variable data element left, append + * it to the existing string (i). + */ + if ((vtd[i].vtd_len + vt->vt_data[i].vtd_len) >= + alen[i]) { + alen[i] = vtd[i].vtd_len + + vt->vt_data[i].vtd_len + 1; + vtd[i].vtd_str = realloc(vtd[i].vtd_str, + alen[i] * sizeof(wchar_t)); + } + tmp = vtd[i].vtd_str + vtd[i].vtd_len; + memcpy(tmp, vt->vt_data[j].vtd_str, + vt->vt_data[j].vtd_len * sizeof(wchar_t)); + vtd[i].vtd_len += vt->vt_data[j].vtd_len; - } - RW_UNLOCK(vt, vt_lock); - vtdl = k; - free(vname); - state = NORMAL; } + RW_UNLOCK(vt, vt_lock); + vtdl = k; + free(vname); + state = NORMAL; break; } } From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:41: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 1188F16A403; Mon, 16 Jul 2007 01:41: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 8FC5516A401 for ; Mon, 16 Jul 2007 01:41:38 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E4D413C461 for ; Mon, 16 Jul 2007 01:41:38 +0000 (UTC) (envelope-from fli@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 l6G1fcJj092420 for ; Mon, 16 Jul 2007 01:41:38 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1fcvA092417 for perforce@freebsd.org; Mon, 16 Jul 2007 01:41:38 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:41:38 GMT Message-Id: <200707160141.l6G1fcvA092417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123574 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, 16 Jul 2007 01:41:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=123574 Change 123574 by fli@fli_nexus on 2007/07/16 01:41:33 - Move database record structures out of mdnsd.h, they live in dbrec.h now. - Remove thread/locking macros, they live in threads.h now. - Add the ability to start one-shot timers. - Add _wcsdup() as wcsdup only exsists in -current - Move query processing to its own routing and bring in support for multicast responses, unicast responses and legacy responses. Also add support for simultanesous probe tie-breaking (although quite un-tested). - On the response processing side, bring in support for collision detection (and defending). - Rename the md_if {} member mif_handle to mif_stack - Dump stack locking routines, the stack does its own locking now. - Fix the -f option which allows a configuration file to be specified. - Initiate probe when an interface is added and on link-state change. - Style fixes and various minor tweaks. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#4 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#4 (text+ko) ==== @@ -46,6 +46,7 @@ #include "mdnsd.h" #include "log.h" +#include "objalloc.h" int bufpool_lock(void *); int bufpool_unlock(void *); @@ -66,8 +67,6 @@ int evh_routesock_init(int, struct event_io *, ev_arg); int evh_routesock(struct event_io *, ev_arg); -int tmr_start(struct md_glob *, uint32_t, ev_handler_tmr, void *); -void tmr_stop(struct md_glob *, int); static int evh_cacheclean(const struct event_tmr *, const ev_arg); static void usage(char *); @@ -89,20 +88,39 @@ return (0); } +static int +tmr_init_oneshot(int what, struct event_tmr *ev, ev_arg arg) +{ + + switch (what) { + case EVENT_INIT_OPEN: + ev->evtmr_timeout = arg.int32; + ev->evtmr_oneshot = 1; + break; + case EVENT_INIT_CLOSE: + break; + } + return (0); +} + /* * Start a timer, returns a unique timer identifier */ int tmr_start(struct md_glob *g, uint32_t timeout, ev_handler_tmr handler, - void *arg) + void *arg, int oneshot) { int id; ev_arg eva, evai; evai.int32 = timeout; eva.ptr = arg; - id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva, - tmr_init, &evai); + if (oneshot) + id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva, + tmr_init_oneshot, &evai); + else + id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva, + tmr_init, &evai); return (id); } @@ -126,6 +144,7 @@ TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { if (if_aquire(mif, 1) != 0) continue; + cache_clean(&mif->mif_cache); if_release(mif, 1); } @@ -151,12 +170,14 @@ mif->mif_flags &= ~MIF_LINKUP; cache_destroy(&mif->mif_cache); cache_init(&mif->mif_cache); - dprintf(DEBUG_MISC, "Link state change to DOWN on %s", mif->mif_ifnam); + dprintf(DEBUG_MISC, "Link state change to DOWN on %s", + mif->mif_ifnam); } else { mif->mif_flags |= MIF_LINKUP; - /* TODO: call verify unique records */ - dprintf(DEBUG_MISC, "Link state change to UP on %s", mif->mif_ifnam); + dprintf(DEBUG_MISC, "Link state change to UP on %s", + mif->mif_ifnam); + dbr_probe_all(&mif->mif_dbr); } if_release(mif, 1); return (0); @@ -186,6 +207,25 @@ } /* + * Duplicate an wide character string + * XXX: Move to a better place + */ +wchar_t * +_wcsdup(const wchar_t *s) +{ + size_t len; + wchar_t *d; + + len = (wcslen(s) + 1) * sizeof(wchar_t); + d = malloc(len); + if (d == NULL) + return (NULL); + memcpy(d, s, len); + return (d); +} + + +/* * Generic I/O read-ready event initializtion */ int @@ -204,7 +244,280 @@ return (0); } +static inline void +record2rrset(struct record *r, struct record_type *rt, struct record_res *rr, + struct mdns_rrset *rs, int cflush) +{ + + MDNS_INIT_ASSERT(r, r_magic); + MDNS_INIT_ASSERT(rt, rt_magic); + MDNS_INIT_ASSERT(rr, rr_magic); + + mdns_rrset_name(rs, r->r_name); + rs->r_type = rt->rt_type; + rs->r_class = mdns_c_in; + rs->r_cflush = cflush; + rs->r_datalen = rr->rr_len; + rs->r_data = rr->rr_data; +} + +/* + * Callback routine from aggregation queue, called when a data + * object is supposed to be added to the packet. + */ +static void +aggr_resp_engine(struct mdns_pkgchain *pc, void *data) +{ + struct record *r; + struct record_type *rt; + struct record_res *rr; + struct dbr_res *ds; + struct mdns_rrset *mrs; + + rr = data; + MDNS_INIT_ASSERT(rr, rr_magic); + ds = record_res_getparent(rr); + MDNS_INIT_ASSERT(ds, ds_magic); + rt = rr->rr_type; + MDNS_INIT_ASSERT(rt, rt_magic); + r = rt->rt_record; + MDNS_INIT_ASSERT(r, r_magic); + + mrs = mdns_pkg_getrrset(); + record2rrset(r, rt, rr, mrs, 0); + mrs->r_ttl = ds->ds_ttl; + clock_gettime(CLOCK_REALTIME, &ds->ds_time); + mdns_pkg_addanswer(pc, mrs, 0); +} + +/* + * Initialize a response packet chain + */ +static void +aggr_resp_pkgchain(struct md_if *mif, struct mdns_pkgchain *pc) +{ + + mdns_pkgchain_init(&mif->mif_stack, pc, MDNS_PC_NONE); + mdns_pkg_sethdr(pc, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA); +} + /* + * Process a query packet + */ +static void +process_query(struct md_if *mif, struct mdns_packet *pkg, + struct mdns_head *hdr, struct sockaddr *from, socklen_t fromlen, int legacy) +{ + struct mdns_qset qs; + struct mdns_rrset rs, *rsp; + struct dbr_rec *dr; + struct dbr_res *ds; + struct cache_res *cr; + struct record_res *rr; + struct record_type *rt; + struct record *r; + int i, error, send_unicast; + time_t min, min2, max; + struct aqueue *aq; + struct timespec ts; + struct cache ac; + struct records auth; + struct mdns_pkgchain upc; + + clock_gettime(CLOCK_REALTIME, &ts); + + mdns_pkgchain_init(&mif->mif_stack, &upc, MDNS_PC_NONE); + mdns_pkg_sethdr(&upc, hdr->h_id, MDNS_HEAD_RESP | MDNS_HEAD_AA); + send_unicast = 0; + if (from->sa_family == AF_INET) + aq = &mif->mif_aq4; +#ifdef INET6 + else if (from->sa_family == AF_INET6) + aq = &mif->mif_aq6; +#endif + + /* + * Process the answer section first + */ + if (hdr->h_canswer > 0) + cache_init(&ac); + for (i = 0; i < hdr->h_canswer; i++) { + error = mdns_pkg_getanswer(pkg, i, &rs); + if (error != 0) + break; + if (rs.r_class != mdns_c_in) { + free(rs.r_data); + continue; + } + + /* + * Check if this is a resource we might respond to. + * If it is, check if it's on the output queue and + * remove it if TTL rules match, otherwise add it + * to answer suppression lookup cache. + */ + ds = dbr_find_res(&mif->mif_dbr, rs.r_name, rs.r_type, + rs.r_data, rs.r_datalen); + if (ds != NULL && !(ds->ds_flags & DS_INVALID)) { + rr = &ds->ds_res; + if (aq_inqueue(aq, rr)) { + if (rs.r_ttl > ds->ds_ttl / 2) + aq_dequeue(aq, rr); + } + else if (rs.r_ttl > ds->ds_ttl / 2) { + error = cache_add(&ac, &rs, NULL); + if (error == 1) + free(rs.r_data); + } + else + free(rs.r_data); + } + else { + free(rs.r_data); + } + } + + /* + * Process the authority section, data in here is used + * for probe tie breaking. + */ + if (hdr->h_cauth > 0) + records_init(&auth, mdns_c_in); + for (i = 0; i < hdr->h_cauth; i++) { + error = mdns_pkg_getauth(pkg, i, &rs); + if (error != 0) + break; + if (rs.r_class != mdns_c_in) { + free(rs.r_data); + continue; + } + record_get(&auth, &r, 0, rs.r_name); + record_res_add(r, &rr, 0, rs.r_type, + rs.r_data, rs.r_datalen); + } + + /* + * TC bit set, min 400-500 ms delay + * Questions > 1, min 20-120 ms delay + * Other, 0 ms + */ + if (hdr->h_flags & MDNS_HEAD_TC) + min2 = (random() % 101) + 400; + else if (hdr->h_cquestion > 1) + min2 = (random() % 101) + 20; + else + min = 0; + + /* + * Process the question section + */ + for (i = 0; i < hdr->h_cquestion; i++) { + error = mdns_pkg_getquestion(pkg, i, &qs); + if (error != 0) + break; + if (qs.q_class != mdns_c_in) + continue; + + dprintf(DEBUG_RECV, + "question for %s, type=%d, unicast=%d, legacy=%d", + qs.q_name, qs.q_type, qs.q_unicast, legacy); + + dr = dbr_find(&mif->mif_dbr, qs.q_name); + if (dr == NULL) + continue; + MDNS_INIT_ASSERT(dr, dr_magic); + /* + * Simultanesous probe tie-breaking + */ + if (dr->dr_flags & DR_PROBING && hdr->h_cauth > 0) { + record_get(&auth, &r, RECORD_NOINIT, qs.q_name); + dbr_tiebreak(&mif->mif_dbr, dr, r); + continue; + } + else if (!(dr->dr_flags & DR_OK)) { + dprintf(DEBUG_SEND, "Record %s found in " + "database, but is not marked ok (%x)", + qs.q_name, dr->dr_flags); + continue; + } + /* + * Fix delay time for if this record is + * marked as shared + */ + else if (dr->dr_flags & DR_SHARED && min2 == 0) + min = (random() % 101) + 20; + else + min = min2; + + /* Allow additional 500ms if aggreation is possible */ + max = min + 500; + + dprintf(DEBUG_SEND, "Found %s in database, responding", + qs.q_name); + if (legacy) + mdns_pkg_addquestion(&upc, &qs, MDNS_PKG_DUP); + + r = &dr->dr_rec; + record_foreach(rt, r) { + if (qs.q_type != rt->rt_type + && qs.q_type != mdns_in_any) + continue; + record_type_foreach(rr, rt) { + ds = record_res_getparent(rr); + if (ds->ds_flags & DS_INVALID) + continue; + if (hdr->h_canswer > 0) { + cr = cache_find(&ac, qs.q_name, + qs.q_type); + if (cr != NULL) + continue; + } + /* + * This clients needs/wants a unicast response, + * we also schedule a multicast response in we + * this resource hasn't been multicasted + * "recently". + */ + if (legacy || qs.q_unicast) { + rsp = mdns_pkg_getrrset(); + record2rrset(r, rt, rr, rsp, 0); + rsp->r_ttl = legacy ? 10 : ds->ds_ttl; + mdns_pkg_addanswer(&upc, rsp, 0); + send_unicast = 1; + /* + * Schedule a multicast response if + * the time this resource last was + * sent is greater than a quarter of + * its ttl. + */ + if ((ts.tv_sec - ds->ds_time.tv_sec) > + (int32_t)(ds->ds_ttl / 4)) + aq_enqueue(aq, rr, min, max); + } + /* + * Multicase response, only if not already in + * aggregation queue and it's at least one + * second since we last sent this resource. + */ + else if (!aq_inqueue(aq, rr) && + ts.tv_sec > ds->ds_time.tv_sec) + aq_enqueue(aq, rr, min, max); + } + } + } + + if (send_unicast) + oq_enqueue(&mif->mif_oq, &upc, from->sa_family, + from, fromlen); + if (hdr->h_canswer > 0) + cache_destroy(&ac); + if (hdr->h_cauth > 0) + records_destroy(&auth); + + mdns_pkgchain_free(&upc); +} + +/* * Process a mdns packet and generate appropriate responses * mif - Interface handle * pc - Packet chain @@ -213,64 +526,99 @@ * fromlen - Socket address length */ static int -pkgprocess(struct md_if *mif, struct mdns_pkgchain *pc, int type, +pkgprocess(struct md_if *mif, struct mdns_pkgchain *pc, int type __unused, struct sockaddr *from, socklen_t fromlen) { struct mdns_packet *pkg; + struct mdns_head hdr; struct mdns_rrset rs; - struct mdns_qset qs; - struct mdns_head hdr; - int i, error; + struct dbr_rec *dr; + int i, error, sinaddr_len, legacy; + in_port_t port; + void *sinaddr = NULL; + struct sockaddr_in *sin; +#ifdef INET6 + struct sockaddr_in6 *sin6; +#endif #ifdef DEBUG char addr[SOCK_MAXADDRLEN+1]; - void *sinaddr = NULL; +#endif + struct aqueue *aq; switch (from->sa_family) { case AF_INET: + sin = (struct sockaddr_in *)from; + port = sin->sin_port; sinaddr = &((struct sockaddr_in *)from)->sin_addr; + sinaddr_len = sizeof(struct in_addr); + aq = &mif->mif_aq4; break; #ifdef INET6 case AF_INET6: + sin6 = (struct sockaddr_in6 *)from; + port = sin6->sin6_port; sinaddr = &((struct sockaddr_in6 *)from)->sin6_addr; + sinaddr_len = sizeof(struct in6_addr); + aq = &mif->mif_aq6; break; #endif /* INET6 */ } + +#ifdef DEBUG inet_ntop(from->sa_family, sinaddr, addr, SOCK_MAXADDRLEN); - dprintf(DEBUG_RECV, "Packet received peer=%s, if=%s", addr, mif->mif_ifnam); + dprintf(DEBUG_RECV, "Packet received peer=%s, port=%d, if=%s", + addr, port, mif->mif_ifnam); #endif /* DEBUG */ pkg = mdns_pkgchain_curpkg(pc); mdns_pkg_gethdr(pkg, &hdr); - dprintf(DEBUG_RECV, "questions=%d, answers=%d, authority=%d", + dprintf(DEBUG_RECV, "type=%s, questions=%d, answers=%d, authority=%d", + hdr.h_flags & MDNS_HEAD_QUERY ? "query" : "resp", hdr.h_cquestion, hdr.h_canswer, hdr.h_cauth); + /* + * We are processing a query + */ if (hdr.h_flags & MDNS_HEAD_QUERY) { - for (i = 0; i < hdr.h_cquestion; i++) { - error = mdns_pkg_getquestion(pkg, i, &qs); - if (error != 0) - break; + legacy = (port != 5353) ? 1 : 0; + process_query(mif, pkg, &hdr, from, fromlen, legacy); + } - /* TODO: check db and reply. Do not reply if answer is - in answer section with ttl > own ttl/2 */ - } - } + /* + * We are processing a response + */ else if (hdr.h_flags & MDNS_HEAD_RESP) { + for (i = 0; i < hdr.h_canswer; i++) { error = mdns_pkg_getanswer(pkg, i, &rs); if (error != 0) break; - /* TODO: check db for conflicts */ + if (rs.r_class != mdns_c_in) { + free(rs.r_data); + continue; + } + + dr = dbr_find(&mif->mif_dbr, rs.r_name); + if (dr != NULL && !(dr->dr_flags & DR_SHARED)) { + dprintf(DEBUG_SEND, "Conflicting name %s " + "with peer %s", rs.r_name, addr); + dbr_defend(&mif->mif_dbr, dr, &rs, + from->sa_family); + continue; + } + + /* TODO: check for waiting clients */ /* TODO: check for pending questions matching this */ /* TODO: check for pending answers matching this */ /* - * Purge records older than 1 second if this is supposed to - * be a uniqe rrset (cache flush bit set) + * Purge records older than 1 second if this is + * supposed to be a unique rrset (cache flush bit set) */ if (rs.r_cflush) - cache_purge(&mif->mif_cache, 1, rs.r_name, rs.r_type); - + cache_purge(&mif->mif_cache, 1, rs.r_name, + rs.r_type); error = cache_add(&mif->mif_cache, &rs, NULL); if (error == 1) free(rs.r_data); @@ -313,14 +661,13 @@ * Initialize a packet chain, receive the packet and hand it to the * packet processor. */ - mdns_pkgchain_init(&mif->mif_handle, &pc, MDNS_PC_NONE, stack_lock, - stack_unlock, mif); + mdns_pkgchain_init(&mif->mif_stack, &pc, MDNS_PC_NONE); - n = mdns_recv(&mif->mif_handle, &pc, sa.sa_family, saptr, &salen); + n = mdns_recv(&mif->mif_stack, &pc, sa.sa_family, saptr, &salen); if (n <= 0) { if (n == 0) { - dprintf(DEBUG_RECV, "No data on UDP socket sock=%d, mif=%x", - fd, mif); + dprintf(DEBUG_RECV, + "No data on UDP socket sock=%d, mif=%x", fd, mif); } error = -1; goto out; @@ -330,7 +677,7 @@ error = pkgprocess(mif, &pc, MDNS_UDP, saptr, salen); out: - mdns_pkgchain_free(&mif->mif_handle, &pc); + mdns_pkgchain_free(&pc); if_release(mif, 0); return (error); } @@ -354,7 +701,7 @@ #endif fd = ev->evio_fd; - sock = mdns_tcp_client(&mif->mif_handle, fd, &sa, &salen); + sock = mdns_tcp_client(&mif->mif_stack, fd, &sa, &salen); if (sock < 0) return (0); @@ -406,14 +753,13 @@ if (if_aquire(mif, 0) != 0) return (-1); - mdns_pkgchain_init(&mif->mif_handle, &pc, MDNS_PC_CONT, stack_lock, - stack_unlock, mif); + mdns_pkgchain_init(&mif->mif_stack, &pc, MDNS_PC_CONT); - n = mdns_tcp_recv(&mif->mif_handle, fd, &pc); + n = mdns_tcp_recv(&mif->mif_stack, fd, &pc); if (n <= 0) { if (n == 0) { - dprintf(DEBUG_RECV, "No data on TCP socket sock=%d, mif=%x", - fd, mif); + dprintf(DEBUG_RECV, + "No data on TCP socket sock=%d, mif=%x", fd, mif); } error = -1; goto out; @@ -426,43 +772,12 @@ error = pkgprocess(mif, &pc, MDNS_TCP, &sa, salen); out: - mdns_pkgchain_free(&mif->mif_handle, &pc); + mdns_pkgchain_free(&pc); if_release(mif, 0); return (error); } /* - * Aquire interface write lock, read lock should be held - * Called from mdns stack during packet allocation. - */ -int -stack_lock(void *arg) -{ - struct md_if *mif; - - mif = (struct md_if *)arg; - if_release(mif, 0); - if_aquire(mif, 1); - return (0); -} - -/* - * Downgrade write lock to read lock - * Called from mdns stack after packet allocation. - */ -int -stack_unlock(void *arg) -{ - struct md_if *mif; - - mif = (struct md_if *)arg; - if_release(mif, 1); - if_aquire(mif, 0); - return (0); -} - - -/* * Buffer pool lock * Called from mdns stack during buffer pool allocations */ @@ -550,15 +865,15 @@ g = mif->mif_glob; eva.ptr = mif; /* Open up UDP and TCP INET sockets */ - error = mdns_open(&mif->mif_handle, MDNS_UDP, PF_INET); + error = mdns_open(&mif->mif_stack, MDNS_UDP, PF_INET); if (error == 0) mif->mif_flags |= MIF_UDP4; - error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET); + error = mdns_open(&mif->mif_stack, MDNS_TCP, PF_INET); if (error == 0) mif->mif_flags |= MIF_TCP4; /* Install read-ready event to UDP INET socket */ - socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET, &socklen); + socks = mdns_get_sock(&mif->mif_stack, MDNS_UDP, PF_INET, &socklen); if (socklen == 1) { evai.fd = socks[0]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_udp_recv, &eva, @@ -567,37 +882,39 @@ ADD2EVLIST(mif, error); } else { - dprintf(DEBUG_EVENT, "Failed to add read event for UDP (INET)"); + dprintf(DEBUG_EVENT, + "Failed to add read event for UDP (INET)"); } } /* Install read-ready event to TCP INET socket */ - socks = mdns_get_sock(&mif->mif_handle, MDNS_TCP, PF_INET, &socklen); + socks = mdns_get_sock(&mif->mif_stack, MDNS_TCP, PF_INET, &socklen); if (socklen > 0) { for (i = 0; i < socklen; i++) { evai.fd = socks[i]; - error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, &eva, - evh_ioread_init, &evai); + error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, + &eva, evh_ioread_init, &evai); if (error >= 0) { ADD2EVLIST(mif, error); } else { - dprintf(DEBUG_EVENT, "Failed to add read event to TCP (INET)"); + dprintf(DEBUG_EVENT, + "Failed to add read event to TCP (INET)"); } } } #ifdef INET6 /* Open up UDP and TCP INET6 sockets */ - error = mdns_open(&mif->mif_handle, MDNS_UDP, PF_INET6); + error = mdns_open(&mif->mif_stack, MDNS_UDP, PF_INET6); if (error == 0) mif->mif_flags |= MIF_UDP6; - error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET6); + error = mdns_open(&mif->mif_stack, MDNS_TCP, PF_INET6); if (error == 0) mif->mif_flags |= MIF_TCP6; /* Install read-ready event to UDP INET6 socket */ - socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET6, &socklen); + socks = mdns_get_sock(&mif->mif_stack, MDNS_UDP, PF_INET6, &socklen); if (socklen == 1) { evai.fd = socks[0]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_udp_recv, &eva, @@ -606,22 +923,24 @@ ADD2EVLIST(mif, error); } else { - dprintf(DEBUG_EVENT, "Failed to add read event for UDP (INET6)"); + dprintf(DEBUG_EVENT, + "Failed to add read event for UDP (INET6)"); } } /* Install read-ready event to TCP INET6 socket */ - socks = mdns_get_sock(&mif->mif_handle, MDNS_TCP, PF_INET6, &socklen); + socks = mdns_get_sock(&mif->mif_stack, MDNS_TCP, PF_INET6, &socklen); if (socklen > 0) { for (i = 0; i < socklen; i++) { evai.fd = socks[i]; - error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, &eva, - evh_ioread_init, &evai); + error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, + &eva, evh_ioread_init, &evai); if (error >= 0) { ADD2EVLIST(mif, error); } else { - dprintf(DEBUG_EVENT, "Failed to add read event to TCP (INET6)"); + dprintf(DEBUG_EVENT, + "Failed to add read event to TCP (INET6)"); } } } @@ -660,7 +979,6 @@ return (LINK_STATE_UNKNOWN); } - /* * Allocate a new interface */ @@ -669,35 +987,57 @@ { struct md_if *mif; int error; + struct aq_func aqf; mif = malloc(sizeof(struct md_if)); if (mif == NULL) return (NULL); bzero(mif, sizeof(struct md_if)); + MDNS_INIT_SET(mif, mif_magic); mif->mif_index = if_nametoindex(ifnam); if (mif->mif_index == 0) goto out; strncpy(mif->mif_ifnam, ifnam, IFNAMSIZ); /* Initialize low-level mdns stack on this interface */ - error = mdns_init(&mif->mif_handle, g->g_bp, ifnam); + error = mdns_init(&mif->mif_stack, g->g_bp, ifnam); if (error != 0) goto out; + MTX_INIT(mif, mif_stack_mtx, NULL); RW_INIT(mif, mif_lock, NULL); RW_WLOCK(mif, mif_lock); mif->mif_glob = g; TAILQ_INIT(&mif->mif_evlist); - + if (get_linkstatus(ifnam) != LINK_STATE_DOWN) + mif->mif_flags |= MIF_LINKUP; + + /* Initialize cache */ cache_init(&mif->mif_cache); - if (get_linkstatus(ifnam) != LINK_STATE_DOWN) - mif->mif_flags |= MIF_LINKUP; + /* Initialize output queue */ + oq_init(&mif->mif_oq, mif); + + /* Initialize multicast aggregation queues */ + aqf.aqf_engine = aggr_resp_engine; + aqf.aqf_pcinit = aggr_resp_pkgchain; + aqf.aqf_enqueue = aqf.aqf_dequeue = NULL; + aq_init(&mif->mif_aq4, &mif->mif_oq, &aqf, AF_INET, NULL, 0); +#ifdef INET6 + aq_init(&mif->mif_aq6, &mif->mif_oq, &aqf, AF_INET6, NULL, 0); +#endif + + /* Initialize self-claimed record database */ + dbr_init(&mif->mif_dbr, mif); + + /* Bring up sockets, at this point we might receive packets */ setup_socks(mif); - MDNS_INIT_SET(mif, mif_magic); - dbr_init(&mif->mif_dbr, mif); - cfg_read(&mif->mif_dbr, ifnam, "mdnsd.conf"); + /* + * Read configuration file and create self-claimed records. + * This is done after socket setup so probing is safe to start. + */ + cfg_read(&mif->mif_dbr, ifnam, g->g_cfgfile); RW_WLOCK(g, g_lock); TAILQ_INSERT_TAIL(&g->g_ifs, mif, mif_next); @@ -706,6 +1046,8 @@ RW_UNLOCK(mif, mif_lock); logger(LOG_NOTICE, "Added interface %s", mif->mif_ifnam); + dbr_probe_all(&mif->mif_dbr); + return (mif); out: free(mif); @@ -735,7 +1077,13 @@ free(ifev); } - mdns_destroy(&mif->mif_handle); + aq_destroy(&mif->mif_aq4); +#ifdef INET6 + aq_destroy(&mif->mif_aq6); +#endif + oq_destroy(&mif->mif_oq); + + mdns_destroy(&mif->mif_stack); cache_destroy(&mif->mif_cache); dbr_destroy(&mif->mif_dbr); @@ -780,6 +1128,71 @@ return (0); } +static inline void +ifevent(struct md_glob *g, struct if_msghdr *ifm) +{ + struct md_if *mif; + struct md_if_ev *ifev, *ifev2; + char ifnam[IFNAMSIZ]; + + RW_RLOCK(g, g_lock); + mif = if_indextodata(g, ifm->ifm_index); + RW_UNLOCK(g, g_lock); + + if (ifm->ifm_type == RTM_IFINFO) { + if ((ifm->ifm_flags & (IFF_UP | IFF_MULTICAST)) == + (IFF_UP | IFF_MULTICAST) && mif == NULL) { + if (if_indextoname(ifm->ifm_index, ifnam) != NULL) + if_new(g, ifnam); + } + else if (!(ifm->ifm_flags & IFF_UP) && mif != NULL) { + if_del(g, mif); + } + else { + if (if_aquire(mif, 1) != 0) + return; + + if (mif->mif_flags & MIF_LINKCHG) { + tmr_stop(g, mif->mif_tmr); + mif->mif_flags &= ~MIF_LINKCHG; + dprintf(DEBUG_MISC, "Link on %s restored, " + "ignoring state change", mif->mif_ifnam); + } + else if ((ifm->ifm_data.ifi_link_state == + LINK_STATE_UP && + !(mif->mif_flags & MIF_LINKUP)) || + (ifm->ifm_data.ifi_link_state == LINK_STATE_DOWN && + mif->mif_flags & MIF_LINKUP)) { + mif->mif_flags |= MIF_LINKCHG; + mif->mif_tmr = tmr_start(g, 3000, evh_linkchg, + mif, 0); + } + if_release(mif, 1); + } + } + + if (mif == NULL) + return; + + if (ifm->ifm_type == RTM_DELADDR || ifm->ifm_type == RTM_NEWADDR) { + if_aquire(mif, 1); + TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { + event_del(g->g_evl, ifev->ifev_id, NULL); + TAILQ_REMOVE(&mif->mif_evlist, ifev, ifev_next); + free(ifev); + } + mdns_close(&mif->mif_stack, MDNS_UDP, PF_INET); + mdns_close(&mif->mif_stack, MDNS_TCP, PF_INET); +#ifdef INET6 + mdns_close(&mif->mif_stack, MDNS_UDP, PF_INET6); + mdns_close(&mif->mif_stack, MDNS_TCP, PF_INET6); +#endif + mif->mif_flags &= ~(MIF_UDP4 | MIF_TCP4 | MIF_UDP6 | MIF_TCP6); + setup_socks(mif); + if_release(mif, 1); + } +} + /* * Routing socket event handler * This will monitor a routing socket and add/remove interfaces as @@ -790,12 +1203,10 @@ { #define RS_BUFLEN (sizeof(struct rt_msghdr) + 512) struct md_glob *g = (struct md_glob *)arg.ptr; - struct md_if *mif; struct if_msghdr *ifm; int len, sock; char *next, *lim; - struct md_if_ev *ifev, *ifev2; - char buf[RS_BUFLEN], ifnam[IFNAMSIZ]; + char buf[RS_BUFLEN]; sock = ev->evio_fd; @@ -808,65 +1219,7 @@ ifm = (struct if_msghdr *) next; if (ifm->ifm_flags & IFF_LOOPBACK) continue; - - RW_RLOCK(g, g_lock); - mif = if_indextodata(g, ifm->ifm_index); - RW_UNLOCK(g, g_lock); - - if (ifm->ifm_type == RTM_IFINFO) { - if (ifm->ifm_flags & IFF_UP && mif == NULL) { - if (ifm->ifm_flags & IFF_MULTICAST) - if (if_indextoname(ifm->ifm_index, ifnam) != NULL) - if_new(g, ifnam); - } - else if (!(ifm->ifm_flags & IFF_UP) && mif != NULL) { - if_del(g, mif); - } - else { - if (if_aquire(mif, 1) != 0) - continue; - - if (mif->mif_flags & MIF_LINKCHG) { - tmr_stop(g, mif->mif_tmr); - mif->mif_flags &= ~MIF_LINKCHG; - dprintf(DEBUG_MISC, - "Link on %s re-restored, ignoring state change", - mif->mif_ifnam); - } - else if ((ifm->ifm_data.ifi_link_state == LINK_STATE_UP && - !(mif->mif_flags & MIF_LINKUP)) || - (ifm->ifm_data.ifi_link_state == LINK_STATE_DOWN && - mif->mif_flags & MIF_LINKUP)) { - mif->mif_flags |= MIF_LINKCHG; - mif->mif_tmr = tmr_start(g, 3000, evh_linkchg, mif); - } - if_release(mif, 1); - } - } - - if (mif == NULL) { - continue; - } - - if_aquire(mif, 1); - if (ifm->ifm_type == RTM_DELADDR) { - TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { - event_del(g->g_evl, ifev->ifev_id, NULL); - TAILQ_REMOVE(&mif->mif_evlist, ifev, ifev_next); - free(ifev); - } - mdns_close(&mif->mif_handle, MDNS_UDP, PF_INET); - mdns_close(&mif->mif_handle, MDNS_TCP, PF_INET); -#ifdef INET6 - mdns_close(&mif->mif_handle, MDNS_UDP, PF_INET6); - mdns_close(&mif->mif_handle, MDNS_TCP, PF_INET6); -#endif - mif->mif_flags &= ~(MIF_UDP4 | MIF_TCP4 | MIF_UDP6 | MIF_TCP6); - } - else if (ifm->ifm_type == RTM_NEWADDR) { - setup_socks(mif); - } - if_release(mif, 1); + ifevent(g, ifm); } } @@ -912,6 +1265,7 @@ RW_INIT(&glob, g_lock, NULL); MTX_INIT(&glob, g_bp_mtx, NULL); TAILQ_INIT(&glob.g_ifs); + glob.g_cfgfile = cfgfile != NULL ? cfgfile : strdup(DEFAULT_CFGFILE); /* Initialize logging */ log_init(!nodaemon); @@ -927,11 +1281,16 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:43: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 2A87116A40A; Mon, 16 Jul 2007 01:43: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 F0DEB16A400 for ; Mon, 16 Jul 2007 01:43:41 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E195C13C4B6 for ; Mon, 16 Jul 2007 01:43:41 +0000 (UTC) (envelope-from fli@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 l6G1hfXu092554 for ; Mon, 16 Jul 2007 01:43:41 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1hfJZ092549 for perforce@freebsd.org; Mon, 16 Jul 2007 01:43:41 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:43:41 GMT Message-Id: <200707160143.l6G1hfJZ092549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123575 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, 16 Jul 2007 01:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123575 Change 123575 by fli@fli_nexus on 2007/07/16 01:43:17 - Give the object allocator an debug output mask - Fix hexdumping code (again) Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#3 (text+ko) ==== @@ -44,6 +44,7 @@ #define DEBUG_CFGPARSE 0x0400 #define DEBUG_VAR 0x0800 #define DEBUG_MISC 0x1000 +#define DEBUG_OA 0x2000 /* * Structure initialization protection @@ -63,10 +64,10 @@ #endif #ifdef DEBUG -# define HEXDUMP(__buf, _len) do { \ +# define HEXDUMP(_buf, _len) do { \ { \ size_t __tmp; \ - char *__buf = (char *)__buf; \ + char *__buf = (char *)_buf; \ for (__tmp = 0; __tmp < _len; __tmp++) \ printf("%.2x ", *__buf++); \ printf("\n"); \ From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:44: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 EC05D16A406; Mon, 16 Jul 2007 01:44: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 BDB9B16A404 for ; Mon, 16 Jul 2007 01:44:43 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AEC4A13C4A3 for ; Mon, 16 Jul 2007 01:44:43 +0000 (UTC) (envelope-from fli@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 l6G1ihcL092608 for ; Mon, 16 Jul 2007 01:44:43 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1ihUL092605 for perforce@freebsd.org; Mon, 16 Jul 2007 01:44:43 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:44:43 GMT Message-Id: <200707160144.l6G1ihUL092605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123576 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, 16 Jul 2007 01:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=123576 Change 123576 by fli@fli_nexus on 2007/07/16 01:44:04 Hook up new files to the build and, yep, debug mask tweak. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ SRCS= stack_mdns.c stack_packet.c stack_buf.c stack_util.c hash.c \ utf8.c event.c wqueue.c log.c mdnsd.c record.c cache.c dbrec.c var.c \ - token.l parse.y y.tab.h + output.c output_aggr.c objalloc.c token.l parse.y y.tab.h PROG= mdnsd WARNS?= 4 -CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0x1fec +CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0x1bd0 .if !defined(WITHOUT_INET6) CFLAGS+= -DINET6 .endif From owner-p4-projects@FreeBSD.ORG Mon Jul 16 01:48: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 C076516A404; Mon, 16 Jul 2007 01:48: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 8A53816A402 for ; Mon, 16 Jul 2007 01:48:49 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 62F0113C442 for ; Mon, 16 Jul 2007 01:48:49 +0000 (UTC) (envelope-from fli@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 l6G1mnbh092820 for ; Mon, 16 Jul 2007 01:48:49 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G1mnPH092817 for perforce@freebsd.org; Mon, 16 Jul 2007 01:48:49 GMT (envelope-from fli@FreeBSD.org) Date: Mon, 16 Jul 2007 01:48:49 GMT Message-Id: <200707160148.l6G1mnPH092817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123577 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, 16 Jul 2007 01:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123577 Change 123577 by fli@fli_nexus on 2007/07/16 01:48:33 Add a sample configuration file which should be good enought for most cases. It will claim A records for the machines hostname, one for each existing IPv4 addresses, the same for existing IPv6 addresses but of course with AAAA records. Matching PTR records are also created for all addresses. If hostname.local should be in use it will fallback to using hostname-ifname.local instead. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.conf.sample#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 03:03: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 18FE016A403; Mon, 16 Jul 2007 03:03: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 C652716A400 for ; Mon, 16 Jul 2007 03:03:25 +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 B63C813C428 for ; Mon, 16 Jul 2007 03:03:25 +0000 (UTC) (envelope-from gcooper@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 l6G33Pqr000250 for ; Mon, 16 Jul 2007 03:03:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G33PoX000247 for perforce@freebsd.org; Mon, 16 Jul 2007 03:03:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 16 Jul 2007 03:03:25 GMT Message-Id: <200707160303.l6G33PoX000247@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 123578 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, 16 Jul 2007 03:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=123578 Change 123578 by gcooper@optimus-revised_pkgtools on 2007/07/16 03:02:24 2 mistakes. -Make sure that fd isn't NULL, instead of NULL. -It's not O_RDONLY, it's "r" for fopen. Funny why gcc didn't pick up that error... Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 (text+ko) ==== @@ -195,9 +195,9 @@ { char *contents; - FILE *fd = fopen(fname, O_RDONLY); + FILE *fd = fopen(fname, "r"); - if (fd != NULL) { + if (fd == NULL) { cleanup(0); errx(2, "%s: unable to open '%s' for reading", __func__, fname); } From owner-p4-projects@FreeBSD.ORG Mon Jul 16 03:17: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 3739016A407; Mon, 16 Jul 2007 03:17: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 E39A316A400; Mon, 16 Jul 2007 03:17:08 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mxout7.cac.washington.edu (mxout7.cac.washington.edu [140.142.32.178]) by mx1.freebsd.org (Postfix) with ESMTP id C168F13C4BF; Mon, 16 Jul 2007 03:17:08 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from smtp.washington.edu (smtp.washington.edu [140.142.32.141] (may be forged)) by mxout7.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW07.06) with ESMTP id l6G3H89T029837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 15 Jul 2007 20:17:08 -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 l6G3H7Bj011257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 15 Jul 2007 20:17:07 -0700 Message-ID: <469AE332.5060007@gmail.com> Date: Sun, 15 Jul 2007 20:17:06 -0700 From: Garrett Cooper User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: Garrett Cooper References: <200707160303.l6G33PoX000247@repoman.freebsd.org> In-Reply-To: <200707160303.l6G33PoX000247@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.15.195333 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 123578 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, 16 Jul 2007 03:17:09 -0000 Garrett Cooper wrote: > http://perforce.freebsd.org/chv.cgi?CH=123578 > > Change 123578 by gcooper@optimus-revised_pkgtools on 2007/07/16 03:02:24 > > 2 mistakes. > -Make sure that fd isn't NULL, instead of NULL. > -It's not O_RDONLY, it's "r" for fopen. Funny why gcc didn't pick up that error... > > Affected files ... > > .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 edit > > Differences ... > > ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#7 (text+ko) ==== > > @@ -195,9 +195,9 @@ > { > char *contents; > > - FILE *fd = fopen(fname, O_RDONLY); > + FILE *fd = fopen(fname, "r"); > > - if (fd != NULL) { > + if (fd == NULL) { > cleanup(0); > errx(2, "%s: unable to open '%s' for reading", __func__, fname); > } > > Of course.. O_RDONLY was being interpreted as NULL most likely since its decimal value's 0.. -Garrett From owner-p4-projects@FreeBSD.ORG Mon Jul 16 06: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 0CA2A16A403; Mon, 16 Jul 2007 06: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 B83CE16A402 for ; Mon, 16 Jul 2007 06:57:15 +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 A7EC613C4A7 for ; Mon, 16 Jul 2007 06:57:15 +0000 (UTC) (envelope-from zhouzhouyi@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 l6G6vF3p029330 for ; Mon, 16 Jul 2007 06:57:15 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G6vFhR029327 for perforce@freebsd.org; Mon, 16 Jul 2007 06:57:15 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 16 Jul 2007 06:57:15 GMT Message-Id: <200707160657.l6G6vFhR029327@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 123580 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, 16 Jul 2007 06:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123580 Change 123580 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/16 06:57:02 checking the effects of BLP when security.mac.mls.enabled=1 Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#7 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/02.t#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#7 (text+ko) ==== @@ -43,8 +43,8 @@ { e="${1}" shift - ${mactest} $* 2>${tmp_file} 1>>${tmp_file} - r=`cat ${tmp_file}` + ${mactest} $* 2>/dev/null 1>>${tmp_file} + r=`cat ${tmp_file}|tail -1` echo "${r}" | egrep '^'${e}'$' >/dev/null 2>&1 if [ $? -eq 0 ] && [ ${#r} -eq ${#e} ]; then echo "ok ${ntest}" ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#5 (text+ko) ==== @@ -109,5 +109,6 @@ #cleanup: cd .. rm -fr ${n1} + rm ${mactest_conf} fi ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#2 (text+ko) ==== @@ -793,6 +793,7 @@ if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || strcmp(dev->si_name, "random") == 0 || + strcmp(dev->si_name, "mactest") == 0 || strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) biba_type = MAC_BIBA_TYPE_EQUAL; else if (ptys_equal && ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#2 (text+ko) ==== @@ -754,6 +754,7 @@ mac_mls = SLOT(delabel); if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || + strcmp(dev->si_name, "mactest") == 0 || strcmp(dev->si_name, "random") == 0 || strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) mls_type = MAC_MLS_TYPE_EQUAL; From owner-p4-projects@FreeBSD.ORG Mon Jul 16 08:43: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 E322216A405; Mon, 16 Jul 2007 08:43: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 8707616A404 for ; Mon, 16 Jul 2007 08:43:29 +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 75E9A13C491 for ; Mon, 16 Jul 2007 08:43:29 +0000 (UTC) (envelope-from zec@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 l6G8hTeY039733 for ; Mon, 16 Jul 2007 08:43:29 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G8hPVl039730 for perforce@freebsd.org; Mon, 16 Jul 2007 08:43:25 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 16 Jul 2007 08:43:25 GMT Message-Id: <200707160843.l6G8hPVl039730@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 123581 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, 16 Jul 2007 08:43:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123581 Change 123581 by zec@zec_tpx32 on 2007/07/16 08:42:41 IFC @ 123549 Affected files ... .. //depot/projects/vimage/src/sys/Makefile#6 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/vimage/src/sys/coda/00READ#2 delete .. //depot/projects/vimage/src/sys/coda/README#2 delete .. //depot/projects/vimage/src/sys/coda/TODO#2 delete .. //depot/projects/vimage/src/sys/coda/cnode.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_io.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_kernel.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_namecache.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_namecache.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_opstats.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_psdev.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_psdev.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_subr.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_subr.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_venus.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_venus.h#2 delete .. //depot/projects/vimage/src/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/vimage/src/sys/coda/coda_vfsops.h#3 delete .. //depot/projects/vimage/src/sys/coda/coda_vnops.c#5 delete .. //depot/projects/vimage/src/sys/coda/coda_vnops.h#3 delete .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#12 integrate .. //depot/projects/vimage/src/sys/conf/files#14 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/vimage/src/sys/conf/options#14 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/vimage/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.dat.gz.uu#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/vimage/src/sys/fs/coda/README#1 branch .. //depot/projects/vimage/src/sys/fs/coda/TODO#1 branch .. //depot/projects/vimage/src/sys/fs/coda/cnode.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/vimage/src/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/vimage/src/sys/fs/msdosfs/bpb.h#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/vimage/src/sys/i386/include/pc/vesa.h#3 integrate .. //depot/projects/vimage/src/sys/i4b/capi/capi_l4if.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_isa.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/include/i4b_cause.h#1 branch .. //depot/projects/vimage/src/sys/i4b/include/i4b_debug.h#1 branch .. //depot/projects/vimage/src/sys/i4b/include/i4b_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/i4b/include/i4b_l1l2.h#2 integrate .. //depot/projects/vimage/src/sys/i4b/include/i4b_rbch_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/i4b/include/i4b_tel_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/i4b/include/i4b_trace.h#1 branch .. //depot/projects/vimage/src/sys/i4b/layer1/i4b_l1dmux.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_iframe.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_lme.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_sframe.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_tei.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_uframe.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer2/i4b_util.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l2if.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3fsm.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3timer.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l4if.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q931.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q932fac.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer4/i4b_i4bdrv.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4timer.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#9 integrate .. //depot/projects/vimage/src/sys/modules/coda/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/vimage/src/sys/netatm/atm_proto.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#3 edit .. //depot/projects/vimage/src/sys/netinet/sctp.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/vimage/src/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#15 edit .. //depot/projects/vimage/src/sys/netinet/udp_var.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/dest6.c#4 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_var.h#6 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_output.c#7 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/include/i4b_cause.h#2 delete .. //depot/projects/vimage/src/sys/pc98/include/i4b_debug.h#2 delete .. //depot/projects/vimage/src/sys/pc98/include/i4b_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/pc98/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/pc98/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/pc98/include/i4b_trace.h#2 delete .. //depot/projects/vimage/src/sys/pci/agp.c#2 integrate .. //depot/projects/vimage/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/vimage/src/sys/pci/agppriv.h#2 integrate .. //depot/projects/vimage/src/sys/pci/agpreg.h#3 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#6 integrate .. //depot/projects/vimage/src/sys/sys/param.h#10 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#7 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#5 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_meter.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_phys.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_phys.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#6 integrate Differences ... ==== //depot/projects/vimage/src/sys/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $ +# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ .include @@ -8,7 +8,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1023,7 +1023,8 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimit + linux32_fixlimit, + &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/vimage/src/sys/boot/arm/at91/Makefile.inc#3 (text) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.6 2006/12/20 17:47:54 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm __at91_boot_Makefile.inc__: -# tsc, bwct, kb920x are the supported flavors -BOOT_FLAVOR=kb920x +# tsc, bwct, kb920x, centipad are the supported flavors +BOOT_FLAVOR?=kb920x CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/board.h#2 (text+ko) ==== @@ -21,8 +21,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.1 2006/11/09 20:07:26 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $ */ void Update(void); void board_init(void); +int drvread(void *, unsigned, unsigned); ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $"); #include #include @@ -26,9 +26,7 @@ #include -#include "emac.h" #include "lib.h" -#include "sd-card.h" #include "board.h" #define RBX_ASKNAME 0x0 /* -a */ @@ -84,8 +82,6 @@ RBX_VERBOSE }; -unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; - unsigned dsk_start; static char cmd[512]; static char kname[1024]; @@ -96,7 +92,6 @@ static int parse(void); static int xfsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); -static int drvread(void *, unsigned, unsigned); #include "ufsread.c" @@ -147,10 +142,6 @@ ino_t ino; board_init(); - EMAC_Init(); - EMAC_SetMACAddress(mac); - while (sdcard_init() == 0) - printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ @@ -179,14 +170,11 @@ xputchar('\n'); autoboot = 0; c = 0; - printf("cmd is '%s'\n", cmd); if (parse()) xputchar('\a'); #ifdef XMODEM_DL else if (*cmd == '*') - Update(); - else if (*cmd == '#') - reset(); + Update(); #endif else load(); @@ -281,14 +269,14 @@ dp = (void *)(sec + DOSPARTOFF); for (i = 0; i < NDOSPART; i++) { if (dp[i].dp_typ == DOSPTYP_386BSD) - break; + break; } if (i == NDOSPART) - return -1; + return -1; // Although dp_start is aligned within the disk partition structure, // DOSPARTOFF is 446, which is only word (2) aligned, not longword (4) // aligned. Cope by using memcpy to fetch the start of this partition. - memcpy(&dsk_start, &dp[i].dp_start, 4); + memcpy(&dsk_start, &dp[1].dp_start, 4); if (drvread(sec, dsk_start + LABELSECTOR, 1)) return -1; d = (void *)(sec + LABELOFFSET); @@ -306,12 +294,3 @@ } return drvread(buf, dsk_start + lba, nblk); } - -static int -drvread(void *buf, unsigned lba, unsigned nblk) -{ - static unsigned c = 0x2d5c7c2f; - - printf("%c\b", c = c << 8 | c >> 24); - return (MCI_read((char *)buf, lba << 9, nblk << 9)); -} ==== //depot/projects/vimage/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== @@ -24,15 +24,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.3 2006/11/09 20:08:46 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $"); #include #include "emac.h" #include "lib.h" #include "board.h" +#include "sd-card.h" -extern unsigned char mac[]; +unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; static void MacFromEE() @@ -40,7 +41,7 @@ uint32_t sig; sig = 0; ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) + if (sig != 0x92021054) return; ReadEEPROM(12 * 1024 + 4, mac, 6); printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], @@ -57,4 +58,14 @@ { InitEEPROM(); MacFromEE(); + EMAC_Init(); + EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); +} + +int +drvread(void *buf, unsigned lba, unsigned nblk) +{ + return (MCI_read((char *)buf, lba << 9, nblk << 9)); } ==== //depot/projects/vimage/src/sys/boot/arm/at91/libat91/Makefile#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.8 2007/03/15 03:31:49 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -8,7 +8,7 @@ putchar.c printf.c reset.c spi_flash.c xmodem.c \ sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \ memset.c memcmp.c -SRCS+=ashldi3.c divsi3.S +SRCS+=ashldi3.c divsi3.c NO_MAN= .if ${MK_TAG_LIST} != "no" ==== //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #include "at91rm9200.h" @@ -62,7 +62,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | AT91C_PIO_PC20; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | @@ -136,7 +136,11 @@ AT91C_BASE_EBI->EBI_CSA = value; AT91C_BASE_SDRC->SDRC_CR = +#ifdef KB9202_B + AT91C_SDRC_NC_10 | +#else AT91C_SDRC_NC_9 | +#endif AT91C_SDRC_NR_13 | AT91C_SDRC_NB_4_BANKS | AT91C_SDRC_CAS_2 | ==== //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #ifndef _AT91RM9200_LOWLEVEL_H_ @@ -39,6 +39,14 @@ #define OSC_MAIN_MULT 90 #endif +#ifdef BOOT_CENTIPAD +/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +typedef unsigned short sdram_size_t; +#define OSC_MAIN_MULT 90 +#endif + #ifdef BOOT_BWCT /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ ==== //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#4 (text) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" @@ -380,7 +380,7 @@ static void MII_GetLinkSpeed(AT91PS_EMAC pEmac) { -#if defined(BOOT_TSC) | defined(BOOT_KB920X) +#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) unsigned short stat2; #endif unsigned update; @@ -394,7 +394,7 @@ update |= AT91C_EMAC_SPD; update |= AT91C_EMAC_FD; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) return ; ==== //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.h#2 (text) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.5 2006/11/09 20:32:36 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $ *****************************************************************************/ @@ -114,7 +114,7 @@ /* MII registers definition */ #define MII_STS_REG 0x01 #define MII_STS_LINK_STAT 0x04 -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) #define MII_STS2_REG 0x11 #define MII_STS2_LINK 0x400 #define MII_STS2_100TX 0x4000 ==== //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" @@ -100,6 +100,13 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); +static u_long ia32_maxdsiz = IA32_MAXDSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); +static u_long ia32_maxssiz = IA32_MAXSSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); +static u_long ia32_maxvmem = IA32_MAXVMEM; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); + struct sysentvec ia32_freebsd_sysvec = { FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, @@ -126,7 +133,8 @@ VM_PROT_ALL, ia32_copyout_strings, ia32_setregs, - ia32_fixlimit + ia32_fixlimit, + &ia32_maxssiz }; @@ -273,13 +281,6 @@ return ((register_t *)stack_base); } -static u_long ia32_maxdsiz = IA32_MAXDSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); -static u_long ia32_maxssiz = IA32_MAXSSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); -static u_long ia32_maxvmem = IA32_MAXVMEM; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); - static void ia32_fixlimit(struct rlimit *rl, int which) { ==== //depot/projects/vimage/src/sys/conf/NOTES#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1440 2007/07/03 12:13:42 gnn Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1444 2007/07/14 21:49:23 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -490,12 +490,14 @@ # NETWORKING OPTIONS # -# Protocol families: -# Only the INET (Internet) family is officially supported in FreeBSD. +# Protocol families # options INET #Internet communications protocols options INET6 #IPv6 communications protocols -options IPSEC #IP security + +# In order to enable IPSEC you MUST also add device crypto to +# your kernel configuration +options IPSEC #IP security (requires device crypto) #options IPSEC_DEBUG #debug for IP security # # Set IPSEC_FILTERGIF to force packets coming through a gif tunnel @@ -556,14 +558,6 @@ # faster.. if you are not debugging don't use. options SCTP_DEBUG # -# High speed enables sally floyds HS TCP optioin -# for congestion control increase, use only in -# very HS networks and with caution since I doubt -# it will compete fairly with peers. For the big-bad -# internet its best NOT to enable. -# -options SCTP_HIGH_SPEED -# # This option turns off the CRC32c checksum. Basically # You will not be able to talk to anyone else that # has not done this. Its more for expermentation to @@ -632,7 +626,7 @@ options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) -options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) @@ -897,6 +891,8 @@ # # ATM (HARP version) options # +# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE. +# # ATM_CORE includes the base ATM functionality code. This must be included # for ATM support. # @@ -915,14 +911,14 @@ # # The `harp' pseudo-driver makes all NATM interface drivers available to HARP. # -options ATM_CORE #core ATM protocol family -options ATM_IP #IP over ATM support -options ATM_SIGPVC #SIGPVC signalling manager -options ATM_SPANS #SPANS signalling manager -options ATM_UNI #UNI signalling manager +#options ATM_CORE #core ATM protocol family +#options ATM_IP #IP over ATM support +#options ATM_SIGPVC #SIGPVC signalling manager +#options ATM_SPANS #SPANS signalling manager +#options ATM_UNI #UNI signalling manager -device hfa #FORE PCA-200E ATM PCI -device harp #Pseudo-interface for NATM +#device hfa #FORE PCA-200E ATM PCI +#device harp #Pseudo-interface for NATM ##################################################################### ==== //depot/projects/vimage/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1233 2007/07/05 07:04:17 peter Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -103,13 +103,6 @@ cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ -coda/coda_fbsd.c optional vcoda -coda/coda_namecache.c optional vcoda -coda/coda_psdev.c optional vcoda -coda/coda_subr.c optional vcoda -coda/coda_venus.c optional vcoda -coda/coda_vfsops.c optional vcoda -coda/coda_vnops.c optional vcoda contrib/altq/altq/altq_cbq.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq @@ -336,7 +329,7 @@ contrib/pf/net/pf_ruleset.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_subr.c optional pf \ - compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/pf" + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_table.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/netinet/in4_cksum.c optional pf inet @@ -666,28 +659,28 @@ dev/fxp/if_fxp.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci -dev/harp/if_harp.c optional harp pci +#dev/harp/if_harp.c optional harp pci dev/hatm/if_hatm.c optional hatm pci dev/hatm/if_hatm_intr.c optional hatm pci dev/hatm/if_hatm_ioctl.c optional hatm pci dev/hatm/if_hatm_rx.c optional hatm pci dev/hatm/if_hatm_tx.c optional hatm pci -dev/hfa/fore_buffer.c optional hfa -dev/hfa/fore_command.c optional hfa -dev/hfa/fore_globals.c optional hfa -dev/hfa/fore_if.c optional hfa -dev/hfa/fore_init.c optional hfa -dev/hfa/fore_intr.c optional hfa -dev/hfa/fore_output.c optional hfa -dev/hfa/fore_receive.c optional hfa -dev/hfa/fore_stats.c optional hfa -dev/hfa/fore_timer.c optional hfa -dev/hfa/fore_transmit.c optional hfa -dev/hfa/fore_vcm.c optional hfa -#dev/hfa/hfa_eisa.c optional hfa eisa -dev/hfa/hfa_freebsd.c optional hfa -dev/hfa/hfa_pci.c optional hfa pci -#dev/hfa/hfa_sbus.c optional hfa sbus +#dev/hfa/fore_buffer.c optional hfa +#dev/hfa/fore_command.c optional hfa +#dev/hfa/fore_globals.c optional hfa +#dev/hfa/fore_if.c optional hfa +#dev/hfa/fore_init.c optional hfa +#dev/hfa/fore_intr.c optional hfa +#dev/hfa/fore_output.c optional hfa +#dev/hfa/fore_receive.c optional hfa +#dev/hfa/fore_stats.c optional hfa +#dev/hfa/fore_timer.c optional hfa +#dev/hfa/fore_transmit.c optional hfa +#dev/hfa/fore_vcm.c optional hfa +##dev/hfa/hfa_eisa.c optional hfa eisa +#dev/hfa/hfa_freebsd.c optional hfa +#dev/hfa/hfa_pci.c optional hfa pci +##dev/hfa/hfa_sbus.c optional hfa sbus dev/hifn/hifn7751.c optional hifn dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci @@ -739,6 +732,16 @@ dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgbe/ixgbe.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_phy.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_api.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_common.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_82598.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard @@ -1148,6 +1151,13 @@ dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +fs/coda/coda_fbsd.c optional vcoda +fs/coda/coda_namecache.c optional vcoda +fs/coda/coda_psdev.c optional vcoda +fs/coda/coda_subr.c optional vcoda +fs/coda/coda_venus.c optional vcoda +fs/coda/coda_vfsops.c optional vcoda +fs/coda/coda_vnops.c optional vcoda fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard @@ -1651,88 +1661,92 @@ netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk -netatm/atm_aal5.c optional atm_core -netatm/atm_cm.c optional atm_core -netatm/atm_device.c optional atm_core -netatm/atm_if.c optional atm_core -netatm/atm_proto.c optional atm_core -netatm/atm_signal.c optional atm_core -netatm/atm_socket.c optional atm_core -netatm/atm_subr.c optional atm_core -netatm/atm_usrreq.c optional atm_core -netatm/ipatm/ipatm_event.c optional atm_ip atm_core -netatm/ipatm/ipatm_if.c optional atm_ip atm_core -netatm/ipatm/ipatm_input.c optional atm_ip atm_core -netatm/ipatm/ipatm_load.c optional atm_ip atm_core -netatm/ipatm/ipatm_output.c optional atm_ip atm_core -netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core -netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core -netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core -netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core -netatm/spans/spans_arp.c optional atm_spans atm_core \ - dependency "spans_xdr.h" -netatm/spans/spans_cls.c optional atm_spans atm_core -netatm/spans/spans_if.c optional atm_spans atm_core -netatm/spans/spans_kxdr.c optional atm_spans atm_core -netatm/spans/spans_msg.c optional atm_spans atm_core -netatm/spans/spans_print.c optional atm_spans atm_core -netatm/spans/spans_proto.c optional atm_spans atm_core -netatm/spans/spans_subr.c optional atm_spans atm_core -netatm/spans/spans_util.c optional atm_spans atm_core -spans_xdr.h optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ - clean "spans_xdr.h" \ - no-obj no-implicit-rule -spans_xdr.c optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ - clean "spans_xdr.c" \ - no-obj no-implicit-rule local -spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "${NORMAL_C}" \ - no-implicit-rule local -netatm/uni/q2110_sigaa.c optional atm_uni atm_core -netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core -netatm/uni/q2110_subr.c optional atm_uni atm_core -netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core -netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core -netatm/uni/qsaal1_subr.c optional atm_uni atm_core -netatm/uni/sscf_uni.c optional atm_uni atm_core -netatm/uni/sscf_uni_lower.c optional atm_uni atm_core -netatm/uni/sscf_uni_upper.c optional atm_uni atm_core -netatm/uni/sscop.c optional atm_uni atm_core -netatm/uni/sscop_lower.c optional atm_uni atm_core -netatm/uni/sscop_pdu.c optional atm_uni atm_core -netatm/uni/sscop_sigaa.c optional atm_uni atm_core -netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core -netatm/uni/sscop_subr.c optional atm_uni atm_core -netatm/uni/sscop_timer.c optional atm_uni atm_core -netatm/uni/sscop_upper.c optional atm_uni atm_core -netatm/uni/uni_load.c optional atm_uni atm_core -netatm/uni/uniarp.c optional atm_uni atm_core -netatm/uni/uniarp_cache.c optional atm_uni atm_core -netatm/uni/uniarp_input.c optional atm_uni atm_core -netatm/uni/uniarp_output.c optional atm_uni atm_core -netatm/uni/uniarp_timer.c optional atm_uni atm_core -netatm/uni/uniarp_vcm.c optional atm_uni atm_core -netatm/uni/uniip.c optional atm_uni atm_core -netatm/uni/unisig_decode.c optional atm_uni atm_core -netatm/uni/unisig_encode.c optional atm_uni atm_core -netatm/uni/unisig_if.c optional atm_uni atm_core -netatm/uni/unisig_mbuf.c optional atm_uni atm_core -netatm/uni/unisig_msg.c optional atm_uni atm_core -netatm/uni/unisig_print.c optional atm_uni atm_core -netatm/uni/unisig_proto.c optional atm_uni atm_core -netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core -netatm/uni/unisig_subr.c optional atm_uni atm_core >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 16 11:19: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 8964116A55D; Mon, 16 Jul 2007 11:19: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 171DA16A548 for ; Mon, 16 Jul 2007 11:19:43 +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 DE04613C46B for ; Mon, 16 Jul 2007 11:19:42 +0000 (UTC) (envelope-from zec@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 l6GBJgXE066514 for ; Mon, 16 Jul 2007 11:19:42 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GBJg0q066508 for perforce@freebsd.org; Mon, 16 Jul 2007 11:19:42 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 16 Jul 2007 11:19:42 GMT Message-Id: <200707161119.l6GBJg0q066508@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 123583 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, 16 Jul 2007 11:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=123583 Change 123583 by zec@zec_tca51 on 2007/07/16 11:18:57 Fix to allow for nooptions IPSEC kernel to be compiled. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#17 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#17 (text+ko) ==== @@ -237,7 +237,9 @@ #ifdef INET6 INIT_VNET_INET6(curvnet); #endif +#ifdef IPSEC INIT_VNET_IPSEC(curvnet); +#endif struct tcphdr *th; struct ip *ip = NULL; struct ipovly *ipov; From owner-p4-projects@FreeBSD.ORG Mon Jul 16 11:29: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 4FA2F16A404; Mon, 16 Jul 2007 11:29: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 2649B16A401 for ; Mon, 16 Jul 2007 11:29:56 +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 F289E13C471 for ; Mon, 16 Jul 2007 11:29:55 +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 l6GBTtAU068085 for ; Mon, 16 Jul 2007 11:29:55 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GBTtmQ068082 for perforce@freebsd.org; Mon, 16 Jul 2007 11:29:55 GMT (envelope-from andrew@freebsd.org) Date: Mon, 16 Jul 2007 11:29:55 GMT Message-Id: <200707161129.l6GBTtmQ068082@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 123584 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, 16 Jul 2007 11:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123584 Change 123584 by andrew@andrew_hermies on 2007/07/16 11:29:13 When using kqueue to check for updates only check to directory that changed rather than all directories Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#13 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#13 (text+ko) ==== @@ -138,7 +138,7 @@ /* Create an event to look for files being added to the dir */ EV_SET(&events[pos], dir_fd[pos], EVFILT_VNODE, EV_ADD, - NOTE_WRITE | NOTE_DELETE | NOTE_EXTEND, 0, NULL); + NOTE_WRITE | NOTE_DELETE | NOTE_EXTEND, 0, (void *)pos); } use_kqueue = 1; @@ -150,13 +150,47 @@ kq = kqueue(); if (kq == -1) use_kqueue = 0; + + pos = dir_count; + + /* + * This is the main loop to check for updates. It will + * either wait for file system activity on the update + * directories of just sleep for a fixed amount of time + * then scan all directories. + */ while(1) { - for (pos = 0; base_dirs[pos] != NULL; pos++) { - if (has_update(base_dirs[pos])) { - printf("Updates found in %s\n", base_dirs[pos]); - found_updates = 1; + assert(pos <= dir_count); + if (use_kqueue == 0 || pos == dir_count) { + /* + * We are using sleep to wait for updates or + * kqueue timed out. This means we have to check + * all directories to see if they have an update. + */ + for (pos = 0; base_dirs[pos] != NULL; pos++) { + if (has_update(base_dirs[pos])) { + printf("Updates found in %s\n", + base_dirs[pos]); + found_updates = 1; + } + } + /* Check we have looked at all directories */ + assert(pos == dir_count); + } else { + /* + * We are using kqueue to wait for updates. + * pos will contain the position in base_dirs of + * the directory that had file system activity. + */ + if (pos < dir_count) { + if (has_update(base_dirs[pos])) { + printf("Updates found in %s\n", + base_dirs[pos]); + found_updates = 1; + } } } + pos = dir_count; /* * Wait for any disk activity to @@ -170,9 +204,20 @@ /* Wait for posible updates */ if (use_kqueue == 1) { /* Wait for posible updates ready to be installed */ - if (kevent(kq, events, dir_count, &changes, 1, &timeout) - == -1) { - use_kqueue = 1; + int error; + + error = kevent(kq, events, dir_count, &changes, 1, + &timeout); + + if (error == -1) { + /* + * There was an error in + * kqueue, change to sleep + */ + use_kqueue = 0; + } else if (error > 0) { + /* Read in the item that changed */ + pos = (size_t)changes.udata; } } else { sleep(default_check_period); From owner-p4-projects@FreeBSD.ORG Mon Jul 16 11:56: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 56CE916A406; Mon, 16 Jul 2007 11:56: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 E147D16A405 for ; Mon, 16 Jul 2007 11:56:29 +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 D1D5413C494 for ; Mon, 16 Jul 2007 11:56:29 +0000 (UTC) (envelope-from gcooper@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 l6GBuT2g069930 for ; Mon, 16 Jul 2007 11:56:29 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GBuTVK069927 for perforce@freebsd.org; Mon, 16 Jul 2007 11:56:29 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 16 Jul 2007 11:56:29 GMT Message-Id: <200707161156.l6GBuTVK069927@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 123585 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, 16 Jul 2007 11:56:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123585 Change 123585 by gcooper@optimus-revised_pkgtools on 2007/07/16 11:55:33 Really interesting simple research tool for analyzing the speed of f* file reading functions vs their non-f* file reading capable bretheren, i.e. fwrite vs write. Born out of slight disappointment in results obtained from modified pkg_version and pkg_create vs vanilla (in CVS tree) copies of pkg_version and pkg_create. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/fat/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/fat/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/fat/fat#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/fat/file_api_tests.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 12:27: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 215B716A403; Mon, 16 Jul 2007 12:27: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 E85DB16A402 for ; Mon, 16 Jul 2007 12:27:08 +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 D758C13C4A3 for ; Mon, 16 Jul 2007 12:27:08 +0000 (UTC) (envelope-from gcooper@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 l6GCR8iD073148 for ; Mon, 16 Jul 2007 12:27:08 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GCR8WB073145 for perforce@freebsd.org; Mon, 16 Jul 2007 12:27:08 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 16 Jul 2007 12:27:08 GMT Message-Id: <200707161227.l6GCR8WB073145@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 123587 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, 16 Jul 2007 12:27:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=123587 Change 123587 by gcooper@optimus-revised_pkgtools on 2007/07/16 12:26:44 - Check to make sure read(2) returns the stat'ed file length, instead of a non-(-1) value. - Use write(2) instead of fwrite(2) based on results from my "fat" tool. Hopefully this results in a 30% to 3-fold speedup. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#8 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/file.c#8 (text+ko) ==== @@ -223,7 +223,7 @@ contents = (char *)malloc(sb.st_size + 1); - if (read(fileno(fd), contents, sb.st_size) == -1) { + if (read(fileno(fd), contents, sb.st_size) != sb.st_size) { cleanup(0); errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, fname, (long long)sb.st_size); @@ -280,10 +280,10 @@ errx(2, "%s: cannot fopen '%s' for writing", __func__, name); } len = strlen(str); - if (fwrite(str, 1, len, fp) != len) { + if (write(fileno(fp), str, len) != len) { cleanup(0); - errx(2, "%s: short fwrite on '%s', tried to write %ld bytes", - __func__, name, (long)len); + errx(2, "%s: short fwrite on '%s', tried to write %lld bytes", + __func__, name, (long long)len); } if (fclose(fp)) { cleanup(0); From owner-p4-projects@FreeBSD.ORG Mon Jul 16 12:30: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 53AE316A407; Mon, 16 Jul 2007 12:30: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 2818216A400 for ; Mon, 16 Jul 2007 12:30:13 +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 1843E13C4AC for ; Mon, 16 Jul 2007 12:30:13 +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 l6GCUCaU073339 for ; Mon, 16 Jul 2007 12:30:12 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GCUC9M073336 for perforce@freebsd.org; Mon, 16 Jul 2007 12:30:12 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 16 Jul 2007 12:30:12 GMT Message-Id: <200707161230.l6GCUC9M073336@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 123588 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, 16 Jul 2007 12:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=123588 Change 123588 by anchie@anchie_malimis on 2007/07/16 12:29:21 Fix to support new iattach and idetach functions for GIF interface. Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#6 (text+ko) ==== @@ -107,8 +107,8 @@ static void gif_start(struct ifnet *); static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); -static int vnet_gif_iattach(void); -static int vnet_gif_idetach(void); +static int vnet_gif_iattach(void *); +static int vnet_gif_idetach(void *); IFC_SIMPLE_DECLARE(gif, 0); @@ -236,7 +236,9 @@ free(sc, M_GIF); } -static int vnet_gif_iattach(void) +static int +vnet_gif_iattach(unused) + void *unused; { #ifdef VIMAGE struct vnet_gif *vnet_gif; @@ -262,7 +264,9 @@ return 0; } -static int vnet_gif_idetach(void) +static int +vnet_gif_idetach(unused) + void *unused; { INIT_VNET_GIF(curvnet); @@ -287,7 +291,7 @@ #ifdef VIMAGE vnet_mod_register(&vnet_gif_modinfo); #else - vnet_gif_iattach(); + vnet_gif_iattach(NULL); #endif if_clone_attach(&gif_cloner); break; @@ -296,7 +300,7 @@ #ifdef VIMAGE vnet_mod_deregister(&vnet_gif_modinfo); #else - vnet_gif_idetach(); + vnet_gif_idetach(NULL); #endif mtx_destroy(&gif_mtx); break; From owner-p4-projects@FreeBSD.ORG Mon Jul 16 12:41: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 D696116A401; Mon, 16 Jul 2007 12:41: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 625BC16A402 for ; Mon, 16 Jul 2007 12:41:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.freebsd.org (Postfix) with ESMTP id 1A14D13C4A8 for ; Mon, 16 Jul 2007 12:41:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.7b8) with ESMTP id 196928936 for multiple; Mon, 16 Jul 2007 08:49:50 -0400 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 l6GCfVK6031688; Mon, 16 Jul 2007 08:41:32 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Garrett Cooper Date: Mon, 16 Jul 2007 08:39:52 -0400 User-Agent: KMail/1.9.6 References: <200707152011.l6FKBSOJ028661@repoman.freebsd.org> In-Reply-To: <200707152011.l6FKBSOJ028661@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200707160839.52369.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]); Mon, 16 Jul 2007 08:41:32 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3680/Mon Jul 16 01:49:06 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 X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 123551 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, 16 Jul 2007 12:41:42 -0000 On Sunday 15 July 2007 04:11:28 pm Garrett Cooper wrote: > http://perforce.freebsd.org/chv.cgi?CH=123551 > > Change 123551 by gcooper@optimus-revised_pkgtools on 2007/07/15 20:10:53 > > Bad case to exit on. A return code of 0 from read(2) good, -1 is bad.. 0 means EOF. You really want something like this: ssize_t nread; nread = read(fileno(fd), contents, sb.st_size); if (nread < 0) { cleanup(0); err(2, "%s: read('%s')", __func__, fname); } else if (nread != sb.st_size) { cleanup(0); errx(2, "%s: short read on '%s' (%zd of %ju bytes)", __func__, fname, nread, (uintmax_t)sb.st_size); } However, why not just mmap(2) the file rather than read it? struct stat sb; void *p; int fd; fd = open(fname, O_RDONLY); if (fd < 0) err(1, "open"); if (fstat(fd, &sb) < 0) err(1, "fstat"); p = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); if (p == MAP_FAILED) err(1, "mmap"); Now p points to the file's contents, and it is more efficient than read(2) since you don't copy the data around as often. The only limitation is if the packing list file is ever going to be really big (say larger than 1GB) in which case you might run out of address space on 32-bit machines. However, if you are already reading the entire file into a single buffer then you aren't worried about that. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Jul 16 12:47: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 4082016A405; Mon, 16 Jul 2007 12:47:35 +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 1433E16A407 for ; Mon, 16 Jul 2007 12:47:35 +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 D32D413C4A8 for ; Mon, 16 Jul 2007 12:47:34 +0000 (UTC) (envelope-from gonzo@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 l6GClYS3083749 for ; Mon, 16 Jul 2007 12:47:34 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GClYAC083746 for perforce@freebsd.org; Mon, 16 Jul 2007 12:47:34 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 16 Jul 2007 12:47:34 GMT Message-Id: <200707161247.l6GClYAC083746@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 123589 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, 16 Jul 2007 12:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=123589 Change 123589 by gonzo@gonzo_jeeves on 2007/07/16 12:46:41 o Choose 1-level dir layout for ADM5120 files. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/dev/admpci.c#2 delete .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/include/adm5120reg.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 14:14: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 03E5416A404; Mon, 16 Jul 2007 14:14:23 +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 AC5E716A400 for ; Mon, 16 Jul 2007 14:14:22 +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 8372C13C461 for ; Mon, 16 Jul 2007 14:14:22 +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 l6GEEMZ6092080 for ; Mon, 16 Jul 2007 14:14:22 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 l6GEELAb092077 for perforce@freebsd.org; Mon, 16 Jul 2007 14:14:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Jul 2007 14:14:21 GMT Message-Id: <200707161414.l6GEELAb092077@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 123592 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, 16 Jul 2007 14:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=123592 Change 123592 by rwatson@rwatson_fledge on 2007/07/16 14:13:46 Add OpenBSM 1.0 alpha 15 download binary. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha15.tgz#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 16 14:19: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 C2F7716A403; Mon, 16 Jul 2007 14:19: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 963CC16A400 for ; Mon, 16 Jul 2007 14:19:29 +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 833AC13C4AC for ; Mon, 16 Jul 2007 14:19:29 +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 l6GEJTQ5092239 for ; Mon, 16 Jul 2007 14:19:29 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 l6GEJTrQ092236 for perforce@freebsd.org; Mon, 16 Jul 2007 14:19:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Jul 2007 14:19:29 GMT Message-Id: <200707161419.l6GEJTrQ092236@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 123593 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, 16 Jul 2007 14:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123593 Change 123593 by rwatson@rwatson_fledge on 2007/07/16 14:18:54 Hook up download of OpenBSM 1.0 alpha 15. Affected files ... .. //depot/projects/trustedbsd/www/news.page#10 edit .. //depot/projects/trustedbsd/www/openbsm.page#20 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#10 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -17,7 +17,7 @@ &os; unterstützen - $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.3 2005/10/08 15:30:39 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/articles/contributing/article.sgml,v 1.4 2007/07/18 06:28:01 jkois Exp $ Dieser Artikel beschreibt, wie Einzelpersonen oder @@ -281,7 +281,7 @@ Wenn Sie einen Fehler gefunden oder eine Verbesserung entwickelt haben, vergessen Sie nicht, einen Bericht über &man.send-pr.1; oder dessen Internetschnittstelle + url="&url.base;/de/send-pr.html">Internetschnittstelle zu erstellen. Versuchen Sie bitte, jedes Feld auszufüllen. Ist Ihr Patch kleiner als 65 KB, sollten Sie ihn direkt in den Bericht einbauen. Kann der Patch direkt auf den Quellcodebaum ==== //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.75 2007/07/10 18:38:25 jkois Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.597 2007/07/09 18:45:12 jkois Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.76 2007/07/18 06:28:01 jkois Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.598 2007/07/18 06:08:25 jkois Exp $ - basiert auf: 1.799 + basiert auf: 1.802 --> @@ -18,10 +18,10 @@ Häufig gestellte Fragen zu FreeBSD - 4.X, 5.X und 6.X + 5.X und 6.X - Frequently Asked Questions für FreeBSD - 4.X, 5.X und 6.X + Frequently Asked Questions zu FreeBSD + 5.X und 6.X The FreeBSD German Documentation @@ -33,7 +33,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.597 2007/07/09 18:45:12 jkois Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.598 2007/07/18 06:08:25 jkois Exp $ 1995 @@ -113,28 +113,29 @@ Dies ist die FAQ für die FreeBSD-Versionen - 4.X, 5.X und 6.X. Alle Einträge sollten für FreeBSD - ab Version 4.0 relevant sein, andernfalls wird darauf explizit + 5.X und 6.X. Alle Einträge sollten für FreeBSD + ab Version 5.0 relevant sein, andernfalls wird darauf explizit hingewiesen. Falls Sie daran - interessiert sein sollten, an diesem Projekt mitzuhelfen, + interessiert sein sollten, an diesem Projekt mitzuarbeiten, senden Sie eine Mail an die Mailingliste &a.de.translators;. Die aktuelle Version dieses Dokuments ist ständig auf dem FreeBSD - World-Wide-Web-Server verfügbar. Es kann auch - per HTTP als eine große HTML-Datei heruntergeladen werden oder - als Textdatei, im &postscript;, PDF- und anderen Formaten vom - FreeBSD - FTP-Server. Sie können die FAQ auch - - durchsuchen. + World-Wide-Web-Server verfügbar. Sie kann aber auch + als eine einzige große HTML-Datei, als Textdatei, als + &postscript;- oder PDF-Datei sowie in verschiedenen anderen + Formaten vom FreeBSD + FTP-Server heruntergeladen werden. Alternativ können + Sie die FAQ auch durchsuchen. Einleitung - Willkommen zur FreeBSD 4.X-6.X FAQ! + Willkommen zur FreeBSD 5.X-6.X FAQ! Wie auch bei den Usenet FAQs üblich, wird mit diesem Dokument beabsichtigt, die am häufigsten gestellten Fragen @@ -1302,17 +1303,13 @@ - Für 4.X werden zwei Floppy-Images benötigt: - floppies/kernel.flp und - floppies/mfsroot.flp. Diese Images + Sie benötigen drei Floppy-Images: + floppies/boot.flp, + floppies/kern1.flp sowie + floppies/kern2.flp. Diese Images müssen mit Hilfe von Werkzeugen wie fdimage oder &man.dd.1; auf Disketten - kopiert werden. Seit &os; 5.3 weisen die Bootdisketten - eine neue Struktur auf. Sie benötigen nun das Image - floppies/boot.flp sowie alle Dateien - mit den Namen - floppies/kernX - (von denen es derzeit zwei gibt). + kopiert werden. Falls Sie selbst die einzelnen Distributionen herunterladen müssen (um z.B. von einem @@ -1321,7 +1318,7 @@ - base/ (bin/ unter 4.X) + base/ @@ -1428,20 +1425,12 @@ - Für &os;-Versionen vor 5.X benötigen Sie - mindestens einen 386er Prozessor mit mindestens 5 MB - Hauptspeicher und mindestens 60 MB Festplattenspeicher. - Für die Installation von &os; ist dabei mehr - Hauptspeicher als für den eigentlichen Betrieb - nötig, daher sollten 16 RAM als Minimum für - ein Standardsystem ausreichen. - Der Betrieb von &os; 5.X und neuer erfordert mindestens einen 486er Prozessor mit mindestens 24 MB RAM sowie mindestens 150 MB an Festplattenspeicher. Alle &os;-Versionen laufen mit einer einfachen - MDA-Grafikkarte, für X11R6 benötigen Sie allerdings + MDA-Grafikkarte, für &xorg; benötigen Sie allerdings eine VGA- oder eine bessere Videokarte. Lesen Sie auch den Abschnitt @@ -1450,37 +1439,6 @@ - - Ich besitze nur 4 MB Hauptspeicher. Kann ich FreeBSD - installieren? - - - - Für die Installation von FreeBSD 4.X - benötigen Sie mindestens 5MB RAM, seit &os; 5.X - mindestens 8 MB für die Installation eines neuen - Systems. - - Alle FreeBSD-Versionen vor 5.X - laufen zwar mit 4MB Hauptspeicher, - lediglich ihr Installationsprogramm läuft nicht mit 4MB. - Wenn Sie möchten, können Sie für den - Installationsvorgang zusätzlichen Hauptspeicher - hinzufügen, den Sie nach der Installation wieder - entfernen. Alternativ können Sie Ihre Platte in ein - System mit genügend Hauptspeicher transferieren und die - Platte nach erfolgreicher Installation wieder in Ihr System - einbauen. - - Wenn Sie nur über 4 MB Hauptspeicher - verfügen, müssen Sie einen angepassten Kernel - erzeugen. Irgend jemand hat es sogar geschafft, mit 2 MB - RAM zu booten, allerdings war dieses System nahezu - unbrauchbar. - - - - Wie kann ich eine angepasste Installationsdiskette erstellen? @@ -2118,14 +2076,9 @@ Kernels bei fast jeder Installation von FreeBSD erforderlich, aber neuere Ausgaben haben von der Einführung weitaus benutzerfreundlicherer - Kernelkonfigurationswerkzeuge profitiert. Unter 4.X - und älter geben Sie am FreeBSD Boot-Prompt - (boot:) ein, um in ein visuelles - Konfigurationsmenü zu gelangen. Dieses - Programm ermöglicht Ihnen die Konfiguration der - Kerneleinstellungen für die gebräuchlichsten - ISA-Karten. Ab &os; 5.X wurde dieses Konzept durch - die deutlich flexibleren hints ersetzt, + Kernelkonfigurationswerkzeuge profitiert. Seit &os; 5.X + erfolgt die Kernelkonfiguration in der Regel durch die + die deutlich flexibleren hints, die am Loader-Prompt eingegeben werden können. Es kann dennoch sinnvoll sein, einen neuen Kernel @@ -2504,12 +2457,6 @@ sich, SMP in der Voreinstellung zu deaktivieren, bis diese Probleme behoben sind. Dies ist eine der vordringlichen Aufgaben für &os; 5.4. - - Unter &os; 4.X ist SMP im Standardkernel nicht - aktiviert. Sie müssen daher einen neuen Kernel - mit SMP-Unterstützung bauen. Die dazu nötigen - Optionen entnehmen Sie bitte der Datei - /sys/i386/conf/LINT. @@ -2527,7 +2474,8 @@ - FreeBSD unterstützt EIDE- und SCSI-Laufwerke (mit + FreeBSD unterstützt EIDE-, SATA-, SCSI- und + SAS-Laufwerke (mit kompatiblen Controllern - siehe folgenden Abschnitt), sowie alle Laufwerke, die die original Western Digital-Schnittstelle (MFM, RLL, ESDI und @@ -2540,7 +2488,7 @@ - Welche SCSI-Controller werden + Welche SCSI- oder SAS-Controller werden unterstützt? ==== //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.29 2007/07/10 18:38:26 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.59 2007/07/09 12:49:51 jkois Exp $ - basiert auf: 1.72 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.30 2007/07/18 06:28:02 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.60 2007/07/16 05:54:00 jkois Exp $ + basiert auf: 1.73 --> @@ -194,16 +194,19 @@ entspricht dem HTML-Standard und verfügt über einen E-Mail-Client und einen Newsreader. Für den Fall, dass Sie einige HTML-Seiten selbst verfassen wollen, enthält der - Browser auch einen HTML-Editor. Benutzern von - &netscape; wird die Ähnlichkeit mit - dem Communicator auffallen, die von der - gemeinsamen Grundlage stammt. + Browser auch einen HTML-Editor. Wenn Sie + &netscape; kennen, wird Ihnen + vielleicht die Ähnlichkeit mit dem + Communicator auffallen. Dies liegt + daran, dass die beiden Programme eine gemeinsame + Entwicklungsgeschichte haben (und auf der gleichen + ursprünglichen Codebasis aufbauen). Auf langsamen Maschinen, deren CPU-Taktfrequenz weniger als 233 MHz beträgt, oder die weniger als 64 MB Speicher besitzen, können Sie Mozilla wegen - des Ressourcenbedarfs nur eingeschränkt benutzen. Weniger - Ressourcen verbraucht der Opera Browser, + dessen Ressourcenbedarfs nur eingeschränkt benutzen. Weniger + Ressourcen verbraucht der Opera-Browser, der gleich in diesem Kapitel behandelt wird. Für den Fall, dass Sie Mozilla @@ -415,17 +418,19 @@ wenn der Port x11/kdebase3 installiert ist. Konqueror ist mehr als nur ein Browser. Sie können das - Programm ebenfalls zur Dateiverwaltung und zum Abspielen + Programm weiters zur Dateiverwaltung und zum Abspielen von Multimedia-Dateien benutzen. Der Port misc/konq-plugins - enthält Plugins für + installiert verschiedene Plugins für Konqueror. Konqueror kann - &flash;-Seiten darstellen, siehe - die Beschreibung unter - . + &flash;-Seiten darstellen. Wie Sie + die &flash;-Unterstützung + aktiviern, können Sie unter + + nachlesen. @@ -435,11 +440,11 @@ Neue Benutzer suchen oft ein komplettes Office-Paket oder eine leicht zu bedienende Textverarbeitung. Einige Benutzeroberflächen - wie KDE bieten schon ein Office-Paket, - aber unter FreeBSD ist keine derartige Anwendung vorinstalliert. - Unabhängig von der verwendeten Benutzeroberfläche, stellt - Ihnen FreeBSD die benötigten Programme zur - Verfügung. + wie KDE enthalten zwar ein Office-Paket, + diese werden in der Standardeinstellung unter FreeBSD aber nicht + installiert. Unabhängig von der verwendeten + Benutzeroberfläche können Sie diverse Office-Pakete aber + jederzeit über die Ports-Sammlung installlieren. Dieser Abschnitt behandelt die nachstehenden Anwendungen: @@ -610,8 +615,8 @@ OpenOffice.org - OpenOffice.org enthält alles - was von einem Office-Paket erwartet wird: Textverarbeitung, + OpenOffice.org enthält alles, + was von einem Office-Paket erwartet wird: Textverarbeitung, Tabellenkalkulation, Präsentation und ein Zeichenprogramm. Die Bedienung gleicht anderen Office-Paketen und das Programm kann zahlreiche Dateiformate importieren und exportieren. Es gibt @@ -697,10 +702,11 @@ Anzeigen von Dokumenten - Einige neue Dokumentformate, die sich großer Beliebtheit - erfreuen, können Sie sich mit dem Basissystem nicht ansehen. + Einige neuere Dokumentformate, die sich aktuell großer + Beliebtheit erfreuen, können Sie sich mit den im Basissystem + enthaltenen Programmen und Werkzeugen nicht ansehen. Dieser Abschnitt behandelt Programme, mit denen Sie sich Dokumente in - unterschiedlichen Formaten ansehen können. + unterschiedlichsten Formaten ansehen können. Die nachstehenden Anwendungen werden behandelt: @@ -798,11 +804,11 @@ In gv können Sie viele Operationen - durchführen: Sie können die Ausrichtung + durchführen: Sie können die Ausrichtung und die Papiergröße eines Dokuments ändern, - das Dokument skalieren oder glätten - (Anti-Aliasing). Fast jede - Operation kann sowohl mit der Tastatur als auch der Maus + das Dokument skalieren oder die Kantenglättung + (Anti-Aliasing) aktivieren. Fast + jede Operation kann sowohl mit der Tastatur als auch mit der Maus durchgeführt werden. Installieren Sie das gv-Paket wie @@ -886,8 +892,9 @@ Wenn Sie, warum auch immer, Ihre Finanzen mit einem FreeBSD Arbeitsplatz verwalten wollen, stehen Ihnen verschiedene Anwendungen zur Verfügung. Einige von ihnen unterstützen verbreitete - Formate, wie die von Quicken - oder Excel verwendeten. + Formate, darunter Dateiformate, die von + Quicken + oder Excel verwendet werden. Dieser Abschnitt behandelt die folgenden Anwendungen: ==== //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -4877,12 +4877,12 @@ Sie zunächst einige Disketten vorbereiten. Sie müssen mindestens den Inhalt des Verzeichnisses - bin auf - 1.44 MB oder 1.2 MB Disketten kopieren. + base auf + 1.44 MB Disketten kopieren. Wenn Sie die Disketten unter &ms-dos; erstellen, müssen Sie die Disketten mit dem DOS-Kommando - format formatieren. Unter &windows; + FORMAT formatieren. Unter &windows; können Sie Disketten mithilfe des Explorers formatieren (klicken Sie mit der rechten Maustaste auf das A:-Laufwerk und wählen @@ -4905,11 +4905,6 @@ &prompt.root; bsdlabel -w fd0.1440 floppy3 &prompt.root; newfs -t 2 -u 18 -l 1 -i 65536 /dev/fd0 - - Für 5.25" 1.2 MB Disketten benutzen - Sie das Gerät fd0.1200. - - Anschließend können Sie die Disketten wie ein normales Dateisystem einhängen und beschreiben. @@ -4922,8 +4917,17 @@ Disketten, wobei Sie so viele Dateien wie möglich auf eine Diskette kopieren. Jede Distribution wird auf der Diskette in einem eigenen Verzeichnis abgelegt, - beispielsweise a:\bin\bin.aa, - a:\bin\bin.ab. + beispielsweise a:\base\base.aa, + a:\base\base.ab und so weiter. + + + Die Datei base.inf muss + unbedingt auf die erste Diskette des + base-Diskettensatzes kopiert werden, + damit das Installationsprogramm feststellen kann, wie viele + Disketten geladen werden müssen, um die Distribution + wieder zusammenzusetzen. + Im Installationsprozess wählen Sie als Installationsmedium Floppy ==== //depot/projects/soc2007/loafier_busalloc/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.34 2007/06/05 08:59:21 jkois Exp $ - $FreeBSDde: de-docproj/books/handbook/l10n/chapter.sgml,v 1.56 2007/05/29 19:24:38 jkois Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.35 2007/07/18 06:28:02 jkois Exp $ + $FreeBSDde: de-docproj/books/handbook/l10n/chapter.sgml,v 1.57 2007/07/16 06:46:45 jkois Exp $ basiert auf: 1.124 --> @@ -207,7 +207,7 @@ nachträglich konfigurieren muss. Um es möglich zu machen, Wide- oder Multibyte-Zeichen einzugeben und zu verarbeiten, unterstützt die FreeBSD-Ports-Sammlung + url="&url.base;/de/ports/index.html">FreeBSD-Ports-Sammlung verschiedene Sprachen für diverse Programme. Bitte konsultieren Sie die I18N-Dokumentation des entsprechenden FreeBSD-Ports. @@ -1018,7 +1018,7 @@ Teile von FreeBSD wurden in andere Sprachen übersetzt. Folgen Sie bitte den Links auf der FreeBSD-Webseite oder + url="&url.base;/de/">FreeBSD-Webseite oder schauen Sie in /usr/share/doc nach. ==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -120,7 +120,7 @@ uprintf("Skeleton KLD unloaded.\n"); break; default: - err = EINVAL; + err = EOPNOTSUPP; break; } return(err); @@ -299,7 +299,7 @@ printf("Echo device unloaded.\n"); break; default: - err = EINVAL; + err = EOPNOTSUPP; break; } return(err); @@ -455,7 +455,7 @@ printf("Echo device unloaded.\n"); break; default: - err = EINVAL; + err = EOPNOTSUPP; break; } return(err); ==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -6,11 +6,11 @@ - Frequently Asked Questions for FreeBSD 4.X, 5.X, and 6.X + Frequently Asked Questions for FreeBSD 5.X and 6.X The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.799 2007/07/08 09:46:14 chinsan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.802 2007/07/17 18:04:02 chinsan Exp $ 1995 @@ -56,8 +56,8 @@ - This is the FAQ for FreeBSD versions 4.X, 5.X, and 6.X. - All entries are assumed to be relevant to FreeBSD 4.0 and + This is the FAQ for FreeBSD versions 5.X and 6.X. + All entries are assumed to be relevant to FreeBSD 5.X and later, unless otherwise noted. If you are interested in helping with this project, send email to the &a.doc;. The latest version of this document is always available from the @@ -76,7 +76,7 @@ Introduction - Welcome to the FreeBSD 4.X-6.X FAQ! + Welcome to the FreeBSD 5.X-6.X FAQ! As is usual with Usenet FAQs, this document aims to cover the most frequently asked questions concerning the FreeBSD operating @@ -1140,15 +1140,12 @@ - For 4.X you need two floppy images: - floppies/kernel.flp and - floppies/mfsroot.flp. These images need to + You need three floppy images: + floppies/boot.flp, + floppies/kern1.flp, and + floppies/kern2.flp. These images need to be copied onto floppies by tools like - fdimage or &man.dd.1;. - In &os; 5.3 and later, the boot floppies have been restructured - and you need floppies/boot.flp and - all the floppies/kernX - files (of which there are currently two). + fdimage or &man.dd.1;. If you need to download the distributions yourself (for a DOS filesystem install, for instance), below are some @@ -1157,7 +1154,7 @@ - base/ (bin/ in 4.X) + base/ @@ -1255,19 +1252,12 @@ - For versions prior to 5.X, you will need a 386 or better - PC, with 5 MB or more of RAM - and at least 60 MB of hard disk space. The &os; - installation process requires somewhat more memory so in - practice, 16 MB of RAM is a minimum requirement for a - standalone &os; system. - For &os; 5.X and later you will need a 486 or better PC, with 24 MB or more of RAM and at least 150 MB of hard disk space. All versions of &os; can run with a low - end MDA graphics card but to run X11R6, a VGA or better video + end MDA graphics card but to run &xorg;, a VGA or better video card is needed. See also . @@ -1276,30 +1266,6 @@ - - I have only 4 MB of RAM. Can I install FreeBSD? - - - - Installing &os; 4.X requires at least 5MB RAM, and - installing &os; 5.X and later requires at least - 8MB. - - All versions of FreeBSD prior to 5.X will - run in 4MB of RAM, they just cannot - run the installation program in 4MB. You can add extra - memory for the install process, and then revert to 4MB - after the system is running. Or you could move your disk - into a system which has sufficient memory, install onto - the disk and then swap it back. - - You must build a custom kernel to run in 4MB. Someone - has even successfully booted &os; with 2 MB RAM, although - the system was almost unusable. - - - - How can I make my own custom install floppy? @@ -1836,12 +1802,9 @@ Building a new kernel was originally pretty much a required step in a FreeBSD installation, but more recent releases have benefited from the introduction of much friendlier kernel - configuration methods. In 4.X and earlier, when at the FreeBSD boot prompt (boot:), - use the flag and you will be dropped into a - visual configuration screen which allows you to configure the - kernel's settings for most common ISA cards. In &os; 5.X and later - this has been replaced by much more flexible "hints" which - can be set from the loader prompt. + configuration methods. In &os; 5.X and later, it is very easily + to configure the kernel's configuration by much more flexible + "hints" which can be set from the loader prompt. It may still be worthwhile building a new kernel containing just the drivers that you need, just to save a @@ -2189,11 +2152,6 @@ on certain UP machines led to the decision to disable it until those problems can be addressed. This is a priority for &os; 5.4. - - In &os; 4.X, SMP is not enabled in the default kernel, - so you must recompile your kernel to enable SMP. Take a - look at /sys/i386/conf/LINT to learn - which options to put in your kernel config file. @@ -2210,9 +2168,9 @@ - FreeBSD supports EIDE and SCSI drives (with a compatible - controller; see the next section), and all drives using the - original Western Digital interface (MFM, RLL, + FreeBSD supports EIDE, SATA, SCSI, and SAS drives (with a + compatible controller; see the next section), and all drives using + the original Western Digital interface (MFM, RLL, ESDI, and of course IDE). A few ESDI controllers that use proprietary interfaces may not work: stick to WD1002/3/6/7 interfaces and clones. @@ -2221,7 +2179,7 @@ - Which SCSI controllers are supported? + Which SCSI or SAS controllers are supported? ==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4389,9 +4389,9 @@ hardware or simply because you insist on doing things the hard way, you must first prepare some floppies for the installation. - At a minimum, you will need as many 1.44 MB or 1.2 MB floppies + At a minimum, you will need as many 1.44 MB floppies as it takes to hold all the files in the - bin (binary distribution) directory. If + base (base distribution) directory. If you are preparing the floppies from DOS, then they must be formatted using the &ms-dos; FORMAT command. If you are using &windows;, @@ -4416,11 +4416,6 @@ &prompt.root; bsdlabel -w fd0.1440 floppy3 &prompt.root; newfs -t 2 -u 18 -l 1 -i 65536 /dev/fd0 - - Use fd0.1200 and - floppy5 for 5.25" 1.2 MB disks. - - Then you can mount and write to them like any other filesystem. @@ -4431,8 +4426,16 @@ files as will fit on each one, until you have all of the distributions you want packed up in this fashion. Each distribution should go into a subdirectory on the floppy, e.g.: - a:\bin\bin.aa, - a:\bin\bin.ab, and so on. + a:\base\base.aa, + a:\base\base.ab, and so on. + + + The base.inf file also needs to go on the + first floppy of the base set since it is read + by the installation program in order to figure out how many + additional pieces to look for when fetching and concatenating the + distribution. + Once you come to the Media screen during the install process, select Floppy and you ==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 19 20:06: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 3B3A416A40B; Thu, 19 Jul 2007 20:06: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 0DCE716A400 for ; Thu, 19 Jul 2007 20:06:41 +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 F26AD13C4D0 for ; Thu, 19 Jul 2007 20:06:40 +0000 (UTC) (envelope-from cnst@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 l6JK6erS038879 for ; Thu, 19 Jul 2007 20:06:40 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6JK6emD038876 for perforce@freebsd.org; Thu, 19 Jul 2007 20:06:40 GMT (envelope-from cnst@FreeBSD.org) Date: Thu, 19 Jul 2007 20:06:40 GMT Message-Id: <200707192006.l6JK6emD038876@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 123749 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, 19 Jul 2007 20:06:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123749 Change 123749 by cnst@dale on 2007/07/19 20:06:35 integrate files Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.conf/files#3 integrate Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1239 2007/07/19 16:15:58 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -814,6 +814,10 @@ dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt dev/msk/if_msk.c optional msk +dev/mxge/if_mxge.c optional mxge pci +dev/mxge/mxge_lro.c optional mxge pci +dev/mxge/mxge_eth_z8e.c optional mxge pci +dev/mxge/mxge_ethp_z8e.c optional mxge pci dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard @@ -1633,7 +1637,7 @@ net/slcompress.c optional netgraph_vjc | ppp | sl | sppp | \ netgraph_sppp net/zlib.c optional crypto | geom_uzip | ipsec | \ - ppp_deflate | netgraph_deflate + mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl net80211/ieee80211_amrr.c optional wlan_amrr From owner-p4-projects@FreeBSD.ORG Thu Jul 19 20:34: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 8A9E216A405; Thu, 19 Jul 2007 20:34: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 5B59016A403 for ; Thu, 19 Jul 2007 20:34:17 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4AAB013C481 for ; Thu, 19 Jul 2007 20:34:17 +0000 (UTC) (envelope-from fli@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 l6JKYHLg040528 for ; Thu, 19 Jul 2007 20:34:17 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6JKYGGa040518 for perforce@freebsd.org; Thu, 19 Jul 2007 20:34:16 GMT (envelope-from fli@FreeBSD.org) Date: Thu, 19 Jul 2007 20:34:16 GMT Message-Id: <200707192034.l6JKYGGa040518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123751 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, 19 Jul 2007 20:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123751 Change 123751 by fli@fli_nexus on 2007/07/19 20:33:30 - Must hold event lock during initialization of an event, otherwise there is a removal race on events that are removed directly after they have been added (such as EOF on a new socket). - While here, use global locking macros and sort header files. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#6 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#6 (text+ko) ==== @@ -34,28 +34,15 @@ #include #include +#include "debug.h" #include "event.h" +#include "log.h" +#include "threads.h" #include "wqueue.h" -#include "log.h" -#include "debug.h" static int remove_event(struct eventlist *, struct event *, ev_arg *); static int event_engine(wq_arg); -#ifdef HAVE_PTHREAD -#define EV_RLOCK(ev) pthread_rwlock_rdlock(&(ev)->ev_lock) -#define EV_WLOCK(ev) pthread_rwlock_wrlock(&(ev)->ev_lock) -#define EV_UNLOCK(ev) pthread_rwlock_unlock(&(ev)->ev_lock) -#define EVL_LOCK(evl) pthread_mutex_lock(&(evl)->evl_mtx) -#define EVL_UNLOCK(evl) pthread_mutex_unlock(&(evl)->evl_mtx) -#else -#define EV_RLOCK(ev) -#define EV_WLOCK(ev) -#define EV_UNLOCK(ev) -#define EVL_LOCK(evl) -#define EVL_UNLOCK(evl) -#endif - /* * Initialize a new event list */ @@ -75,9 +62,7 @@ TAILQ_INIT(&evl->evl_events); evl->evl_kq = kq; -#ifdef HAVE_PTHREAD - pthread_mutex_init(&evl->evl_mtx, NULL); -#endif + MTX_INIT(evl, evl_mtx, NULL); MDNS_INIT_SET(evl, evl_magic); return (evl); } @@ -95,13 +80,13 @@ int empty; MDNS_INIT_ASSERT(evl, evl_magic); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); while (!TAILQ_EMPTY(&evl->evl_events)) { ev = TAILQ_FIRST(&evl->evl_events); - EV_WLOCK(ev); + RW_WLOCK(ev, ev_lock); ev->ev_flags |= EVENT_FLAG_DYING; if (remove_event(evl, ev, &ev->ev_init_arg) == 1) { - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } } empty = TAILQ_EMPTY(&evl->evl_events); @@ -115,7 +100,7 @@ free(evl); } else { - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); } return (!empty); @@ -153,10 +138,10 @@ break; } - EV_WLOCK(ev); + RW_WLOCK(ev, ev_lock); if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_redo > 0) { ev->ev_redo--; - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); dprintf(DEBUG_EVENT, "Executing event again ev=%x", ev); goto again; } @@ -164,11 +149,11 @@ if (ev->ev_flags & EVENT_FLAG_DYING) { evl = ev->ev_evl; if (remove_event(evl, ev, &ev->ev_init_arg) == 1) { - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } } else { - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } return (0); } @@ -191,9 +176,9 @@ struct kevent kev; MDNS_INIT_ASSERT(evl, evl_magic); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); kq = evl->evl_kq; - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); /* * We (ab)use SIGUSR1 for our own evil purposes, when an event handler @@ -217,10 +202,10 @@ if (ev == NULL) continue; - EV_WLOCK(ev); + RW_WLOCK(ev, ev_lock); if (kev.flags & EV_EOF) { if (remove_event(evl, ev, &ev->ev_init_arg) == 1) { - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } continue; } @@ -230,7 +215,7 @@ if (ev->ev_refcnt == 0) remove_event(evl, ev, &ev->ev_init_arg); else { - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } continue; } @@ -240,12 +225,12 @@ dprintf(DEBUG_EVENT, "Exclusive event already in progress ev=%x", ev); ev->ev_redo++; - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); continue; } ev->ev_refcnt++; - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); dprintf(DEBUG_EVENT, "Event fired, dispatched to queue=%x, ev=%x", wq, ev); wa.ptr = ev; @@ -272,10 +257,10 @@ pid_t self; MDNS_INIT_ASSERT(evl, evl_magic); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); dprintf(DEBUG_EVENT, "Event exit called"); evl->evl_flags |= EVL_FLAG_DYING; - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); self = getpid(); kill(self, SIGUSR1); @@ -327,10 +312,11 @@ #ifdef HAVE_PTHREAD pthread_rwlock_init(&ev->ev_lock, NULL); #endif + RW_WLOCK(ev, ev_lock); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); ev->ev_id = evl->evl_len++; - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); switch (type) { case EVENT_TYPE_IO: @@ -377,19 +363,21 @@ kev.flags |= EV_ADD | EV_CLEAR; ret = kevent(evl->evl_kq, &kev, 1, NULL, 0, NULL); if (ret != 0) { + RW_UNLOCK(ev, ev_lock); free(ev); dprintf(DEBUG_EVENT, "Failed to install kevent"); return (-1); } else { - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); TAILQ_INSERT_TAIL(&evl->evl_events, ev, ev_evlist); - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); } MDNS_INIT_SET(ev, ev_magic); dprintf(DEBUG_EVENT, "Event added type=%d, id=%d, ev=%x, handler=%x", type, ev->ev_id, ev, handler); + RW_UNLOCK(ev, ev_lock); return (ev->ev_id); } @@ -408,17 +396,17 @@ struct event *ev = NULL; MDNS_INIT_ASSERT(evl, evl_magic); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); TAILQ_FOREACH(ev, &evl->evl_events, ev_evlist) { if (ev->ev_id == id) break; } - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); if (ev == NULL) { return (-1); } - EV_WLOCK(ev); + RW_WLOCK(ev, ev_lock); dprintf(DEBUG_EVENT, "Removing event ev=%x", ev); if (remove_event(evl, ev, arg) == 1) { @@ -429,7 +417,7 @@ * can be removed. */ memcpy(&ev->ev_init_arg, arg, sizeof(ev_arg)); - EV_UNLOCK(ev); + RW_UNLOCK(ev, ev_lock); } return (0); @@ -461,9 +449,9 @@ } bzero(&kev, sizeof(struct kevent)); - EVL_LOCK(evl); + MTX_LOCK(evl, evl_mtx); TAILQ_REMOVE(&evl->evl_events, ev, ev_evlist); - EVL_UNLOCK(evl); + MTX_UNLOCK(evl, evl_mtx); if (arg != NULL) memcpy(&ev_arg_init, arg, sizeof(ev_arg)); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#5 (text+ko) ==== @@ -30,8 +30,10 @@ #include #include +#include "debug.h" +#include "threads.h" #include "wqueue.h" -#include "debug.h" + /* * Holds event id and backpointer to event list, included @@ -100,9 +102,7 @@ struct eventlist { MAGIC(evl_magic); TAILQ_HEAD(, event) evl_events; /* list of events */ -#ifdef HAVE_PTHREAD - pthread_mutex_t evl_mtx; -#endif + DEF_MTX(evl_mtx); int evl_len; int evl_flags; #define EVL_FLAG_DYING 0x1 @@ -116,9 +116,7 @@ MAGIC(ev_magic); TAILQ_ENTRY(event) ev_evlist; /* global event list */ struct eventlist *ev_evl; /* back-pointer to list */ -#ifdef HAVE_PTHREAD - pthread_rwlock_t ev_lock; -#endif + DEF_RW(ev_lock); int ev_refcnt; /* reference counter */ int ev_flags; #define EVENT_FLAG_EX 0x1 /* exclusive event (refcnt=1) */ From owner-p4-projects@FreeBSD.ORG Thu Jul 19 21:08: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 F0BDF16A405; Thu, 19 Jul 2007 21:08: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 BE5D016A401 for ; Thu, 19 Jul 2007 21:08: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 9623113C442 for ; Thu, 19 Jul 2007 21:08:00 +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 l6JL80t0051978 for ; Thu, 19 Jul 2007 21:08:00 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6JL80dv051973 for perforce@freebsd.org; Thu, 19 Jul 2007 21:08:00 GMT (envelope-from thioretic@FreeBSD.org) Date: Thu, 19 Jul 2007 21:08:00 GMT Message-Id: <200707192108.l6JL80dv051973@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 123752 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, 19 Jul 2007 21:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=123752 Change 123752 by thioretic@thioretic on 2007/07/19 21:06:59 Functional devices shouldn't be removed on dev->refs==0 They should become children on root_bus. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#18 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#18 (text+ko) ==== @@ -168,6 +168,7 @@ #define DF_QUIET 16 /* don't print verbose attach message */ #define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH again */ #define DF_REBID 128 /* Can rebid after attach */ +#define DF_PERSISTENT 256 /* Should not delete when refs == 0*/ u_char order; /**< order from device_add_child_ordered() */ u_char pad; void *ivars; /**< instance variables */ @@ -2232,7 +2233,7 @@ free (grand); } -/*!!!*/ if ((error = device_detach(devtodel)) != 0) + if (!(devtodel->flags & DF_PERSISTENT) && ((error = device_detach(devtodel)) != 0)) return (error); if (devtodel->devclass) devclass_delete_device(devtodel->devclass, devtodel); @@ -2246,8 +2247,13 @@ } } + if (devtodel->flags & DF_PERSISTENT){ + device_add_existing_parent(dev, root_bus); + return (0); + } + if (devtodel->refs) - return (0); + return (1); TAILQ_REMOVE(&bus_data_devices, devtodel, devlink); kobj_delete((kobj_t) devtodel, M_BUS); @@ -4664,6 +4670,7 @@ char* parents[]; int count=0, isfilter, devcount; device_t dev, *devices; + u_int32_t flags; dmd = (struct driver_module_data *)arg; drv_intnl = dmd->dmd_driver; @@ -4705,19 +4712,19 @@ parentname, TRUE, FALSE); } else { *dmd->dmd_devclass = - devclass_find_internal(driver->name, 0, TRUE, FALSR); + devclass_find_internal(driver->name, 0, TRUE, FALSE); } - if(drv_intnl->flags & DR_REQDEV){ /*restrict to DR_LOWEST? */ + if(drv_intnl->flags & (DR_REQDEV|DR_LOWEST)){ dev = make_device (root_bus, DRIVERNAME(driver), -1); device_set_driver(dev, driver); - /*if (!hasclass)*/ device_set_devclass(dev, driver->name); /* Fetch any flags for the device before probing. resource_int_value(dl->driver->name, child->unit, "flags", &child->devflags); */ + dev->flags |= DF_PERSISTENT; count = 0; while (parents[count]){ if (!(parent_devclass = devclass_find(parents[count++]))) @@ -4727,12 +4734,9 @@ device_add_existing_parent(dev, devices[i]); } } - result = DEVICE_PROBE(dev); - if(result <= 0) device_attach(dev); - /*overwise the device is to be destroyed by now*/ } break; From owner-p4-projects@FreeBSD.ORG Thu Jul 19 23:27:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D0C616A41B; Thu, 19 Jul 2007 23:27:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC79516A418 for ; Thu, 19 Jul 2007 23:27:56 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9955C13C46A for ; Thu, 19 Jul 2007 23:27:56 +0000 (UTC) (envelope-from mharvan@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 l6JNRuFV062815 for ; Thu, 19 Jul 2007 23:27:56 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6JNRuia062812 for perforce@freebsd.org; Thu, 19 Jul 2007 23:27:56 GMT (envelope-from mharvan@FreeBSD.org) Date: Thu, 19 Jul 2007 23:27:56 GMT Message-Id: <200707192327.l6JNRuia062812@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 123756 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, 19 Jul 2007 23:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=123756 Change 123756 by mharvan@mharvan_twoflower on 2007/07/19 23:27:02 fragmentation support in the common code Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#6 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_icmp.c#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#9 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.h#4 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#6 (text+ko) ==== @@ -1,9 +1,10 @@ -LIBS+= -levent -LIBS+=-L/usr/local/lib # Linux needs -ldl -#LIBS+= -ldl -levent +#LIBS+= -ldl + +LIBS+=-levent -CFLAGS=-Wall -rdynamic +LIBS=-L/usr/local/lib -levent +CFLAGS+=-Wall -rdynamic CFLAGS+=-g CFLAGS+=-I/usr/local/include @@ -11,7 +12,6 @@ tunneld: tunneld.h tunneld.c tun_dev.c gcc $(CFLAGS) $(LIBS) -o tunneld tunneld.c tun_dev.c -# -ldl plugin_tcp.so: tunneld.h plugin.h plugin_tcp.c gcc $(CFLAGS) -shared -o plugin_tcp.so plugin_tcp.c ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_icmp.c#2 (text+ko) ==== @@ -182,6 +182,14 @@ } else { data->state = PLUGIN_STATE_CONNECTED; } + + if (data->server) { + #ifdef __FreeBSD__ + //system("sysctl net.ipv4.icmp_echo_ignore_all=0"); + #else + system("sysctl net.ipv4.icmp_echo_ignore_all=0"); + #endif + } return 0; } else { return -1; @@ -278,8 +286,9 @@ /* } else { */ /* icmp->type = ICMP_ECHO; */ /* } */ - icmp->type = 123; - + //icmp->type = ICMP_ECHO; + icmp->type = 123; + icmp->code = 0; icmp->id = ID; icmp->seq = 0; ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#9 (text+ko) ==== @@ -48,8 +48,15 @@ struct event tun_ev; struct event timer_ev; + +/* sequence number for the echo request */ uint echo_seq = 0; +/* fragment id for the next packet to be fragmented */ +uint frag_id = 0; // TODO: randomize +frag_llist_t *frag_list; + +/* server host */ char *host; char *port = "12345"; @@ -216,6 +223,7 @@ void timer_ev_handler(int fd, short ev_type, void *arg) { struct timeval tv; + frag_llist_t *p, *q; plugint *pl = current_pl; fprintf(stderr, "timer fired\n"); @@ -228,6 +236,18 @@ } } + /* fragment reassembly timeout */ + // TODO: fragment reassembly timeout + for (p=frag_list; p;) { + q = p->next; + if (tv.tv_sec - p->tv_sec > FRAG_TIMEOUT) { + free(p->bitmap); + free(p->buf); + free(p); + } + p = q; + } + /* register a timer event */ tv.tv_sec=1; tv.tv_usec=0; @@ -241,6 +261,12 @@ void process_data_from_plugin(plugint *pl, char *data, int len) { u_int8_t dispatch = *data; + frag_hdr_t *frag_hdr = NULL; + frag_llist_t *p, *q, **pp; + struct timeval tv; + int i; + int dgram_reassembled; + switch (dispatch) { case DISPATCH_DATA: if (len > 0) { @@ -248,6 +274,120 @@ } tun_send(data+1, len-1); break; + case DISPATCH_FRAG: + if (len <= sizeof(frag_hdr)) { + report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); + return; + } + + frag_hdr = (frag_hdr_t*) data; + data += sizeof(frag_hdr_t); + len -= sizeof(frag_hdr_t); + + /* debugging output */ + fprintf(stderr, "got a frag header: id %d, size %d, off %d, len %d\n", + frag_hdr->id, frag_hdr->size, frag_hdr->offset, len); + + /* search frag info in list */ + pp = &frag_list; + for(p = frag_list; p; p = p->next) { + if (p->id == frag_hdr->id && + p->size == frag_hdr->size) { + break; + } + pp = &p; + } + /* found in list */ + if (p) { + fprintf(stderr, "found frag info in list\n"); + /* fragment info not found in list, start a new reassembly */ + } else { + fprintf(stderr, "frag info NOT found in list\n"); + /* allocate memory */ + p = malloc(sizeof(frag_llist_t)); + if (!p) { + fprintf(stderr, "process_data_from_plugin - " + "fragment reassembly: out of memory\n"); + return; + } + memset(p, 0, sizeof(*p)); + p->buf = malloc(frag_hdr->size); + if (!p->buf) { + free(p); + fprintf(stderr, "process_data_from_plugin - " + "fragment reassembly: out of memory\n"); + return; + } + p->bitmap = malloc(frag_hdr->size/8 + 1); + if (!p->bitmap) { + free(p->buf); + free(p); + fprintf(stderr, "process_data_from_plugin - " + "fragment reassembly: out of memory\n"); + return; + } + memset(p->bitmap, 0, sizeof(*(p->bitmap))); + + /* collect information about the fragments */ + // TODO: error checking + (void) gettimeofday(&tv, NULL); + p->next = frag_list; + frag_list = p; + p->id = frag_hdr->id; + p->size = frag_hdr->size; + memcpy(&p->tv_sec, &tv.tv_sec, sizeof(tv.tv_sec)); + } + + if (frag_hdr->offset + len <= p->size) { + /* copy the data */ + memcpy(p->buf + frag_hdr->offset, data, len); + /* update the bitmap */ + // TODO: we ignore overlaps, but that should be caught + // by the upper layer checksum + for(i = frag_hdr->offset; ioffset+len; i++) { + p->bitmap[i/8] |= (0x1 << (i%8)); + } + } else { + fprintf(stderr, "fragment outside of packet payload\n"); + } + + /* check if the complete packet has been reassembled */ + dgram_reassembled = 1; + /* examine the bitmap */ + for(i=0; i < p->size/8 && dgram_reassembled; i++) { + if (p->bitmap[i] != 0xff) { + dgram_reassembled = 0; +/* printf("dgram_reassembled = 0 (bitmap[%d]: 0x%x)\n", */ +/* i, p->bitmap[i]); */ + } + } + for(i=0; i < p->size%8 && dgram_reassembled; i++) { + if (! (p->bitmap[p->size/8] & (1 << i))) { + dgram_reassembled=0; +/* printf("dgram_reassembled = 0 (bitmap<<%d)\n", i); */ +/* printf("bitmap[%d]: 0x%x)\n", */ +/* p->size/8, p->bitmap[p->size/8]); */ + } + } +/* printf("bitmap: 0x"); */ +/* for(i=0; i < p->size/8 + 1; i++) { */ +/* printf("%x",p->bitmap[i]); */ +/* } */ +/* printf("\n"); */ + /* packet completely reassembled */ + if (dgram_reassembled) { + fprintf(stderr, "frag reassembly: packet complete\n"); + current_pl = pl; + tun_send(p->buf, p->size); + + /* remove fragment info from linked list */ + q = p->next; + free(p->buf); + free(p->bitmap); + free(p); + *pp = q; + } + break; case DISPATCH_ECHO_REQUEST: *data = (u_int8_t) DISPATCH_ECHO_REPLY; pl->send(pl, data, len); @@ -270,13 +410,17 @@ */ void process_data_from_tun(char *data, int len) { - int n; + int n = 0; char ldata[MTU+1]; + char *ldatap = ldata; + frag_hdr_t frag_hdr; + int mtu = 100; // TODO: add mtu to plugint if (current_pl == NULL) { fprintf(stderr, "no plugin connected yet, discarding tun data\n"); report_plugin_error(NULL, PLUGIN_ERROR_BOOTSTRAP); } else { +#ifdef NO_FRAG *ldata = DISPATCH_DATA; memcpy(ldata+1, data, min(sizeof(ldata)-1, len)); n = current_pl->send(current_pl, ldata, min(sizeof(ldata), len+1)); @@ -285,6 +429,45 @@ fprintf(stderr, "process_data_from_tun: plugind sent less " "bytes (%d) than requested (%d)\n", n, len); } +#else /* NO_FRAG */ + // mtu = current_pl->mtu; + + /* prepare the frag header */ + frag_hdr.dispatch = DISPATCH_FRAG; + frag_hdr.id = frag_id; + frag_id++; + frag_hdr.size = len; + frag_hdr.offset = 0; + + /* copy the payload */ + memcpy(ldatap + sizeof(frag_hdr), data, + min(sizeof(ldata) - sizeof(frag_hdr), len)); + len += sizeof(frag_hdr); + + while(len > sizeof(frag_hdr)) { + printf("process_data_from_tun: sending frag " + "offset %d, send_len %d, len %d\n", + frag_hdr.offset, min(mtu, len), len); + /* prepend the frag dispatch and header before the payload */ + memcpy(ldatap, &frag_hdr, sizeof(frag_hdr)); + + /* send it */ + //TODO: change the logic here, we should not fragment based + // on the return value from send() + n = min(mtu, len); + (void) current_pl->send(current_pl, ldatap, min(mtu, len)); + n -= sizeof(frag_hdr); + if (n <= 0) { + fprintf(stderr, "process_data_from_tun: failed to send" + "data (%d)\n", n); + report_plugin_error(current_pl, PLUGIN_ERROR_SEND); + return; + } + ldatap += n; + frag_hdr.offset += n; + len -= n; + } +#endif /* NO_FRAG */ } } @@ -294,6 +477,7 @@ return; } + /* server */ if (server) { if (pl) { /* reinitialize the broken plugin */ @@ -302,6 +486,7 @@ //pl->deinitialize(pl); //(void) pl->initialize(pl, server, host, 1234); } + /* client */ } else { if (pl) { /* deinitialize the broken plugin */ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.h#4 (text+ko) ==== @@ -1,9 +1,32 @@ #ifndef _TUNNELD_H #define _TUNNELD_H -#define PACKETLEN 1400 /* encapsulated data size */ +#include + +#define PACKETLEN 1400 /* encapsulated data size */ #define SOCKET_TIMEOUT 5 /* timeout for socket operations */ +#define FRAG_TIMEOUT 60 /* encapsulated data size */ + +/* fragment header */ +typedef struct _frag_hdr_t { + u_int8_t dispatch; + uint id; /* Id of the whole packet, same in each fragment */ + uint size; /* length of the whole packet, same in each fragment */ + uint offset; /* fragment offset (in bytes) from the beginning + * of the packet */ +} frag_hdr_t; +typedef struct _frag_llist_t { + uint id; /* Id of the whole packet, same in each fragment */ + uint size; /* length of the whole packet, same in each fragment */ + time_t tv_sec; /* seconds after epoch when reassembly + * of this packet started */ + u_int8_t *bitmap;/* bitmap representing already + * received parts of the packet */ + char *buf; /* buffer into which the fragment is reassembled */ + struct _frag_llist_t *next; +} frag_llist_t; + /* * code for setting timeout on a socket: * struct timeval tv; @@ -36,6 +59,7 @@ enum { DISPATCH_ECHO_REQUEST = 1, DISPATCH_ECHO_REPLY = 2, + DISPATCH_FRAG = 3, DISPATCH_DATA = 0x42 }; From owner-p4-projects@FreeBSD.ORG Fri Jul 20 07:05:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FE2016A419; Fri, 20 Jul 2007 07:05:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B363F16A417 for ; Fri, 20 Jul 2007 07:05:41 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A113113C45E for ; Fri, 20 Jul 2007 07:05:41 +0000 (UTC) (envelope-from peter@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 l6K75feQ024314 for ; Fri, 20 Jul 2007 07:05:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K75YgC024311 for perforce@freebsd.org; Fri, 20 Jul 2007 07:05:34 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 07:05:34 GMT Message-Id: <200707200705.l6K75YgC024311@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 123766 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, 20 Jul 2007 07:05:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=123766 Change 123766 by peter@peter_daintree on 2007/07/20 07:04:59 IFC @123765 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#32 integrate .. //depot/projects/hammer/contrib/diff/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/diff/Makefile.am#2 delete .. //depot/projects/hammer/contrib/diff/bootstrap#2 delete .. //depot/projects/hammer/contrib/diff/doc/Makefile.am#2 delete .. //depot/projects/hammer/contrib/diff/doc/diagmeet.note#2 delete .. //depot/projects/hammer/contrib/diff/exgettext#2 delete .. //depot/projects/hammer/contrib/diff/lib/Makefile.am#2 delete .. //depot/projects/hammer/contrib/diff/lib/alloca.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/alloca_.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/dirname.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/fnmatch.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/fnmatch_.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/fnmatch_loop.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/getopt.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/getopt1.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/getopt_int.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/gettimeofday.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/imaxtostr.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/inttostr.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/malloc.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/mkstemp.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/offtostr.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/realloc.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/regex.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/regex.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/setmode.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/stdbool_.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/strcasecmp.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/stripslash.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/strncasecmp.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/strtol.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/strtoll.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/strtoul.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/strtoull.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/tempname.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/time_r.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/time_r.h#2 delete .. //depot/projects/hammer/contrib/diff/lib/umaxtostr.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/waitpid.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/xstrdup.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/xstrtol.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/xstrtoul.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/xstrtoumax.c#2 delete .. //depot/projects/hammer/contrib/diff/man/Makefile.am#2 delete .. //depot/projects/hammer/contrib/diff/src/Makefile.am#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/COPYING#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/Makefile#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/README#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/aes.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/aes.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/asn1.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/asn1.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/asn1_test.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/base64.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/base64.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/bignum.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/bignum.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/build_config.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/common.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/common.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config_file.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config_none.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/config_ssid.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config_types.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/config_winreg.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_cryptoapi.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_gnutls.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_libtomcrypt.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_none.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/defconfig#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/defs.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/des.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/doc/code_structure.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.fast#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.full#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/eap.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/mainpage.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/porting.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_hostap.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis_.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/driver_wired.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/drivers.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_aka.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_defs.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_fast.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gtc.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_i.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_leap.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_md5.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_methods.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_methods.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_otp.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake_common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_testing.txt#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eap_vendor_test.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_test.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/eloop_none.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/eloop_win.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/events.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/hostapd.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/includes.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/l2_packet.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/libtommath.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/main.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/md4.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/md5.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/md5.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/mlme.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/mlme.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/nmake.mak#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/os.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/os_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/os_none.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/os_unix.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/pmksa_cache.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/pmksa_cache.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/preauth.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/preauth.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/preauth_test.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/radius.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/radius.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/rsa.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/rsa.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/sha256.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/sha256.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/state_machine.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/tls_gnutls.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/tls_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tls_none.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/tls_schannel.c#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_client.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_client.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_common.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/todo.txt#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/version.h#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_cli.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_common.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_i.h#2 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_passphrase.c#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#6 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.conf#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.h#3 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant_i.h#4 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/x509v3.c#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/x509v3.h#1 branch .. //depot/projects/hammer/etc/Makefile#56 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#47 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#38 integrate .. //depot/projects/hammer/include/Makefile#69 integrate .. //depot/projects/hammer/lib/Makefile#62 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#44 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#31 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#35 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test.h#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_tar_filenames.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#6 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#8 integrate .. //depot/projects/hammer/lib/libc/sys/ioctl.2#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#8 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#34 integrate .. //depot/projects/hammer/sbin/atm/Makefile#3 integrate .. //depot/projects/hammer/share/examples/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/ipmi.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/hammer/share/man/man4/wi.4#29 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#10 integrate .. //depot/projects/hammer/share/man/man7/ports.7#18 integrate .. //depot/projects/hammer/share/man/man9/contigmalloc.9#6 integrate .. //depot/projects/hammer/share/man/man9/module.9#5 integrate .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#10 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#14 integrate .. //depot/projects/hammer/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch .. //depot/projects/hammer/share/zoneinfo/leapseconds#10 integrate .. //depot/projects/hammer/sys/Makefile#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#41 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#17 integrate .. //depot/projects/hammer/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/hammer/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/hammer/sys/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/hammer/sys/coda/00READ#2 delete .. //depot/projects/hammer/sys/coda/README#2 delete .. //depot/projects/hammer/sys/coda/TODO#2 delete .. //depot/projects/hammer/sys/coda/cnode.h#9 delete .. //depot/projects/hammer/sys/coda/coda.h#7 delete .. //depot/projects/hammer/sys/coda/coda_fbsd.c#19 delete .. //depot/projects/hammer/sys/coda/coda_io.h#3 delete .. //depot/projects/hammer/sys/coda/coda_kernel.h#3 delete .. //depot/projects/hammer/sys/coda/coda_namecache.c#6 delete .. //depot/projects/hammer/sys/coda/coda_namecache.h#5 delete .. //depot/projects/hammer/sys/coda/coda_opstats.h#3 delete .. //depot/projects/hammer/sys/coda/coda_pioctl.h#3 delete .. //depot/projects/hammer/sys/coda/coda_psdev.c#14 delete .. //depot/projects/hammer/sys/coda/coda_psdev.h#4 delete .. //depot/projects/hammer/sys/coda/coda_subr.c#10 delete .. //depot/projects/hammer/sys/coda/coda_subr.h#4 delete .. //depot/projects/hammer/sys/coda/coda_venus.c#11 delete .. //depot/projects/hammer/sys/coda/coda_venus.h#6 delete .. //depot/projects/hammer/sys/coda/coda_vfsops.c#20 delete .. //depot/projects/hammer/sys/coda/coda_vfsops.h#7 delete .. //depot/projects/hammer/sys/coda/coda_vnops.c#24 delete .. //depot/projects/hammer/sys/coda/coda_vnops.h#9 delete .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#20 integrate .. //depot/projects/hammer/sys/conf/NOTES#123 integrate .. //depot/projects/hammer/sys/conf/files#156 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#48 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#64 integrate .. //depot/projects/hammer/sys/conf/options#111 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#35 integrate .. //depot/projects/hammer/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#39 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#24 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#52 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#20 integrate .. //depot/projects/hammer/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.dat.gz.uu#6 delete .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.dat.gz.uu#6 delete .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/hammer/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/hammer/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/hammer/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_mcp.h#5 integrate .. //depot/projects/hammer/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#48 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#38 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#83 integrate .. //depot/projects/hammer/sys/dev/wi/if_wavelan_ieee.h#8 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#53 integrate .. //depot/projects/hammer/sys/fs/coda/README#1 branch .. //depot/projects/hammer/sys/fs/coda/TODO#1 branch .. //depot/projects/hammer/sys/fs/coda/cnode.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/hammer/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/hammer/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#7 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#43 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#12 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#18 integrate .. //depot/projects/hammer/sys/i386/include/pc/vesa.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/syscall.S#10 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#70 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#81 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#53 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#49 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#78 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#78 integrate .. //depot/projects/hammer/sys/modules/Makefile#110 integrate .. //depot/projects/hammer/sys/modules/coda/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/atm/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/Makefile#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_proto.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#14 integrate .. //depot/projects/hammer/sys/netinet/icmp_var.h#6 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#35 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/hammer/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/hammer/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#8 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#19 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#29 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#12 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#12 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/hammer/sys/pc98/cbus/sio.c#10 integrate .. //depot/projects/hammer/sys/pci/agp.c#21 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#23 integrate .. //depot/projects/hammer/sys/pci/agppriv.h#4 integrate .. //depot/projects/hammer/sys/pci/agpreg.h#15 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#45 integrate .. //depot/projects/hammer/sys/sys/lock_profile.h#5 integrate .. //depot/projects/hammer/sys/sys/mutex.h#30 integrate .. //depot/projects/hammer/sys/sys/sysent.h#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#44 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#47 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#59 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#29 integrate .. //depot/projects/hammer/sys/vm/vm_phys.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_phys.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#28 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/fstest/fstest.c#2 integrate .. //depot/projects/hammer/tools/regression/fstest/tests/open/16.t#2 integrate .. //depot/projects/hammer/tools/regression/fstest/tests/open/18.t#2 integrate .. //depot/projects/hammer/tools/tools/mfc/mfc.pl#5 integrate .. //depot/projects/hammer/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/hammer/usr.bin/kdump/mkioctls#8 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.rc#3 integrate .. //depot/projects/hammer/usr.bin/netstat/atalk.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/bpf.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#15 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#22 integrate .. //depot/projects/hammer/usr.bin/netstat/inet6.c#8 integrate .. //depot/projects/hammer/usr.bin/netstat/ipsec.c#8 integrate .. //depot/projects/hammer/usr.bin/netstat/ipx.c#6 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#24 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#15 integrate .. //depot/projects/hammer/usr.bin/netstat/mcast.c#6 integrate .. //depot/projects/hammer/usr.bin/netstat/mroute.c#7 integrate .. //depot/projects/hammer/usr.bin/netstat/mroute6.c#6 integrate .. //depot/projects/hammer/usr.bin/netstat/netgraph.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#18 integrate .. //depot/projects/hammer/usr.bin/netstat/pfkey.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#12 integrate .. //depot/projects/hammer/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/hammer/usr.bin/netstat/unix.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#22 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.y#7 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#23 integrate .. //depot/projects/hammer/usr.sbin/Makefile#79 integrate .. //depot/projects/hammer/usr.sbin/dconschat/dconschat.c#10 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_passphrase/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#9 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#32 (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.107 2007/07/17 17:28:59 delphij 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,79 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070715: netatm temporarily disconnected +OLD_FILES+=rescue/atm +OLD_FILES+=rescue/fore_dnld +OLD_FILES+=rescue/ilmid +OLD_FILES+=sbin/atm +OLD_FILES+=sbin/fore_dnld +OLD_FILES+=sbin/ilmid +OLD_FILES+=usr/include/libatm.h +OLD_FILES+=usr/include/netatm/atm.h +OLD_FILES+=usr/include/netatm/atm_cm.h +OLD_FILES+=usr/include/netatm/atm_if.h +OLD_FILES+=usr/include/netatm/atm_ioctl.h +OLD_FILES+=usr/include/netatm/atm_pcb.h +OLD_FILES+=usr/include/netatm/atm_sap.h +OLD_FILES+=usr/include/netatm/atm_sigmgr.h +OLD_FILES+=usr/include/netatm/atm_stack.h +OLD_FILES+=usr/include/netatm/atm_sys.h +OLD_FILES+=usr/include/netatm/atm_var.h +OLD_FILES+=usr/include/netatm/atm_vc.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h +OLD_FILES+=usr/include/netatm/port.h +OLD_FILES+=usr/include/netatm/queue.h +OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h +OLD_FILES+=usr/include/netatm/spans/spans_cls.h +OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h +OLD_FILES+=usr/include/netatm/spans/spans_var.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h +OLD_FILES+=usr/include/netatm/uni/sscop.h +OLD_FILES+=usr/include/netatm/uni/sscop_misc.h +OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h +OLD_FILES+=usr/include/netatm/uni/sscop_var.h +OLD_FILES+=usr/include/netatm/uni/uni.h +OLD_FILES+=usr/include/netatm/uni/uniip_var.h +OLD_FILES+=usr/include/netatm/uni/unisig.h +OLD_FILES+=usr/include/netatm/uni/unisig_decode.h +OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h +OLD_FILES+=usr/include/netatm/uni/unisig_msg.h +OLD_FILES+=usr/include/netatm/uni/unisig_print.h +OLD_FILES+=usr/include/netatm/uni/unisig_var.h +OLD_FILES+=usr/lib/libatm.a +OLD_FILES+=usr/lib/libatm_p.a +OLD_FILES+=usr/sbin/atmarpd +OLD_FILES+=usr/sbin/scspd +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz +OLD_FILES+=usr/share/man/man8/atm.8.gz +OLD_FILES+=usr/share/man/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/man8/scspd.8.gz +OLD_FILES+=usr/share/examples/atm/NOTES +OLD_FILES+=usr/share/examples/atm/README +OLD_FILES+=usr/share/examples/atm/Startup +OLD_FILES+=usr/share/examples/atm/atm-config.sh +OLD_FILES+=usr/share/examples/atm/atm-sockets.txt +OLD_FILES+=usr/share/examples/atm/cpcs-design.txt +OLD_FILES+=usr/share/examples/atm/fore-microcode.txt +OLD_FILES+=usr/share/examples/atm/sscf-design.txt +OLD_FILES+=usr/share/examples/atm/sscop-design.txt +OLD_LIBS+=lib/libatm.so.5 +OLD_LIBS+=usr/lib/libatm.so +OLD_DIRS+=usr/include/netatm/sigpvc +OLD_DIRS+=usr/include/netatm/spans +OLD_DIRS+=usr/include/netatm/ipatm +OLD_DIRS+=usr/include/netatm/uni +OLD_DIRS+=usr/include/netatm +OLD_DIRS+=usr/share/examples/atm # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -59,6 +132,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 @@ -100,6 +177,8 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +# 20070613: IPX over IP tunnel removal +OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz # 20070603: BIND 9.4.1 import @@ -238,6 +317,230 @@ OLD_FILES+=usr/libexec/f771 OLD_FILES+=usr/share/info/g77.info.gz OLD_FILES+=usr/share/man/man1/f77.1.gz +OLD_FILES+=usr/include/c++/3.4/algorithm +OLD_FILES+=usr/include/c++/3.4/backward/algo.h +OLD_FILES+=usr/include/c++/3.4/backward/algobase.h +OLD_FILES+=usr/include/c++/3.4/backward/alloc.h +OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.4/backward/bvector.h +OLD_FILES+=usr/include/c++/3.4/backward/complex.h +OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.4/backward/deque.h +OLD_FILES+=usr/include/c++/3.4/backward/fstream.h +OLD_FILES+=usr/include/c++/3.4/backward/function.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.4/backward/heap.h +OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.4/backward/iostream.h +OLD_FILES+=usr/include/c++/3.4/backward/istream.h +OLD_FILES+=usr/include/c++/3.4/backward/iterator.h +OLD_FILES+=usr/include/c++/3.4/backward/list.h +OLD_FILES+=usr/include/c++/3.4/backward/map.h +OLD_FILES+=usr/include/c++/3.4/backward/multimap.h +OLD_FILES+=usr/include/c++/3.4/backward/multiset.h +OLD_FILES+=usr/include/c++/3.4/backward/new.h +OLD_FILES+=usr/include/c++/3.4/backward/ostream.h +OLD_FILES+=usr/include/c++/3.4/backward/pair.h +OLD_FILES+=usr/include/c++/3.4/backward/queue.h +OLD_FILES+=usr/include/c++/3.4/backward/rope.h +OLD_FILES+=usr/include/c++/3.4/backward/set.h +OLD_FILES+=usr/include/c++/3.4/backward/slist.h +OLD_FILES+=usr/include/c++/3.4/backward/stack.h +OLD_FILES+=usr/include/c++/3.4/backward/stream.h +OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.4/backward/strstream +OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.4/backward/tree.h +OLD_FILES+=usr/include/c++/3.4/backward/vector.h +OLD_FILES+=usr/include/c++/3.4/bits/allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h +OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/c++config.h +OLD_FILES+=usr/include/c++/3.4/bits/c++io.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h +OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr.h +OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/list.tcc +OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/postypes.h +OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.4/bits/time_members.h +OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h +OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc +OLD_FILES+=usr/include/c++/3.4/bitset +OLD_FILES+=usr/include/c++/3.4/cassert +OLD_FILES+=usr/include/c++/3.4/cctype +OLD_FILES+=usr/include/c++/3.4/cerrno +OLD_FILES+=usr/include/c++/3.4/cfloat +OLD_FILES+=usr/include/c++/3.4/ciso646 +OLD_FILES+=usr/include/c++/3.4/climits +OLD_FILES+=usr/include/c++/3.4/clocale +OLD_FILES+=usr/include/c++/3.4/cmath +OLD_FILES+=usr/include/c++/3.4/complex +OLD_FILES+=usr/include/c++/3.4/csetjmp +OLD_FILES+=usr/include/c++/3.4/csignal +OLD_FILES+=usr/include/c++/3.4/cstdarg +OLD_FILES+=usr/include/c++/3.4/cstddef +OLD_FILES+=usr/include/c++/3.4/cstdio +OLD_FILES+=usr/include/c++/3.4/cstdlib +OLD_FILES+=usr/include/c++/3.4/cstring +OLD_FILES+=usr/include/c++/3.4/ctime +OLD_FILES+=usr/include/c++/3.4/cwchar +OLD_FILES+=usr/include/c++/3.4/cwctype +OLD_FILES+=usr/include/c++/3.4/cxxabi.h +OLD_FILES+=usr/include/c++/3.4/debug/bitset +OLD_FILES+=usr/include/c++/3.4/debug/debug.h +OLD_FILES+=usr/include/c++/3.4/debug/deque +OLD_FILES+=usr/include/c++/3.4/debug/formatter.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_map +OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_set +OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h +OLD_FILES+=usr/include/c++/3.4/debug/list +OLD_FILES+=usr/include/c++/3.4/debug/map +OLD_FILES+=usr/include/c++/3.4/debug/map.h +OLD_FILES+=usr/include/c++/3.4/debug/multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc +OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h +OLD_FILES+=usr/include/c++/3.4/debug/set +OLD_FILES+=usr/include/c++/3.4/debug/set.h +OLD_FILES+=usr/include/c++/3.4/debug/string +OLD_FILES+=usr/include/c++/3.4/debug/vector +OLD_FILES+=usr/include/c++/3.4/deque +OLD_FILES+=usr/include/c++/3.4/exception +OLD_FILES+=usr/include/c++/3.4/exception_defines.h +OLD_FILES+=usr/include/c++/3.4/ext/algorithm +OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/functional +OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h +OLD_FILES+=usr/include/c++/3.4/ext/hash_map +OLD_FILES+=usr/include/c++/3.4/ext/hash_set +OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h +OLD_FILES+=usr/include/c++/3.4/ext/iterator +OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/memory +OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/numeric +OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h +OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/rb_tree +OLD_FILES+=usr/include/c++/3.4/ext/rope +OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.4/ext/slist +OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h +OLD_FILES+=usr/include/c++/3.4/fstream +OLD_FILES+=usr/include/c++/3.4/functional +OLD_FILES+=usr/include/c++/3.4/iomanip +OLD_FILES+=usr/include/c++/3.4/ios +OLD_FILES+=usr/include/c++/3.4/iosfwd +OLD_FILES+=usr/include/c++/3.4/iostream +OLD_FILES+=usr/include/c++/3.4/istream +OLD_FILES+=usr/include/c++/3.4/iterator +OLD_FILES+=usr/include/c++/3.4/limits +OLD_FILES+=usr/include/c++/3.4/list +OLD_FILES+=usr/include/c++/3.4/locale +OLD_FILES+=usr/include/c++/3.4/map +OLD_FILES+=usr/include/c++/3.4/memory +OLD_FILES+=usr/include/c++/3.4/new +OLD_FILES+=usr/include/c++/3.4/numeric +OLD_FILES+=usr/include/c++/3.4/ostream +OLD_FILES+=usr/include/c++/3.4/queue +OLD_FILES+=usr/include/c++/3.4/set +OLD_FILES+=usr/include/c++/3.4/sstream +OLD_FILES+=usr/include/c++/3.4/stack +OLD_FILES+=usr/include/c++/3.4/stdexcept +OLD_FILES+=usr/include/c++/3.4/streambuf +OLD_FILES+=usr/include/c++/3.4/string +OLD_FILES+=usr/include/c++/3.4/typeinfo +OLD_FILES+=usr/include/c++/3.4/utility +OLD_FILES+=usr/include/c++/3.4/valarray +OLD_FILES+=usr/include/c++/3.4/vector +OLD_DIRS+=usr/include/c++/3.4/backward +OLD_DIRS+=usr/include/c++/3.4/bits +OLD_DIRS+=usr/include/c++/3.4/debug +OLD_DIRS+=usr/include/c++/3.4/ext +OLD_DIRS+=usr/include/c++/3.4 # 20070510: zpool/zfs moved to /sbin OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool ==== //depot/projects/hammer/contrib/diff/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,17 +1,61 @@ -# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.1 2007/06/15 07:28:00 delphij Exp $ +# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.2 2007/07/19 06:57:44 delphij Exp $ INSTALL +Makefile.am +Makefile.in +aclocal.m4 +bootstrap +config.hin config/ +configure +configure.ac +doc/Makefile.am +doc/Makefile.in +doc/diagmeet.note +exgettext +lib/Makefile.am +lib/Makefile.in +lib/alloca.c +lib/alloca_.h +lib/dirname.c +lib/fnmatch.c +lib/fnmatch_.h +lib/fnmatch_loop.c +lib/getopt.c +lib/getopt1.c +lib/getopt_int.h +lib/gettimeofday.c +lib/imaxtostr.c +lib/inttostr.c +lib/malloc.c +lib/mkstemp.c +lib/offtostr.c +lib/posix/Makefile.in +lib/realloc.c +lib/regex.c +lib/regex.h +lib/setmode.c +lib/stdbool_.h +lib/strcasecmp.c +lib/stripslash.c +lib/strncasecmp.c +lib/strtol.c +lib/strtoll.c +lib/strtoul.c +lib/strtoull.c +lib/tempname.c +lib/time_r.c +lib/time_r.h +lib/umaxtostr.c +lib/waitpid.c +lib/xstrdup.c +lib/xstrtol.c +lib/xstrtoul.c +lib/xstrtoumax.c m4/ +man/Makefile.am +man/Makefile.in ms/ po/ +src/Makefile.am src/Makefile.in -lib/posix/Makefile.in -lib/Makefile.in -doc/Makefile.in -man/Makefile.in -Makefile.in -aclocal.m4 -config.hin -configure -configure.ac ==== //depot/projects/hammer/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/hammer/contrib/wpa_supplicant/ChangeLog#4 (text+ko) ==== @@ -1,32 +1,334 @@ ChangeLog for wpa_supplicant >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 07:42:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8213016A421; Fri, 20 Jul 2007 07:42:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 581F016A418 for ; Fri, 20 Jul 2007 07:42:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4868513C46C for ; Fri, 20 Jul 2007 07:42:28 +0000 (UTC) (envelope-from gabor@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 l6K7gSTV026465 for ; Fri, 20 Jul 2007 07:42:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K7gRkm026462 for perforce@freebsd.org; Fri, 20 Jul 2007 07:42:27 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jul 2007 07:42:27 GMT Message-Id: <200707200742.l6K7gRkm026462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123767 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, 20 Jul 2007 07:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123767 Change 123767 by gabor@gabor_server on 2007/07/20 07:41:47 - Avoid multiple inclusion here, too Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#6 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#6 (text+ko) ==== @@ -14,6 +14,10 @@ COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org +.if !defined(_COMMANDSMKINCLUDED) + +_COMMANDSMKINCLUDED= yes + AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename BRANDELF?= /usr/bin/brandelf @@ -88,3 +92,5 @@ # Used to print all the '===>' style prompts - override this to turn them off. ECHO_MSG?= ${ECHO_CMD} + +.endif From owner-p4-projects@FreeBSD.ORG Fri Jul 20 08:27:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3463916A420; Fri, 20 Jul 2007 08:27:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA4FD16A417 for ; Fri, 20 Jul 2007 08:27:24 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2F3E13C478 for ; Fri, 20 Jul 2007 08:27:24 +0000 (UTC) (envelope-from zhouzhouyi@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 l6K8ROQk030988 for ; Fri, 20 Jul 2007 08:27:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K8RO5p030985 for perforce@freebsd.org; Fri, 20 Jul 2007 08:27:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 20 Jul 2007 08:27:24 GMT Message-Id: <200707200827.l6K8RO5p030985@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 123768 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, 20 Jul 2007 08:27:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=123768 Change 123768 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/20 08:27:03 requirement for doing a rename is quite strict :-) Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rename/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rename/00.t#2 (text+ko) ==== @@ -7,7 +7,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..5" +echo "1..8" n0=`namegen` n1=`namegen` @@ -50,7 +50,7 @@ echo "biba/high(low-high),mls/7(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} mactestexpect "" EACCES -m "mls/7(low-high)" -f ${mactest_conf} rename ${n2} ${n1} - +############################################################# #case the mls label of the process is equal the parent dir but dominated by the file echo -n "pid = -1 mac_test_check_vnode_rename_from:" > ${mactest_conf} echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} @@ -62,10 +62,28 @@ echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 NULL" >> ${mactest_conf} mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} rename ${n2} ${n1} +############################################################# +#setfmac, the hooks already got checked + rm ${mactest_conf} + touch ${mactest_conf} + mactestexpect "" "" -m "mls/7(low-high)" -f ${mactest_conf} system setfmac "mls/5" ${n1} + +############################################################# +#the mls requirement for rename is very strict :-) +#the process mls label must dominate parent dir's label for lookup + echo -n "pid = -1 mac_test_check_vnode_lookup:" > ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high) biba/high,mls/6" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/5(low-high)" -f ${mactest_conf} rename ${n1} ${n0} + + +#both parent dir's label and object's label must dominate +#process's label + echo -n "pid = -1 mac_test_check_vnode_rename_from:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/5" >> ${mactest_conf} + mactestexpect "" EACCES -m "mls/6(low-high)" -f ${mactest_conf} rename ${n1} ${n0} +#cleanup: t=`sysctl security.mac.mls.enabled=0` echo "disabling mac/mls!" - -#cleanup: cd .. rm -fr ${n3} rm ${mactest_conf} From owner-p4-projects@FreeBSD.ORG Fri Jul 20 08:28:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237EA16A41A; Fri, 20 Jul 2007 08:28:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D86D916A418 for ; Fri, 20 Jul 2007 08:28:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C88C313C428 for ; Fri, 20 Jul 2007 08:28:26 +0000 (UTC) (envelope-from gabor@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 l6K8SQcu031035 for ; Fri, 20 Jul 2007 08:28:26 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K8SQd3031032 for perforce@freebsd.org; Fri, 20 Jul 2007 08:28:26 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jul 2007 08:28:26 GMT Message-Id: <200707200828.l6K8SQd3031032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123769 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, 20 Jul 2007 08:28:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=123769 Change 123769 by gabor@gabor_server on 2007/07/20 08:27:28 - Make use of bsd.commands.mk here Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#10 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#10 (text+ko) ==== @@ -15,9 +15,6 @@ # own install script so that the entire system can be made # stripped/not-stripped using a single knob. [-s] # -# ECHO_MSG - Used to print all the '===>' style prompts - override this -# to turn them off [echo]. -# # OPSYS - Get the operating system type [`uname -s`] # # SUBDIR - A list of subdirectories that should be built as well. @@ -43,6 +40,7 @@ # Search for ports using either 'make search key=' # or 'make search name='. +.include "${PORTSDIR}/Mk/bsd.commands.mk" .MAIN: all @@ -52,10 +50,10 @@ .if !defined(NOPRECIOUSMAKEVARS) .if !defined(ARCH) -ARCH!= /usr/bin/uname -p +ARCH!= ${UNAME} -p .endif .if !defined(OSREL) -OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//' +OSREL!= ${UNAME} -r | ${SED} -e 's/[-(].*//' .endif .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) @@ -68,22 +66,18 @@ .endif .endif -ID?= /usr/bin/id UID!= ${ID} -u .if exists(${LOCALBASE}/sbin/pkg_info) PKG_INFO?= ${LOCALBASE}/sbin/pkg_info .else PKG_INFO?= /usr/sbin/pkg_info .endif -SED?= /usr/bin/sed PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .if !defined(OPSYS) -OPSYS!= /usr/bin/uname -s +OPSYS!= ${UNAME} -s .endif -ECHO_MSG?= echo - # local customization of the ports tree .if exists(${.CURDIR}/Makefile.local) .include "${.CURDIR}/Makefile.local" @@ -194,13 +188,13 @@ fi; \ done; \ if [ $$found = 0 ]; then \ - ${ECHO} "Warning: directory $$d not in SUBDIR"; \ + ${ECHO_MSG} "Warning: directory $$d not in SUBDIR"; \ fi; \ fi; \ done @for s in ${SUBDIR}; do \ if ! [ -d ${.CURDIR}/$$s ]; then \ - ${ECHO} "Warning: directory $$s in SUBDIR does not exist"; \ + ${ECHO_MSG} "Warning: directory $$s in SUBDIR does not exist"; \ fi \ done .endif @@ -226,11 +220,11 @@ .else describe: @for sub in ${SUBDIR}; do \ - if test -d ${.CURDIR}/$${sub}; then \ + if ${TEST} -d ${.CURDIR}/$${sub}; then \ ${ECHO_MSG} "===> ${DIRPRFX}$${sub}"; \ cd ${.CURDIR}/$${sub}; \ ${MAKE} -B describe || \ - (echo "===> ${DIRPRFX}$${sub} failed" >&2; \ + (${ECHO_CMD} "===> ${DIRPRFX}$${sub} failed" >&2; \ exit 1) ;\ else \ ${ECHO_MSG} "===> ${DIRPRFX}$${sub} non-existent"; \ @@ -243,7 +237,7 @@ .if defined(PORTSTOP) readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/} @${ECHO_MSG} "===> Creating README.html for all ports" - @perl ${PORTSDIR}/Tools/make_readmes < ${INDEXDIR}/${INDEXFILE} + @${PERL} ${PORTSDIR}/Tools/make_readmes < ${INDEXDIR}/${INDEXFILE} .else readmes: readme .endif @@ -251,8 +245,8 @@ .if !target(readme) readme: - @rm -f README.html - @make README.html + @${RM} -f README.html + @${MAKE} README.html .endif .if (${OPSYS} == "NetBSD") @@ -277,32 +271,32 @@ MOVEDDIR?= ${PORTSDIR} MOVEDFILE?= MOVED -HTMLIFY= sed -e 's/&/\&/g' -e 's/>/\>/g' -e 's//\>/g' -e 's/ Creating README.html" + @${ECHO_CMD} "===> Creating README.html" @> $@.tmp .for entry in ${SUBDIR} .if exists(${entry}) .if defined(PORTSTOP) - @echo -n ''"`echo ${entry} | ${HTMLIFY}`"': ' >> $@.tmp + @${ECHO_CMD} -n ''"`${ECHO_CMD} ${entry} | ${HTMLIFY}`"': ' >> $@.tmp .else - @echo -n ''"`cd ${entry}; make package-name | ${HTMLIFY}`: " >> $@.tmp + @${ECHO_CMD} -n ''"`cd ${entry}; ${MAKE} package-name | ${HTMLIFY}`: " >> $@.tmp .endif - @echo `cd ${entry}; make -V COMMENT` | ${HTMLIFY} >> $@.tmp + @${ECHO_CMD} `cd ${entry}; ${MAKE} -V COMMENT` | ${HTMLIFY} >> $@.tmp .endif .endfor - @sort -t '>' +1 -2 $@.tmp > $@.tmp2 + @${SORT} -t '>' +1 -2 $@.tmp > $@.tmp2 .if exists(${DESCR}) @${HTMLIFY} ${DESCR} > $@.tmp3 .else @> $@.tmp3 .endif .if defined(COMMENT) - @echo "${COMMENT}" | ${HTMLIFY} > $@.tmp4 + @${ECHO_CMD} "${COMMENT}" | ${HTMLIFY} > $@.tmp4 .else .if exists(${COMMENTFILE}) @${HTMLIFY} ${COMMENTFILE} > $@.tmp4 @@ -310,8 +304,8 @@ @> $@.tmp4 .endif .endif - @cat ${README} | \ - sed -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \ + @${CAT} ${README} | \ + ${SED} -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \ -e '/%%COMMENT%%/r$@.tmp4' \ -e '/%%COMMENT%%/d' \ -e '/%%DESCR%%/r$@.tmp3' \ @@ -319,7 +313,7 @@ -e '/%%SUBDIR%%/r$@.tmp2' \ -e '/%%SUBDIR%%/d' \ > $@ - @rm -f $@.tmp $@.tmp2 $@.tmp3 $@.tmp4 + @${RM} -f $@.tmp $@.tmp2 $@.tmp3 $@.tmp4 .if !defined(NOPRECIOUSMAKEVARS) .MAKEFLAGS: \ @@ -340,7 +334,7 @@ _PORTSEARCH= \ here=${.CURDIR}; \ if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \ - echo "The ${.TARGET} target requires ${INDEXFILE}. Please run make index or make fetchindex."; \ + ${ECHO_MSG} "The ${.TARGET} target requires ${INDEXFILE}. Please run make index or make fetchindex."; \ else \ cd ${PORTSDIR}; \ if [ -z "$$key" -a -z "$$xkey" -a \ @@ -353,12 +347,12 @@ -z "$$rdeps" -a -z "$$xrdeps" -a \ -z "$$www" -a -z "$$xwww" ]; \ then \ - echo "The ${.TARGET} target requires a keyword parameter or name parameter,"; \ - echo "e.g.: \"make ${.TARGET} key=somekeyword\""; \ - echo "or \"make ${.TARGET} name=somekeyword\""; \ + ${ECHO_MSG} "The ${.TARGET} target requires a keyword parameter or name parameter,"; \ + ${ECHO_MSG} "e.g.: \"make ${.TARGET} key=somekeyword\""; \ + ${ECHO_MSG} "or \"make ${.TARGET} name=somekeyword\""; \ exit; \ fi; \ - awk -F\| -v there="$$here/" -v top="$$(pwd -P)" \ + ${AWK} -F\| -v there="$$here/" -v top="$$(pwd -P)" \ -v key="$$key" -v xkey="$$xkey" \ -v name="$$name" -v xname="$$xname" \ -v path="$$path" -v xpath="$$xpath" \ @@ -452,7 +446,7 @@ }' ${INDEXDIR}/${INDEXFILE}; \ if [ "$$name" -o "$$xname" ] && [ ${PORTSEARCH_MOVED} -gt 0 ]; \ then \ - awk -F\| -v name="$$name" -v xname="$$xname" \ + ${AWK} -F\| -v name="$$name" -v xname="$$xname" \ -v icase="$${icase:-${PORTSEARCH_IGNORECASE}}" \ 'BEGIN { \ if (icase) { \ From owner-p4-projects@FreeBSD.ORG Fri Jul 20 08:49:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA63F16A41B; Fri, 20 Jul 2007 08:49:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8490F16A417 for ; Fri, 20 Jul 2007 08:49:55 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DBDE13C442 for ; Fri, 20 Jul 2007 08:49:55 +0000 (UTC) (envelope-from gabor@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 l6K8ntmX042247 for ; Fri, 20 Jul 2007 08:49:55 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K8ntL2042244 for perforce@freebsd.org; Fri, 20 Jul 2007 08:49:55 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jul 2007 08:49:55 GMT Message-Id: <200707200849.l6K8ntL2042244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123772 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, 20 Jul 2007 08:49:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123772 Change 123772 by gabor@gabor_server on 2007/07/20 08:49:22 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#10 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.17 2006/12/06 16:48:56 girgen Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.18 2007/07/18 21:56:10 edwin Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -37,10 +37,10 @@ # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if -# necessary (PostgreSQL-7.4 = 74). +# necessary (PostgreSQL-8.1 = 81). # DEFAULT_PGSQL_VER # - PostgreSQL default version. Can be overridden within a port. -# Default: 74. +# Default: 81. # WANT_PGSQL_VER # - Maintainer can set an arbitrary version of PostgreSQL by # using it. @@ -147,7 +147,7 @@ .endif # USE_MYSQL .if defined(USE_PGSQL) -DEFAULT_PGSQL_VER?= 74 +DEFAULT_PGSQL_VER?= 81 PGSQL73_LIBVER= 3 PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 ==== //depot/projects/soc2006/gabor_destdir/UPDATING#10 (text+ko) ==== @@ -6,6 +6,15 @@ time you update your ports collection, before attempting any port upgrades. +20070718: + AFFECTS: users of devel/llvm + AUTHOR: brooks@freebsd.org + + The llvm bytecode and .ll formats have changed as have numerious + internal APIs. Existing users should consult the release notes. + + http://llvm.org/releases/2.0/docs/ReleaseNotes.html + 20070716: AFFECTS: users of editors/emacs AUTHOR: nobutaka@FreeBSD.org @@ -5427,4 +5436,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.524 2007/07/16 17:08:58 nobutaka Exp $ +$FreeBSD: ports/UPDATING,v 1.527 2007/07/19 14:52:17 flz Exp $ From owner-p4-projects@FreeBSD.ORG Fri Jul 20 08:53:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C96516A421; Fri, 20 Jul 2007 08:53:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD92D16A41F for ; Fri, 20 Jul 2007 08:53:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC49813C459 for ; Fri, 20 Jul 2007 08:53:02 +0000 (UTC) (envelope-from rdivacky@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 l6K8r2RN042608 for ; Fri, 20 Jul 2007 08:53:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K8qxfK042601 for perforce@freebsd.org; Fri, 20 Jul 2007 08:52:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 20 Jul 2007 08:52:59 GMT Message-Id: <200707200852.l6K8qxfK042601@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 123773 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, 20 Jul 2007 08:53:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=123773 Change 123773 by rdivacky@rdivacky_witten on 2007/07/20 08:52:25 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/00READ#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/README#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/TODO#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/cnode.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_io.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_kernel.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_namecache.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_namecache.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_opstats.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_psdev.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_psdev.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_subr.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_subr.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_venus.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_venus.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vnops.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/coda/coda_vnops.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/options#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/LICENSE#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_82598.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_api.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_api.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_common.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_common.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_osdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_phy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_phy.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/ixgbe/ixgbe_type.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/README#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/TODO#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/cnode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/kern_switch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/coda/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netatm/atm_proto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/sctputil.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet6/in6.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/pci/agp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/pci/agp_i810.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/pci/agppriv.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/pci/agpreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_phys.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_epoll/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $ +# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ .include @@ -8,7 +8,7 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ==== @@ -30,13 +30,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $ */ #include #include #include "assym.s" +#include "opt_sched.h" /*****************************************************************************/ /* Scheduling */ @@ -50,6 +51,12 @@ #define LK #endif +#if defined(SCHED_ULE) && defined(SMP) +#define SETLK xchgq +#else +#define SETLK movq +#endif + /* * cpu_throw() * @@ -148,13 +155,7 @@ movq %cr3,%rax cmpq %rcx,%rax /* Same address space? */ jne swinact - movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ - /* Wait for the new thread to become unblocked */ - movq $blocked_lock, %rdx -1: - movq TD_LOCK(%rsi),%rcx - cmpq %rcx, %rdx - je 1b + SETLK %rdx, TD_LOCK(%rdi) /* Release the old thread */ jmp sw1 swinact: movq %rcx,%cr3 /* new address space */ @@ -163,21 +164,24 @@ movq TD_PROC(%rdi), %rcx /* oldproc */ movq P_VMSPACE(%rcx), %rcx LK btrl %eax, VM_PMAP+PM_ACTIVE(%rcx) /* clear old */ - movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ + SETLK %rdx, TD_LOCK(%rdi) /* Release the old thread */ swact: + /* Set bit in new pmap->pm_active */ + movq TD_PROC(%rsi),%rdx /* newproc */ + movq P_VMSPACE(%rdx), %rdx + LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ + +sw1: +#if defined(SCHED_ULE) && defined(SMP) /* Wait for the new thread to become unblocked */ movq $blocked_lock, %rdx 1: movq TD_LOCK(%rsi),%rcx cmpq %rcx, %rdx + pause je 1b - - /* Set bit in new pmap->pm_active */ - movq TD_PROC(%rsi),%rdx /* newproc */ - movq P_VMSPACE(%rdx), %rdx - LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ - -sw1: + lfence +#endif /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1023,7 +1023,8 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimit + linux32_fixlimit, + &linux32_maxssiz, }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/Makefile.inc#2 (text) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.6 2006/12/20 17:47:54 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.7 2007/07/13 14:27:04 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm __at91_boot_Makefile.inc__: -# tsc, bwct, kb920x are the supported flavors -BOOT_FLAVOR=kb920x +# tsc, bwct, kb920x, centipad are the supported flavors +BOOT_FLAVOR?=kb920x CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/board.h#2 (text+ko) ==== @@ -21,8 +21,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.1 2006/11/09 20:07:26 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot2/board.h,v 1.2 2007/07/13 14:27:04 imp Exp $ */ void Update(void); void board_init(void); +int drvread(void *, unsigned, unsigned); ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.5 2007/04/02 20:26:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/boot2.c,v 1.6 2007/07/13 14:27:04 imp Exp $"); #include #include @@ -26,9 +26,7 @@ #include -#include "emac.h" #include "lib.h" -#include "sd-card.h" #include "board.h" #define RBX_ASKNAME 0x0 /* -a */ @@ -84,8 +82,6 @@ RBX_VERBOSE }; -unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; - unsigned dsk_start; static char cmd[512]; static char kname[1024]; @@ -96,7 +92,6 @@ static int parse(void); static int xfsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); -static int drvread(void *, unsigned, unsigned); #include "ufsread.c" @@ -147,10 +142,6 @@ ino_t ino; board_init(); - EMAC_Init(); - EMAC_SetMACAddress(mac); - while (sdcard_init() == 0) - printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ @@ -179,14 +170,11 @@ xputchar('\n'); autoboot = 0; c = 0; - printf("cmd is '%s'\n", cmd); if (parse()) xputchar('\a'); #ifdef XMODEM_DL else if (*cmd == '*') - Update(); - else if (*cmd == '#') - reset(); + Update(); #endif else load(); @@ -281,14 +269,14 @@ dp = (void *)(sec + DOSPARTOFF); for (i = 0; i < NDOSPART; i++) { if (dp[i].dp_typ == DOSPTYP_386BSD) - break; + break; } if (i == NDOSPART) - return -1; + return -1; // Although dp_start is aligned within the disk partition structure, // DOSPARTOFF is 446, which is only word (2) aligned, not longword (4) // aligned. Cope by using memcpy to fetch the start of this partition. - memcpy(&dsk_start, &dp[i].dp_start, 4); + memcpy(&dsk_start, &dp[1].dp_start, 4); if (drvread(sec, dsk_start + LABELSECTOR, 1)) return -1; d = (void *)(sec + LABELOFFSET); @@ -306,12 +294,3 @@ } return drvread(buf, dsk_start + lba, nblk); } - -static int -drvread(void *buf, unsigned lba, unsigned nblk) -{ - static unsigned c = 0x2d5c7c2f; - - printf("%c\b", c = c << 8 | c >> 24); - return (MCI_read((char *)buf, lba << 9, nblk << 9)); -} ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/boot2/kb920x_board.c#2 (text+ko) ==== @@ -24,15 +24,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.3 2006/11/09 20:08:46 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/at91/boot2/kb920x_board.c,v 1.4 2007/07/13 14:27:04 imp Exp $"); #include #include "emac.h" #include "lib.h" #include "board.h" +#include "sd-card.h" -extern unsigned char mac[]; +unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; static void MacFromEE() @@ -40,7 +41,7 @@ uint32_t sig; sig = 0; ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig)); - if (sig != 0xaa55aa55) + if (sig != 0x92021054) return; ReadEEPROM(12 * 1024 + 4, mac, 6); printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], @@ -57,4 +58,14 @@ { InitEEPROM(); MacFromEE(); + EMAC_Init(); + EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); +} + +int +drvread(void *buf, unsigned lba, unsigned nblk) +{ + return (MCI_read((char *)buf, lba << 9, nblk << 9)); } ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.8 2007/03/15 03:31:49 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.9 2007/07/13 14:27:04 imp Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -8,7 +8,7 @@ putchar.c printf.c reset.c spi_flash.c xmodem.c \ sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \ memset.c memcmp.c -SRCS+=ashldi3.c divsi3.S +SRCS+=ashldi3.c divsi3.c NO_MAN= .if ${MK_TAG_LIST} != "no" ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #include "at91rm9200.h" @@ -62,7 +62,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | AT91C_PIO_PC20; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | @@ -136,7 +136,11 @@ AT91C_BASE_EBI->EBI_CSA = value; AT91C_BASE_SDRC->SDRC_CR = +#ifdef KB9202_B + AT91C_SDRC_NC_10 | +#else AT91C_SDRC_NC_9 | +#endif AT91C_SDRC_NR_13 | AT91C_SDRC_NB_4_BANKS | AT91C_SDRC_CAS_2 | ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.5 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.6 2007/07/13 14:27:04 imp Exp $ */ #ifndef _AT91RM9200_LOWLEVEL_H_ @@ -39,6 +39,14 @@ #define OSC_MAIN_MULT 90 #endif +#ifdef BOOT_CENTIPAD +/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +typedef unsigned short sdram_size_t; +#define OSC_MAIN_MULT 90 +#endif + #ifdef BOOT_BWCT /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.c#2 (text) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.7 2007/03/28 22:40:37 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.8 2007/07/13 14:27:04 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" @@ -380,7 +380,7 @@ static void MII_GetLinkSpeed(AT91PS_EMAC pEmac) { -#if defined(BOOT_TSC) | defined(BOOT_KB920X) +#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) unsigned short stat2; #endif unsigned update; @@ -394,7 +394,7 @@ update |= AT91C_EMAC_SPD; update |= AT91C_EMAC_FD; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) return ; ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/boot/arm/at91/libat91/emac.h#2 (text) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.5 2006/11/09 20:32:36 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.6 2007/07/13 14:27:05 imp Exp $ *****************************************************************************/ @@ -114,7 +114,7 @@ /* MII registers definition */ #define MII_STS_REG 0x01 #define MII_STS_LINK_STAT 0x04 -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) #define MII_STS2_REG 0x11 #define MII_STS2_LINK 0x400 #define MII_STS2_100TX 0x4000 ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $"); #include "opt_compat.h" @@ -100,6 +100,13 @@ SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode"); +static u_long ia32_maxdsiz = IA32_MAXDSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); +static u_long ia32_maxssiz = IA32_MAXSSIZ; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); +static u_long ia32_maxvmem = IA32_MAXVMEM; +SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); + struct sysentvec ia32_freebsd_sysvec = { FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, @@ -126,7 +133,8 @@ VM_PROT_ALL, ia32_copyout_strings, ia32_setregs, - ia32_fixlimit + ia32_fixlimit, + &ia32_maxssiz }; @@ -273,13 +281,6 @@ return ((register_t *)stack_base); } -static u_long ia32_maxdsiz = IA32_MAXDSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); -static u_long ia32_maxssiz = IA32_MAXSSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); -static u_long ia32_maxvmem = IA32_MAXVMEM; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); - static void ia32_fixlimit(struct rlimit *rl, int which) { ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1441 2007/07/05 15:33:13 gnn Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1446 2007/07/19 16:15:58 gallatin Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -176,10 +176,11 @@ # queue and no CPU affinity which makes it suboptimal for SMP. It has very # good interactivity and priority selection. # -# SCHED_ULE is a new scheduler that has been designed for SMP and has some -# advantages for UP as well. It is intended to replace the 4BSD scheduler -# over time. NOTE: SCHED_ULE is currently considered experimental and is -# not recommended for production use at this time. +# SCHED_ULE provides significant performance advantages over 4BSD on many +# workloads on SMP machines. It supports cpu-affinity, per-cpu runqueues +# and scheduler locks. It also has a stronger notion of interactivity +# which leads to better responsiveness even on uniprocessor machines. This +# will eventually become the default scheduler. # options SCHED_4BSD #options SCHED_ULE @@ -558,14 +559,6 @@ # faster.. if you are not debugging don't use. options SCTP_DEBUG # -# High speed enables sally floyds HS TCP optioin -# for congestion control increase, use only in -# very HS networks and with caution since I doubt -# it will compete fairly with peers. For the big-bad -# internet its best NOT to enable. -# -options SCTP_HIGH_SPEED -# # This option turns off the CRC32c checksum. Basically # You will not be able to talk to anyone else that # has not done this. Its more for expermentation to @@ -634,7 +627,7 @@ options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) -options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) @@ -899,6 +892,8 @@ # # ATM (HARP version) options # +# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE. +# # ATM_CORE includes the base ATM functionality code. This must be included # for ATM support. # @@ -917,14 +912,14 @@ # # The `harp' pseudo-driver makes all NATM interface drivers available to HARP. # -options ATM_CORE #core ATM protocol family -options ATM_IP #IP over ATM support -options ATM_SIGPVC #SIGPVC signalling manager -options ATM_SPANS #SPANS signalling manager -options ATM_UNI #UNI signalling manager +#options ATM_CORE #core ATM protocol family +#options ATM_IP #IP over ATM support +#options ATM_SIGPVC #SIGPVC signalling manager +#options ATM_SPANS #SPANS signalling manager +#options ATM_UNI #UNI signalling manager -device hfa #FORE PCA-200E ATM PCI -device harp #Pseudo-interface for NATM +#device hfa #FORE PCA-200E ATM PCI +#device harp #Pseudo-interface for NATM ##################################################################### @@ -1904,6 +1899,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device le # AMD Am7900 LANCE and Am79C9xx PCnet +device mxge # Myricom Myri-10G 10GbE NIC device nxge # Neterion Xframe 10GbE Server/Storage Adapter device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/soc2007/rdivacky/linux_epoll/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1234 2007/07/05 15:28:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1239 2007/07/19 16:15:58 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -103,13 +103,6 @@ cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ -coda/coda_fbsd.c optional vcoda -coda/coda_namecache.c optional vcoda -coda/coda_psdev.c optional vcoda -coda/coda_subr.c optional vcoda -coda/coda_venus.c optional vcoda -coda/coda_vfsops.c optional vcoda -coda/coda_vnops.c optional vcoda contrib/altq/altq/altq_cbq.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq @@ -666,28 +659,28 @@ dev/fxp/if_fxp.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci -dev/harp/if_harp.c optional harp pci +#dev/harp/if_harp.c optional harp pci dev/hatm/if_hatm.c optional hatm pci dev/hatm/if_hatm_intr.c optional hatm pci dev/hatm/if_hatm_ioctl.c optional hatm pci dev/hatm/if_hatm_rx.c optional hatm pci dev/hatm/if_hatm_tx.c optional hatm pci -dev/hfa/fore_buffer.c optional hfa -dev/hfa/fore_command.c optional hfa -dev/hfa/fore_globals.c optional hfa -dev/hfa/fore_if.c optional hfa -dev/hfa/fore_init.c optional hfa -dev/hfa/fore_intr.c optional hfa -dev/hfa/fore_output.c optional hfa -dev/hfa/fore_receive.c optional hfa -dev/hfa/fore_stats.c optional hfa -dev/hfa/fore_timer.c optional hfa -dev/hfa/fore_transmit.c optional hfa -dev/hfa/fore_vcm.c optional hfa -#dev/hfa/hfa_eisa.c optional hfa eisa -dev/hfa/hfa_freebsd.c optional hfa -dev/hfa/hfa_pci.c optional hfa pci -#dev/hfa/hfa_sbus.c optional hfa sbus +#dev/hfa/fore_buffer.c optional hfa +#dev/hfa/fore_command.c optional hfa +#dev/hfa/fore_globals.c optional hfa +#dev/hfa/fore_if.c optional hfa +#dev/hfa/fore_init.c optional hfa +#dev/hfa/fore_intr.c optional hfa +#dev/hfa/fore_output.c optional hfa +#dev/hfa/fore_receive.c optional hfa +#dev/hfa/fore_stats.c optional hfa +#dev/hfa/fore_timer.c optional hfa +#dev/hfa/fore_transmit.c optional hfa +#dev/hfa/fore_vcm.c optional hfa +##dev/hfa/hfa_eisa.c optional hfa eisa +#dev/hfa/hfa_freebsd.c optional hfa +#dev/hfa/hfa_pci.c optional hfa pci +##dev/hfa/hfa_sbus.c optional hfa sbus dev/hifn/hifn7751.c optional hifn dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci @@ -739,6 +732,16 @@ dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgbe/ixgbe.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_phy.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_api.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_common.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_82598.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard @@ -809,6 +812,10 @@ dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt dev/msk/if_msk.c optional msk +dev/mxge/if_mxge.c optional mxge pci +dev/mxge/mxge_lro.c optional mxge pci +dev/mxge/mxge_eth_z8e.c optional mxge pci +dev/mxge/mxge_ethp_z8e.c optional mxge pci dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard @@ -1148,6 +1155,13 @@ dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +fs/coda/coda_fbsd.c optional vcoda +fs/coda/coda_namecache.c optional vcoda +fs/coda/coda_psdev.c optional vcoda +fs/coda/coda_subr.c optional vcoda +fs/coda/coda_venus.c optional vcoda +fs/coda/coda_vfsops.c optional vcoda +fs/coda/coda_vnops.c optional vcoda fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard @@ -1620,7 +1634,7 @@ net/slcompress.c optional netgraph_vjc | ppp | sl | sppp | \ netgraph_sppp net/zlib.c optional crypto | geom_uzip | ipsec | \ - ppp_deflate | netgraph_deflate + mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl net80211/ieee80211_amrr.c optional wlan_amrr @@ -1650,88 +1664,92 @@ netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk -netatm/atm_aal5.c optional atm_core -netatm/atm_cm.c optional atm_core -netatm/atm_device.c optional atm_core -netatm/atm_if.c optional atm_core -netatm/atm_proto.c optional atm_core -netatm/atm_signal.c optional atm_core -netatm/atm_socket.c optional atm_core -netatm/atm_subr.c optional atm_core -netatm/atm_usrreq.c optional atm_core -netatm/ipatm/ipatm_event.c optional atm_ip atm_core -netatm/ipatm/ipatm_if.c optional atm_ip atm_core -netatm/ipatm/ipatm_input.c optional atm_ip atm_core -netatm/ipatm/ipatm_load.c optional atm_ip atm_core -netatm/ipatm/ipatm_output.c optional atm_ip atm_core -netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core -netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core -netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core -netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core -netatm/spans/spans_arp.c optional atm_spans atm_core \ - dependency "spans_xdr.h" -netatm/spans/spans_cls.c optional atm_spans atm_core -netatm/spans/spans_if.c optional atm_spans atm_core -netatm/spans/spans_kxdr.c optional atm_spans atm_core -netatm/spans/spans_msg.c optional atm_spans atm_core -netatm/spans/spans_print.c optional atm_spans atm_core -netatm/spans/spans_proto.c optional atm_spans atm_core -netatm/spans/spans_subr.c optional atm_spans atm_core -netatm/spans/spans_util.c optional atm_spans atm_core -spans_xdr.h optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \ - clean "spans_xdr.h" \ - no-obj no-implicit-rule -spans_xdr.c optional atm_spans atm_core \ - before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \ - clean "spans_xdr.c" \ - no-obj no-implicit-rule local -spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "${NORMAL_C}" \ - no-implicit-rule local -netatm/uni/q2110_sigaa.c optional atm_uni atm_core -netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core -netatm/uni/q2110_subr.c optional atm_uni atm_core -netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core -netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core -netatm/uni/qsaal1_subr.c optional atm_uni atm_core -netatm/uni/sscf_uni.c optional atm_uni atm_core -netatm/uni/sscf_uni_lower.c optional atm_uni atm_core -netatm/uni/sscf_uni_upper.c optional atm_uni atm_core -netatm/uni/sscop.c optional atm_uni atm_core -netatm/uni/sscop_lower.c optional atm_uni atm_core -netatm/uni/sscop_pdu.c optional atm_uni atm_core -netatm/uni/sscop_sigaa.c optional atm_uni atm_core -netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core -netatm/uni/sscop_subr.c optional atm_uni atm_core -netatm/uni/sscop_timer.c optional atm_uni atm_core -netatm/uni/sscop_upper.c optional atm_uni atm_core -netatm/uni/uni_load.c optional atm_uni atm_core -netatm/uni/uniarp.c optional atm_uni atm_core -netatm/uni/uniarp_cache.c optional atm_uni atm_core -netatm/uni/uniarp_input.c optional atm_uni atm_core -netatm/uni/uniarp_output.c optional atm_uni atm_core -netatm/uni/uniarp_timer.c optional atm_uni atm_core -netatm/uni/uniarp_vcm.c optional atm_uni atm_core -netatm/uni/uniip.c optional atm_uni atm_core -netatm/uni/unisig_decode.c optional atm_uni atm_core -netatm/uni/unisig_encode.c optional atm_uni atm_core -netatm/uni/unisig_if.c optional atm_uni atm_core -netatm/uni/unisig_mbuf.c optional atm_uni atm_core -netatm/uni/unisig_msg.c optional atm_uni atm_core -netatm/uni/unisig_print.c optional atm_uni atm_core -netatm/uni/unisig_proto.c optional atm_uni atm_core -netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core -netatm/uni/unisig_subr.c optional atm_uni atm_core -netatm/uni/unisig_util.c optional atm_uni atm_core -netatm/uni/unisig_vc_state.c optional atm_uni atm_core -netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif -netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif +# +# netatm has been disconnected from the build until it is MPSAFE, or +# alternatively, until it is removed. +# +#netatm/atm_aal5.c optional atm_core +#netatm/atm_cm.c optional atm_core +#netatm/atm_device.c optional atm_core +#netatm/atm_if.c optional atm_core +#netatm/atm_proto.c optional atm_core +#netatm/atm_signal.c optional atm_core +#netatm/atm_socket.c optional atm_core +#netatm/atm_subr.c optional atm_core >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 09:41:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BD3B16A46E; Fri, 20 Jul 2007 09:41:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 199AF16A41A for ; Fri, 20 Jul 2007 09:41:07 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E723213C442 for ; Fri, 20 Jul 2007 09:41:06 +0000 (UTC) (envelope-from gabor@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 l6K9f6wQ048311 for ; Fri, 20 Jul 2007 09:41:06 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K9f6ct048307 for perforce@freebsd.org; Fri, 20 Jul 2007 09:41:06 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jul 2007 09:41:06 GMT Message-Id: <200707200941.l6K9f6ct048307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 123776 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, 20 Jul 2007 09:41:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=123776 Change 123776 by gabor@gabor_server on 2007/07/20 09:40:24 - Fix typo Reported by: pav Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#34 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#34 (text+ko) ==== @@ -1094,7 +1094,7 @@ # .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) && \ - !defined(BEFOREPORTMK) && !defined(INOPRTIONSMK) + !defined(BEFOREPORTMK) && !defined(INOPTIONSMK) .include "${PORTSDIR}/Mk/bsd.destdir.mk" From owner-p4-projects@FreeBSD.ORG Fri Jul 20 09:41:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D54D16A54C; Fri, 20 Jul 2007 09:41:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61CB816A4BF for ; Fri, 20 Jul 2007 09:41:07 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A8F713C458 for ; Fri, 20 Jul 2007 09:41:07 +0000 (UTC) (envelope-from peter@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 l6K9f7PW048321 for ; Fri, 20 Jul 2007 09:41:07 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6K9f6w7048315 for perforce@freebsd.org; Fri, 20 Jul 2007 09:41:06 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 09:41:06 GMT Message-Id: <200707200941.l6K9f6w7048315@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 123777 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, 20 Jul 2007 09:41:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=123777 Change 123777 by peter@peter_overcee on 2007/07/20 09:40:44 Add the device ID for the nvidia MCP55 devices. They seem to work, even at gige speed. Affected files ... .. //depot/projects/hammer/sys/dev/nve/if_nve.c#21 edit .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#8 edit Differences ... ==== //depot/projects/hammer/sys/dev/nve/if_nve.c#21 (text+ko) ==== @@ -237,6 +237,8 @@ "NVIDIA nForce MCP12 Networking Adapter"}, {NVIDIA_VENDORID, NFORCE_MCPNET13_DEVICEID, "NVIDIA nForce MCP13 Networking Adapter"}, + {NVIDIA_VENDORID, NFORCE_MCPNET14_DEVICEID, + "NVIDIA nForce MCP14 Networking Adapter"}, {0, 0, NULL} }; ==== //depot/projects/hammer/sys/dev/nve/if_nvereg.h#8 (text+ko) ==== @@ -48,6 +48,7 @@ #define NFORCE_MCPNET11_DEVICEID 0x0038 #define NFORCE_MCPNET12_DEVICEID 0x0268 #define NFORCE_MCPNET13_DEVICEID 0x0269 +#define NFORCE_MCPNET14_DEVICEID 0x0373 #define NV_RID 0x10 From owner-p4-projects@FreeBSD.ORG Fri Jul 20 11:31:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F15FD16A41A; Fri, 20 Jul 2007 11:31:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C583716A418 for ; Fri, 20 Jul 2007 11:31:27 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B621013C45A for ; Fri, 20 Jul 2007 11:31:27 +0000 (UTC) (envelope-from dongmei@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 l6KBVR5A056775 for ; Fri, 20 Jul 2007 11:31:27 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KBVRhq056771 for perforce@freebsd.org; Fri, 20 Jul 2007 11:31:27 GMT (envelope-from dongmei@FreeBSD.org) Date: Fri, 20 Jul 2007 11:31:27 GMT Message-Id: <200707201131.l6KBVRhq056771@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 123780 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, 20 Jul 2007 11:31:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123780 Change 123780 by dongmei@dongmei2007 on 2007/07/20 11:30:26 Correctly get the display format for record list Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.c#4 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.c#5 edit .. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.h#5 edit Differences ... ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/list_view.c#4 (text+ko) ==== @@ -12,6 +12,7 @@ #include #include "compat_macros.h" #include "../tfile.h" +#include "tree_view.h" extern trailer_file cfile; static GtkWidget *window = NULL; @@ -38,10 +39,10 @@ /* create list store */ record_list = gtk_list_store_new (NUM_COLUMNS, G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_INT, - G_TYPE_INT, G_TYPE_INT); return GTK_TREE_MODEL (record_list); @@ -174,15 +175,26 @@ { GtkTreeIter iter; /* add data to the list store */ + gchar *s; + gchar *ms; + gchar *event; + sprint_event(&event,data->tt.hdr32.e_type,NULL); + sprint_sec32(&s, data->tt.hdr32.s, NULL); + sprint_msec32(&ms, data->tt.hdr32.ms,NULL); + gtk_list_store_append (record_list, &iter); + gtk_list_store_set (record_list, &iter, COLUMN_NUMBER, number, - COLUMN_CREATE_TIME,data->tt.hdr32.s, - COLUMN_MS,data->tt.hdr32.ms, - COLUMN_EVENT,data->tt.hdr32.e_type, + COLUMN_CREATE_TIME,s, + COLUMN_MS,ms, + COLUMN_EVENT,event, COLUMN_VERSION,data->tt.hdr32.version, COLUMN_RECORD_LEN,data->tt.hdr32.size, -1); + free(s); + free(ms); + free(event); } ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ /* * Prints a single byte in the given format. */ -static void +void sprint_1_byte(gchar **str, u_char val, const gchar *format,const gchar *label) { *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); @@ -57,7 +57,7 @@ /* * Prints a single byte in the default format. */ -static void +void sprint_1_byte_df(gchar **str, u_char val, const gchar *label) { *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); @@ -67,7 +67,7 @@ /* * Print 2 bytes in the given format. */ -static void +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); @@ -80,7 +80,7 @@ /* * Print 2 bytes in the default format. */ -static void +void sprint_2_bytes_df(gchar **str, u_int16_t val, const gchar *label) { *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); @@ -90,7 +90,7 @@ /* * Prints 4 bytes in the given format. */ -static void +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); @@ -103,7 +103,7 @@ /* * Prints 4 bytes in the defautl format. */ -static void +void sprint_4_bytes_df(gchar **str, u_int32_t val, const gchar *label) { *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); @@ -113,7 +113,7 @@ /* * Prints 8 bytes in the given format. */ -static void +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); @@ -127,7 +127,7 @@ /* * Prints 8 bytes in the default format. */ -static void +void sprint_8_bytes_df(gchar **str, u_int64_t val, const gchar *label) { *str=(gchar *)malloc(sizeof(label)+LEN_FOR_BYTES_MARGIN); @@ -137,7 +137,7 @@ /* * Prints the given size of data bytes in hex. */ -static void +void sprint_mem(gchar **str, u_char *data, size_t len,const gchar *label) { *str=(gchar *)malloc(len+sizeof(label)+1); @@ -155,7 +155,7 @@ /* * Prints the given size of arbitray data in give format. */ -static void +void sprint_arb_data(gchar **str, u_char *data, u_char count, size_t size,const gchar *format) { *str=(gchar *)malloc(count+1); @@ -184,7 +184,7 @@ /* * Prints the given data bytes as a string. */ -static void +void sprint_string(gchar **dstr, const char *sstr, size_t len, const gchar *label) { int i; @@ -203,7 +203,7 @@ /* * Prints seconds in the ctime format. */ -static void +void sprint_sec32(gchar **str, u_int32_t sec, const gchar *label) { time_t timestamp; @@ -212,14 +212,17 @@ timestamp = (time_t)sec; ctime_r(×tamp, timestr); timestr[24] = '\0'; /* No new line */ - g_sprintf(*str,"%s:%s",label,timestr); + if (label==NULL) + g_sprintf(*str,"%s",timestr); + else + 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 +void sprint_sec64(gchar **str, u_int64_t sec,const gchar *label) { time_t timestamp; @@ -234,30 +237,36 @@ /* * Prints the excess milliseconds. */ -static void +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); + if (label==NULL) + g_sprintf(*str,"+ %u msec",msec); + else + 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 +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); + if (label==NULL) + g_sprintf(*str,"+ %u msec",(u_int32_t)msec); + else + 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 +void sprint_ip_address(gchar **str, u_int32_t ip,const gchar *label) { struct in_addr ipaddr; @@ -269,7 +278,7 @@ /* * Prints a string value for the given ip address. */ -static void +void sprint_ip_ex_address(gchar **str, u_int32_t type, u_int32_t *ipaddr,const gchar *label) { struct in_addr ipv4; @@ -298,7 +307,7 @@ /* * Prints return value as success or failure. */ -static void +void sprint_retval(gchar **str, u_char status, const gchar *label) { *str=(gchar *)malloc(sizeof(label)+1+RETVAL_MAX_LEN); @@ -312,7 +321,7 @@ /* * Prints the exit value. */ -static void +void sprint_errval(gchar **str, u_int32_t val,const gchar *label) { *str=(gchar *)malloc(sizeof(label)+1+RETVAL_MAX_LEN); @@ -322,7 +331,7 @@ /* * Prints IPC type. */ -static void +void sprint_ipctype(gchar **str, u_char type, const gchar *label) { if (type == AT_IPC_MSG) @@ -339,7 +348,7 @@ * Prints the event from the header token in either the short, default or raw * form. */ -static void +void sprint_event(gchar **event_name, u_int16_t ev,const gchar *label) { char event_ent_name[AU_EVENT_NAME_MAX]; @@ -354,17 +363,23 @@ ep = getauevnum_r(&e, ev); if (ep == NULL) { - g_sprintf(*event_name, "%s:%u", label, ev); + if (label==NULL) + g_sprintf(*event_name,"%u",ev); + else + g_sprintf(*event_name, "%s:%u", label, ev); return; } - g_sprintf(*event_name, "%s:%s",label,e.ae_name); + if (label==NULL) + g_sprintf(*event_name,"%s",e.ae_name); + else + g_sprintf(*event_name, "%s:%s",label,e.ae_name); } #define ENTITY_NAME_MAX_LEN 100 /* * Prints a user value. */ -static void +void sprint_user(gchar **str, u_int32_t usr,const gchar *label) { *str=(gchar *)malloc(sizeof(label)+1+ENTITY_NAME_MAX_LEN); @@ -379,7 +394,7 @@ /* * Prints a group value. */ -static void +void sprint_group(gchar **str, u_int32_t grp,const gchar *label) { *str=(gchar *)malloc(sizeof(label)+1+ENTITY_NAME_MAX_LEN); ==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/tree_view.h#5 (text+ko) ==== @@ -14,3 +14,134 @@ create_tree(void); void parse_token_tree(record_data *rdata); void clear_tree_view_rows(void); +/* + * Prints a single byte in the given format. + */ +void +sprint_1_byte(gchar **str, u_char val, const gchar *format,const gchar *label); +/* + * Prints a single byte in the default format. + */ +void +sprint_1_byte_df(gchar **str, u_char val, const gchar *label); + +/* + * Print 2 bytes in the given format. + */ +void +sprint_2_bytes(gchar **str, u_int16_t val, const gchar *format,const gchar *label); +/* + * Print 2 bytes in the default format. + */ +void +sprint_2_bytes_df(gchar **str, u_int16_t val, const gchar *label); + +/* + * Prints 4 bytes in the given format. + */ +void +sprint_4_bytes(gchar **str, u_int32_t val, const gchar *format,const gchar *label); +/* + * Prints 4 bytes in the defautl format. + */ +void +sprint_4_bytes_df(gchar **str, u_int32_t val, const gchar *label); + +/* + * Prints 8 bytes in the given format. + */ +void +sprint_8_bytes(gchar **str, u_int64_t val, const gchar *format,const gchar *label); + +/* + * Prints 8 bytes in the default format. + */ +void +sprint_8_bytes_df(gchar **str, u_int64_t val, const gchar *label); + +/* + * Prints the given size of data bytes in hex. + */ +void +sprint_mem(gchar **str, u_char *data, size_t len,const gchar *label); +/* + * Prints the given size of arbitray data in give format. + */ +void +sprint_arb_data(gchar **str, u_char *data, u_char count, size_t size,const gchar *format); + +/* + * Prints the given data bytes as a string. + */ +void +sprint_string(gchar **dstr, const char *sstr, size_t len, const gchar *label); +/* + * Prints seconds in the ctime format. + */ +void +sprint_sec32(gchar **str, u_int32_t sec, const gchar *label); + +/* + * 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. + */ +void +sprint_sec64(gchar **str, u_int64_t sec,const gchar *label); + +/* + * Prints the excess milliseconds. + */ +void +sprint_msec32(gchar **str, u_int32_t msec, const gchar *label); + +/* + * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we assume + * a 32-bit msec, we simply truncate for now. + */ +void +sprint_msec64(gchar **str, u_int64_t msec, const gchar *label); +/* + * Prints a dotted form for the IP address. + */ +void +sprint_ip_address(gchar **str, u_int32_t ip,const gchar *label); +/* + * Prints a string value for the given ip address. + */ +void +sprint_ip_ex_address(gchar **str, u_int32_t type, u_int32_t *ipaddr,const gchar *label); +/* + * Prints return value as success or failure. + */ +void +sprint_retval(gchar **str, u_char status, const gchar *label); + +/* + * Prints the exit value. + */ +void +sprint_errval(gchar **str, u_int32_t val,const gchar *label); + +/* + * Prints IPC type. + */ +void +sprint_ipctype(gchar **str, u_char type, const gchar *label); + +/* + * Prints the event from the header token in either the short, default or raw + * form. + */ +void +sprint_event(gchar **event_name, u_int16_t ev,const gchar *label); +/* + * Prints a user value. + */ +void +sprint_user(gchar **str, u_int32_t usr,const gchar *label); +/* + * Prints a group value. + */ +void +sprint_group(gchar **str, u_int32_t grp,const gchar *label); + From owner-p4-projects@FreeBSD.ORG Fri Jul 20 12:35:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42D8816A41B; Fri, 20 Jul 2007 12:35:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 147C916A41A for ; Fri, 20 Jul 2007 12:35:27 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from merke.itea.ntnu.no (merke.itea.ntnu.no [129.241.7.61]) by mx1.freebsd.org (Postfix) with ESMTP id 96ABD13C48E for ; Fri, 20 Jul 2007 12:35:26 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by merke.itea.ntnu.no (Postfix) with ESMTP id 3F27913D465; Fri, 20 Jul 2007 14:35:25 +0200 (CEST) Received: from twoflower.idi.ntnu.no (twoflower.idi.ntnu.no [129.241.104.169]) by merke.itea.ntnu.no (Postfix) with ESMTP; Fri, 20 Jul 2007 14:35:24 +0200 (CEST) Received: by twoflower.idi.ntnu.no (Postfix, from userid 1002) id 42D7617011; Fri, 20 Jul 2007 14:35:24 +0200 (CEST) Date: Fri, 20 Jul 2007 14:35:24 +0200 From: Ulf Lilleengen To: Eric Anderson Message-ID: <20070720123524.GA71360@twoflower.idi.ntnu.no> References: <200707172109.l6HL9PMJ078780@repoman.freebsd.org> <46A03390.3030602@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46A03390.3030602@freebsd.org> User-Agent: Mutt/1.5.15 (2007-04-06) X-Content-Scanned: with sophos and spamassassin at mailgw.ntnu.no. Cc: perforce@freebsd.org Subject: Re: PERFORCE change 123662 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, 20 Jul 2007 12:35:27 -0000 On tor, jul 19, 2007 at 11:01:20pm -0500, Eric Anderson wrote: > On 07/17/07 16:09, Ulf Lilleengen wrote: > > http://perforce.freebsd.org/chv.cgi?CH=123662 > > Change 123662 by lulf@lulf_carrot on 2007/07/17 21:08:43 > > - Initial implementation of growing RAID-5 arrays. This is done by > > splitting the offset calculation into one for read and one for write > > operations. We make a distinction of subdisks that were added after > > the plex is not newborn any longer and subdisks that were added at > > creation/tasting time. When a BIO write comes, the write will go to > > the whole plex, but read operations will only be done on subdisks that > > do not have the GV_SD_GROW flag set. The bad thing with this is that > > we must ensure that new subdisks are added to a later plexoffset > > (which we should force, to make it easier for us, since there is not a > > good reason why the user should be able to set the plexoffset in this > > operation). The implementation will probably change a bit. > > - Add another state called RESIZING, and a flag called GV_PLEX_GROWING > > to indicate that a plex is in growing operation. > > - Make sure obvious parts of the code respects this flag. Will need to > > look over this more though. > > > > Hi - > > So far, I'm very excited about your gvinum work - great work so far! > > I'm curious how you are growing a RAID5. Can you describe this method a bit > more? Where did you see how to do this? > > Hi, Well, what I do is to attach/create the new subdisk as usual, but since it's a RAID-5 array that I know is operational, I give the subdisk a flag, and sets the plex in a resize state. Then, In the raid-5 code, I modify gv_raid5_offset (which basically computes offsets within a subdisk based on the number of subdisks and stripesize). However, what I do, is that instead of taking all subdisks in the calculation, I only take those who does not have the GROW flag (when reading), and I take all subdisks into calculation when it's a write. This means, that if a create a gv_grow_plex function that reads (stripesize x sdcount) bytes (from the subdisks that do not have the GROW flag), and writes that data to the plex (including all subdisks). This way, i sort of overwrite the old data, but the data is spread out over the new subdisks. I'm sorry if this might seem a bit complex, but just ask more questions if you didn't understand. Actually, I didn't read this anywhere.. I sort of thought this out myself :P -- Ulf Lilleengen From owner-p4-projects@FreeBSD.ORG Fri Jul 20 13:05:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1999E16A469; Fri, 20 Jul 2007 13:05:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA5BE16A41F for ; Fri, 20 Jul 2007 13:05:45 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id 823B313C491 for ; Fri, 20 Jul 2007 13:05:43 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A562D6.dip.t-dialin.net [84.165.98.214]) by redbull.bpaserver.net (Postfix) with ESMTP id 93ADD2E0D9; Fri, 20 Jul 2007 15:05:36 +0200 (CEST) Received: from deskjail (deskjail.Leidinger.net [192.168.1.109]) by outgoing.leidinger.net (Postfix) with ESMTP id 9B7835B5B7F; Fri, 20 Jul 2007 15:03:24 +0200 (CEST) Date: Fri, 20 Jul 2007 15:07:16 +0200 From: Alexander Leidinger To: Ulf Lilleengen Message-ID: <20070720150716.77d2636a@deskjail> In-Reply-To: <20070720123524.GA71360@twoflower.idi.ntnu.no> References: <200707172109.l6HL9PMJ078780@repoman.freebsd.org> <46A03390.3030602@freebsd.org> <20070720123524.GA71360@twoflower.idi.ntnu.no> X-Mailer: Claws Mail 2.9.2 (GTK+ 2.10.13; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.9, required 8, BAYES_00 -15.00, DKIM_POLICY_SIGNSOME 0.00, RDNS_DYNAMIC 0.10) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: perforce@freebsd.org, Eric Anderson Subject: Re: PERFORCE change 123662 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, 20 Jul 2007 13:05:46 -0000 Quoting Ulf Lilleengen (Fri, 20 Jul 2007 14:35:24 +0200): [growing RAID-5] > Well, what I do is to attach/create the new subdisk as usual, but since it's a > RAID-5 array that I know is operational, I give the subdisk a flag, and sets the > plex in a resize state. Then, In the raid-5 code, I modify gv_raid5_offset > (which basically computes offsets within a subdisk based on the number of > subdisks and stripesize). However, what I do, is that instead of taking all > subdisks in the calculation, I only take those who does not have the GROW flag > (when reading), and I take all subdisks into calculation when it's a write. > > This means, that if a create a gv_grow_plex function that reads (stripesize x > sdcount) bytes (from the subdisks that do not have the GROW flag), and writes > that data to the plex (including all subdisks). This way, i sort of overwrite > the old data, but the data is spread out over the new subdisks. I'm sorry if > this might seem a bit complex, but just ask more questions if you didn't > understand. Do you use the additional drive(s) only to write checksums to them, or do you write real data to it? If the later, how do you make sure you read the right data in case you read data again, which was just written there a moment before (how do you know to read from all subdisks and not only from a subset in this case)? Bye, Alexander. -- TONY RANDALL! Is YOUR life a PATIO of FUN?? http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Fri Jul 20 14:01:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BC1116A41F; Fri, 20 Jul 2007 14:01:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19B6116A41A for ; Fri, 20 Jul 2007 14:01:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08D4E13C48D for ; Fri, 20 Jul 2007 14:01:44 +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 l6KE1hhF076872 for ; Fri, 20 Jul 2007 14:01:43 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 l6KE1gPa076868 for perforce@freebsd.org; Fri, 20 Jul 2007 14:01:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 14:01:42 GMT Message-Id: <200707201401.l6KE1gPa076868@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 123793 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, 20 Jul 2007 14:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=123793 Change 123793 by rwatson@rwatson_zoo on 2007/07/20 14:00:51 Integrate OpenBSM 1.0 alpha 15 changes from OpenBSM branch into audit3 branch to prepare for CVS merge of OpenBSM 1.0 alpha 15. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#20 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#20 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#14 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#30 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#18 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#24 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#26 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#20 (text+ko) ==== @@ -1,3 +1,14 @@ +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. +- 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 - Fix endian issues when processing IPv6 addresses for extended subject @@ -284,4 +295,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#19 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#20 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#20 (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/audit3/contrib/openbsm/README#19 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#20 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#18 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_14 +OPENBSM_1_0_ALPHA_15 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#7 (text+ko) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" -.\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" @APPLE_BSD_LICENSE_HEADER_END@ -.\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#6 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#7 $ .\" .Dd October 2, 2006 .Dt AUDIT 8 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#10 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#10 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#7 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#7 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#8 (text+ko) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" -.\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" @APPLE_BSD_LICENSE_HEADER_END@ -.\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#7 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#8 $ .\" .Dd October 2, 2006 .Dt AUDITD 8 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#20 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#19 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#20 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#7 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#7 $ */ #ifndef _AUDITD_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#11 (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/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#11 $ */ /* @@ -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); */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#30 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#29 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#30 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -48,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 @@ -61,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 @@ -160,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. */ @@ -183,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 @@ -197,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. */ @@ -235,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. */ @@ -266,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 @@ -285,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 @@ -347,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 @@ -355,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 @@ -366,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 @@ -496,6 +537,16 @@ #define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ #define AUE_MLOCKALL 43141 /* FreeBSD. */ #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/audit3/contrib/openbsm/bsm/audit_record.h#18 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#18 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#18 (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'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#19 (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/audit3/contrib/openbsm/configure.ac#18 $]) +AC_INIT([OpenBSM], [1.0alpha15], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#19 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#20 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#21 $ # $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.6 2006/09/25 11:53:06 rwatson Exp $ # 0:AUE_NULL:indir system call:no @@ -141,8 +141,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 @@ -166,19 +171,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 @@ -202,7 +207,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 @@ -231,12 +236,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 @@ -293,7 +329,7 @@ 352:AUE_DARWIN_AUDITCTL:auditctl(2):ad 353:AUE_DARWIN_RFORK:rfork(2):pc 354:AUE_DARWIN_LCHMOD:lchmod(2):fm -355:AUE_DARWIN_SWAPOFF:swapoff():ad +355:AUE_DARWIN_SWAPOFF:swapoff(2):ad 356:AUE_DARWIN_INITPROCESS:init_process():pc 357:AUE_DARWIN_MAPFD:map_fd():fa 358:AUE_DARWIN_TASKFORPID:task_for_pid():pc @@ -310,7 +346,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 @@ -320,7 +356,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 @@ -347,13 +383,13 @@ 43042:AUE_AUDITCTL:auditctl(2):ad 43043:AUE_RFORK:rfork(2):pc 43044:AUE_LCHMOD:lchmod(2):fm -43045:AUE_SWAPOFF:swapoff():ad +43045:AUE_SWAPOFF:swapoff(2):ad 43046:AUE_INITPROCESS:init_process():pc 43047:AUE_MAPFD:map_fd():fa 43048:AUE_TASKFORPID:task_for_pid():pc 43049:AUE_PIDFORTASK:pid_for_task():pc 43050:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot -43051:AUE_COPYFILE:copyfile():fr,fw +43051:AUE_COPYFILE:copyfile(2):fr,fw 43052:AUE_LUTIMES:lutimes(2):fm 43053:AUE_LCHFLAGS:lchflags(2):fm 43054:AUE_SENDFILE:sendfile(2):nt @@ -445,6 +481,16 @@ 43140:AUE_LISTEN:listen(2):nt 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 +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. # ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#9 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#10 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -77,7 +77,7 @@ section for more information. .Pp The -.Fn sendac +.Fn endac function closes the .Xr audit_control 5 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#7 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#8 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -131,7 +131,7 @@ .Fn getauevnum , .Fn getauevnum_r , and -.Fn getauevnuam +.Fn getauevnonam will return a reference to a .Vt "struct au_event_ent" or ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#6 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#5 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/audit_submit.3#6 $ .\" .Dd May 29, 2006 .Dt audit_submit 3 @@ -54,7 +54,7 @@ .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token is dependant on the +The return token is dependent on the .Fa status and .Fa reterr ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#24 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#23 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#24 $ */ #include @@ -1306,6 +1306,7 @@ print_delim(fp, del); print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); + print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#25 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#26 $ */ #include @@ -411,7 +411,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); + ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t)); return (t); } From owner-p4-projects@FreeBSD.ORG Fri Jul 20 14:02:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2BE16A41A; Fri, 20 Jul 2007 14:02:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 524AE16A417 for ; Fri, 20 Jul 2007 14:02:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B39A13C469 for ; Fri, 20 Jul 2007 14:02:46 +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 l6KE2k3H076950 for ; Fri, 20 Jul 2007 14:02:46 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 l6KE2kKo076947 for perforce@freebsd.org; Fri, 20 Jul 2007 14:02:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 14:02:46 GMT Message-Id: <200707201402.l6KE2kKo076947@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 123794 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, 20 Jul 2007 14:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=123794 Change 123794 by rwatson@rwatson_zoo on 2007/07/20 14:02:16 Remove OpenBSM files that will not be imported into the src/contrib tree in CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#21 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#15 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#31 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#19 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jul 20 14:04:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03E5116A41F; Fri, 20 Jul 2007 14:04:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C295D16A419 for ; Fri, 20 Jul 2007 14:04:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B218A13C45A for ; Fri, 20 Jul 2007 14:04:49 +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 l6KE4nMG078244 for ; Fri, 20 Jul 2007 14:04:49 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 l6KE4n73078241 for perforce@freebsd.org; Fri, 20 Jul 2007 14:04:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 14:04:49 GMT Message-Id: <200707201404.l6KE4n73078241@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 123796 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, 20 Jul 2007 14:04:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123796 Change 123796 by rwatson@rwatson_zoo on 2007/07/20 14:04:16 Integrate further OpenBSM 1.0 alpha 15 changes into audit3 kernel. Some were already hand-merged or previously merged here. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#38 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#26 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#37 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#38 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#37 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#38 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.8 2007/04/17 12:27:08 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18 (text+ko) ==== @@ -6,8 +6,6 @@ * This code was developed in part by Robert N. M. Watson, Senior Principal * Scientist, SPARTA, Inc. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -32,9 +30,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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#18 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.7 2007/04/17 12:27:08 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#33 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.11 2007/04/17 12:27:08 rwatson Exp $ */ @@ -49,11 +45,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 @@ -62,7 +59,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 @@ -161,7 +158,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. */ @@ -184,9 +181,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 @@ -198,28 +200,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. */ @@ -236,26 +240,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. */ @@ -267,11 +272,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 @@ -286,30 +322,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 @@ -348,6 +384,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 @@ -356,7 +397,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 @@ -367,7 +408,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 @@ -497,6 +538,16 @@ #define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ #define AUE_MLOCKALL 43141 /* FreeBSD. */ #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/audit3/sys/bsm/audit_record.h#26 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +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. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#25 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#26 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.9 2007/04/17 12:27:08 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#37 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jul 20 16:11:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AC3016A420; Fri, 20 Jul 2007 16:11:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D834516A418 for ; Fri, 20 Jul 2007 16:11:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C640113C483 for ; Fri, 20 Jul 2007 16:11:32 +0000 (UTC) (envelope-from rpaulo@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 l6KGBWct087776 for ; Fri, 20 Jul 2007 16:11:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KGBVfm087773 for perforce@freebsd.org; Fri, 20 Jul 2007 16:11:31 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 20 Jul 2007 16:11:31 GMT Message-Id: <200707201611.l6KGBVfm087773@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 123802 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, 20 Jul 2007 16:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=123802 Change 123802 by rpaulo@rpaulo_epsilon on 2007/07/20 16:11:03 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#14 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#19 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.dat.gz.uu#5 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.dat.gz.uu#5 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mutex.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sig.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_switch.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/tty.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/icmp_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_icmp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_output.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/xform_ipip.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/mutex.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/rwlock.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#7 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1444 2007/07/14 21:49:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1446 2007/07/19 16:15:58 gallatin Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -176,10 +176,11 @@ # queue and no CPU affinity which makes it suboptimal for SMP. It has very # good interactivity and priority selection. # -# SCHED_ULE is a new scheduler that has been designed for SMP and has some -# advantages for UP as well. It is intended to replace the 4BSD scheduler -# over time. NOTE: SCHED_ULE is currently considered experimental and is -# not recommended for production use at this time. +# SCHED_ULE provides significant performance advantages over 4BSD on many +# workloads on SMP machines. It supports cpu-affinity, per-cpu runqueues +# and scheduler locks. It also has a stronger notion of interactivity +# which leads to better responsiveness even on uniprocessor machines. This +# will eventually become the default scheduler. # options SCHED_4BSD #options SCHED_ULE @@ -1898,6 +1899,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device le # AMD Am7900 LANCE and Am79C9xx PCnet +device mxge # Myricom Myri-10G 10GbE NIC device nxge # Neterion Xframe 10GbE Server/Storage Adapter device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/soc2007/rpaulo-macbook/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1239 2007/07/19 16:15:58 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -812,6 +812,10 @@ dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt dev/msk/if_msk.c optional msk +dev/mxge/if_mxge.c optional mxge pci +dev/mxge/mxge_lro.c optional mxge pci +dev/mxge/mxge_eth_z8e.c optional mxge pci +dev/mxge/mxge_ethp_z8e.c optional mxge pci dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard @@ -1631,7 +1635,7 @@ net/slcompress.c optional netgraph_vjc | ppp | sl | sppp | \ netgraph_sppp net/zlib.c optional crypto | geom_uzip | ipsec | \ - ppp_deflate | netgraph_deflate + mxge | ppp_deflate | netgraph_deflate net80211/ieee80211.c optional wlan net80211/ieee80211_acl.c optional wlan_acl net80211/ieee80211_amrr.c optional wlan_amrr ==== //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.99 2007/07/15 13:00:29 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.100 2007/07/20 03:42:57 simokawa Exp $ * */ @@ -360,7 +360,7 @@ STAILQ_INIT(&xfer_timeout); s = splfw(); - FW_GLOCK(fc); + mtx_lock(&fc->tlabel_lock); for (i = 0; i < 0x40; i ++) { while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { if ((xfer->flag & FWXF_SENT) == 0) @@ -378,7 +378,7 @@ STAILQ_INSERT_TAIL(&xfer_timeout, xfer, tlabel); } } - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); fc->timeout(fc); @@ -430,6 +430,7 @@ fwdev_makedev(sc); mtx_init(&fc->wait_lock, "fwwait", NULL, MTX_DEF); + mtx_init(&fc->tlabel_lock, "fwtlabel", NULL, MTX_DEF); CALLOUT_INIT(&fc->timeout_callout); CALLOUT_INIT(&fc->bmr_callout); CALLOUT_INIT(&fc->busprobe_callout); @@ -527,6 +528,7 @@ free(fc->speed_map, M_FW); free(fc->crom_src_buf, M_FW); + mtx_destroy(&fc->tlabel_lock); mtx_destroy(&fc->wait_lock); return(0); } @@ -569,7 +571,9 @@ fw_xferq_drain(fc->ats); for(i = 0; i < fc->nisodma; i++) fw_xferq_drain(fc->it[i]); + FW_GUNLOCK(fc); + mtx_lock(&fc->tlabel_lock); for (i = 0; i < 0x40; i ++) while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { if (firewire_debug) @@ -578,7 +582,7 @@ STAILQ_REMOVE_HEAD(&fc->tlabels[i], tlabel); STAILQ_INSERT_TAIL(&xfer_drain, xfer, tlabel); } - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); STAILQ_FOREACH_SAFE(xfer, &xfer_drain, tlabel, txfer) xfer->hand(xfer); @@ -1011,7 +1015,7 @@ return; s = splfw(); - FW_GLOCK(fc); + mtx_lock(&fc->tlabel_lock); #if 1 /* make sure the label is allocated */ STAILQ_FOREACH(txfer, &fc->tlabels[xfer->tl], tlabel) if(txfer == xfer) @@ -1023,14 +1027,14 @@ fw_dump_hdr(&xfer->send.hdr, "send"); fw_dump_hdr(&xfer->recv.hdr, "recv"); kdb_backtrace(); - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); return; } #endif STAILQ_REMOVE(&fc->tlabels[xfer->tl], xfer, fw_xfer, tlabel); - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); return; } @@ -1045,10 +1049,10 @@ int s = splfw(); int req; - FW_GLOCK(fc); + mtx_lock(&fc->tlabel_lock); STAILQ_FOREACH(xfer, &fc->tlabels[tlabel], tlabel) if(xfer->send.hdr.mode.hdr.dst == node) { - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); KASSERT(xfer->tl == tlabel, ("xfer->tl 0x%x != 0x%x", xfer->tl, tlabel)); @@ -1065,7 +1069,7 @@ printf("fw_tl2xfer: found tl=%d\n", tlabel); return(xfer); } - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); if (firewire_debug > 1) printf("fw_tl2xfer: not found tl=%d\n", tlabel); splx(s); @@ -1717,7 +1721,7 @@ dst = xfer->send.hdr.mode.hdr.dst & 0x3f; s = splfw(); - FW_GLOCK(fc); + mtx_lock(&fc->tlabel_lock); new_tlabel = (fc->last_tlabel[dst] + 1) & 0x3f; STAILQ_FOREACH(txfer, &fc->tlabels[new_tlabel], tlabel) if ((txfer->send.hdr.mode.hdr.dst & 0x3f) == dst) @@ -1725,7 +1729,7 @@ if(txfer == NULL) { fc->last_tlabel[dst] = new_tlabel; STAILQ_INSERT_TAIL(&fc->tlabels[new_tlabel], xfer, tlabel); - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); xfer->tl = new_tlabel; xfer->send.hdr.mode.hdr.tlrt = new_tlabel << 2; @@ -1733,7 +1737,7 @@ printf("fw_get_tlabel: dst=%d tl=%d\n", dst, new_tlabel); return (new_tlabel); } - FW_GUNLOCK(fc); + mtx_unlock(&fc->tlabel_lock); splx(s); if (firewire_debug > 1) ==== //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewirereg.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.49 2007/07/15 13:00:29 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.50 2007/07/20 03:42:57 simokawa Exp $ * */ @@ -134,6 +134,7 @@ *arq, *atq, *ars, *ats, *it[FW_MAX_DMACH],*ir[FW_MAX_DMACH]; struct fw_xferlist tlabels[0x40]; u_char last_tlabel[0x40]; + struct mtx tlabel_lock; STAILQ_HEAD(, fw_bind) binds; STAILQ_HEAD(, fw_device) devices; u_int sid_cnt; ==== //depot/projects/soc2007/rpaulo-macbook/dev/msk/if_msk.c#4 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.17 2007/06/11 02:00:50 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.18 2007/07/20 00:25:20 yongari Exp $"); #include #include @@ -154,6 +154,8 @@ /* Tunables. */ static int msi_disable = 0; TUNABLE_INT("hw.msk.msi_disable", &msi_disable); +static int legacy_intr = 0; +TUNABLE_INT("hw.msk.legacy_intr", &legacy_intr); #define MSK_CSUM_FEATURES (CSUM_TCP | CSUM_UDP) @@ -229,6 +231,7 @@ static int msk_detach(device_t); static void msk_tick(void *); +static void msk_legacy_intr(void *); static int msk_intr(void *); static void msk_int_task(void *, int); static void msk_intr_phy(struct msk_if_softc *); @@ -1709,6 +1712,8 @@ * port cards with separate MSI messages, so for now I disable MSI * on dual port cards. */ + if (legacy_intr != 0) + msi_disable = 1; if (msic == 2 && msi_disable == 0 && sc->msk_num_port == 1 && pci_alloc_msi(dev, &msic) == 0) { if (msic == 2) { @@ -1778,18 +1783,25 @@ goto fail; } - TASK_INIT(&sc->msk_int_task, 0, msk_int_task, sc); - sc->msk_tq = taskqueue_create_fast("msk_taskq", M_WAITOK, - taskqueue_thread_enqueue, &sc->msk_tq); - taskqueue_start_threads(&sc->msk_tq, 1, PI_NET, "%s taskq", - device_get_nameunit(sc->msk_dev)); /* Hook interrupt last to avoid having to lock softc. */ - error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET | - INTR_MPSAFE, msk_intr, NULL, sc, &sc->msk_intrhand[0]); + if (legacy_intr) + error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET | + INTR_MPSAFE, NULL, msk_legacy_intr, sc, + &sc->msk_intrhand[0]); + else { + TASK_INIT(&sc->msk_int_task, 0, msk_int_task, sc); + sc->msk_tq = taskqueue_create_fast("msk_taskq", M_WAITOK, + taskqueue_thread_enqueue, &sc->msk_tq); + taskqueue_start_threads(&sc->msk_tq, 1, PI_NET, "%s taskq", + device_get_nameunit(sc->msk_dev)); + error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET | + INTR_MPSAFE, msk_intr, NULL, sc, &sc->msk_intrhand[0]); + } if (error != 0) { device_printf(dev, "couldn't set up interrupt handler\n"); - taskqueue_free(sc->msk_tq); + if (legacy_intr == 0) + taskqueue_free(sc->msk_tq); sc->msk_tq = NULL; goto fail; } @@ -1892,7 +1904,7 @@ msk_status_dma_free(sc); - if (sc->msk_tq != NULL) { + if (legacy_intr == 0 && sc->msk_tq != NULL) { taskqueue_drain(sc->msk_tq, &sc->msk_int_task); taskqueue_free(sc->msk_tq); sc->msk_tq = NULL; @@ -3503,6 +3515,75 @@ return (sc->msk_stat_cons != CSR_READ_2(sc, STAT_PUT_IDX)); } +/* Legacy interrupt handler for shared interrupt. */ +static void +msk_legacy_intr(void *xsc) +{ + struct msk_softc *sc; + struct msk_if_softc *sc_if0, *sc_if1; + struct ifnet *ifp0, *ifp1; + uint32_t status; + + sc = xsc; + MSK_LOCK(sc); + + /* Reading B0_Y2_SP_ISRC2 masks further interrupts. */ + status = CSR_READ_4(sc, B0_Y2_SP_ISRC2); + if (status == 0 || status == 0xffffffff || sc->msk_suspended != 0 || + (status & sc->msk_intrmask) == 0) { + CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2); + return; + } + + sc_if0 = sc->msk_if[MSK_PORT_A]; + sc_if1 = sc->msk_if[MSK_PORT_B]; + ifp0 = ifp1 = NULL; + if (sc_if0 != NULL) + ifp0 = sc_if0->msk_ifp; + if (sc_if1 != NULL) + ifp1 = sc_if1->msk_ifp; + + if ((status & Y2_IS_IRQ_PHY1) != 0 && sc_if0 != NULL) + msk_intr_phy(sc_if0); + if ((status & Y2_IS_IRQ_PHY2) != 0 && sc_if1 != NULL) + msk_intr_phy(sc_if1); + if ((status & Y2_IS_IRQ_MAC1) != 0 && sc_if0 != NULL) + msk_intr_gmac(sc_if0); + if ((status & Y2_IS_IRQ_MAC2) != 0 && sc_if1 != NULL) + msk_intr_gmac(sc_if1); + if ((status & (Y2_IS_CHK_RX1 | Y2_IS_CHK_RX2)) != 0) { + device_printf(sc->msk_dev, "Rx descriptor error\n"); + sc->msk_intrmask &= ~(Y2_IS_CHK_RX1 | Y2_IS_CHK_RX2); + CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask); + CSR_READ_4(sc, B0_IMSK); + } + if ((status & (Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXA2)) != 0) { + device_printf(sc->msk_dev, "Tx descriptor error\n"); + sc->msk_intrmask &= ~(Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXA2); + CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask); + CSR_READ_4(sc, B0_IMSK); + } + if ((status & Y2_IS_HW_ERR) != 0) + msk_intr_hwerr(sc); + + while (msk_handle_events(sc) != 0) + ; + if ((status & Y2_IS_STAT_BMU) != 0) + CSR_WRITE_4(sc, STAT_CTRL, SC_STAT_CLR_IRQ); + + /* Reenable interrupts. */ + CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2); + + if (ifp0 != NULL && (ifp0->if_drv_flags & IFF_DRV_RUNNING) != 0 && + !IFQ_DRV_IS_EMPTY(&ifp0->if_snd)) + taskqueue_enqueue(taskqueue_fast, &sc_if0->msk_tx_task); + if (ifp1 != NULL && (ifp1->if_drv_flags & IFF_DRV_RUNNING) != 0 && + !IFQ_DRV_IS_EMPTY(&ifp1->if_snd)) + taskqueue_enqueue(taskqueue_fast, &sc_if1->msk_tx_task); + + MSK_UNLOCK(sc); +} + static int msk_intr(void *xsc) { ==== //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.39 2007/07/12 16:04:54 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.40 2007/07/19 16:15:59 gallatin Exp $"); #include #include @@ -124,6 +124,7 @@ /* Declare ourselves to be a child of the PCI bus.*/ DRIVER_MODULE(mxge, pci, mxge_driver, mxge_devclass, 0, 0); MODULE_DEPEND(mxge, firmware, 1, 1, 1); +MODULE_DEPEND(mxge, zlib, 1, 1, 1); static int mxge_load_firmware(mxge_softc_t *sc); static int mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data); @@ -145,6 +146,7 @@ static void mxge_enable_wc(mxge_softc_t *sc) { +#if defined(__i386) || defined(__amd64) struct mem_range_desc mrdesc; vm_paddr_t pa; vm_offset_t len; @@ -152,7 +154,6 @@ sc->wc = 1; len = rman_get_size(sc->mem_res); -#if defined(__i386) || defined(__amd64) err = pmap_change_attr((vm_offset_t) sc->sram, len, PAT_WRITE_COMBINING); if (err == 0) @@ -160,7 +161,6 @@ else device_printf(sc->dev, "pmap_change_attr failed, %d\n", err); -#endif pa = rman_get_start(sc->mem_res); mrdesc.mr_base = pa; mrdesc.mr_len = len; @@ -174,6 +174,7 @@ "w/c failed for pa 0x%lx, len 0x%lx, err = %d\n", (unsigned long)pa, (unsigned long)len, err); } +#endif } @@ -423,7 +424,7 @@ } #else static void -mxge_enable_nvidia_ecrc(mxge_softc_t *sc, device_t pdev) +mxge_enable_nvidia_ecrc(mxge_softc_t *sc) { device_printf(sc->dev, "Nforce 4 chipset on non-x86/amd64!?!?!\n"); @@ -644,62 +645,101 @@ } +static void * +z_alloc(void *nil, u_int items, u_int size) +{ + void *ptr; + + ptr = malloc(items * size, M_TEMP, M_NOWAIT); + return ptr; +} + +static void +z_free(void *nil, void *ptr) +{ + free(ptr, M_TEMP); +} + + static int mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t *limit) { + z_stream zs; + char *inflate_buffer; const struct firmware *fw; const mcp_gen_header_t *hdr; unsigned hdr_offset; - const char *fw_data; - union qualhack hack; int status; unsigned int i; char dummy; - + size_t fw_len; fw = firmware_get(sc->fw_name); - if (fw == NULL) { device_printf(sc->dev, "Could not find firmware image %s\n", sc->fw_name); return ENOENT; } - if (fw->datasize > *limit || - fw->datasize < MCP_HEADER_PTR_OFFSET + 4) { - device_printf(sc->dev, "Firmware image %s too large (%d/%d)\n", - sc->fw_name, (int)fw->datasize, (int) *limit); - status = ENOSPC; + + + + /* setup zlib and decompress f/w */ + bzero(&zs, sizeof (zs)); + zs.zalloc = z_alloc; + zs.zfree = z_free; + status = inflateInit(&zs); + if (status != Z_OK) { + status = EIO; goto abort_with_fw; } - *limit = fw->datasize; + + /* the uncompressed size is stored as the firmware version, + which would otherwise go unused */ + fw_len = (size_t) fw->version; + inflate_buffer = malloc(fw_len, M_TEMP, M_NOWAIT); + if (inflate_buffer == NULL) + goto abort_with_zs; + zs.avail_in = fw->datasize; + zs.next_in = __DECONST(char *, fw->data); + zs.avail_out = fw_len; + zs.next_out = inflate_buffer; + status = inflate(&zs, Z_FINISH); + if (status != Z_STREAM_END) { + device_printf(sc->dev, "zlib %d\n", status); + status = EIO; + goto abort_with_buffer; + } /* check id */ - fw_data = (const char *)fw->data; hdr_offset = htobe32(*(const uint32_t *) - (fw_data + MCP_HEADER_PTR_OFFSET)); - if ((hdr_offset & 3) || hdr_offset + sizeof(*hdr) > fw->datasize) { + (inflate_buffer + MCP_HEADER_PTR_OFFSET)); + if ((hdr_offset & 3) || hdr_offset + sizeof(*hdr) > fw_len) { device_printf(sc->dev, "Bad firmware file"); status = EIO; - goto abort_with_fw; + goto abort_with_buffer; } - hdr = (const void*)(fw_data + hdr_offset); + hdr = (const void*)(inflate_buffer + hdr_offset); status = mxge_validate_firmware(sc, hdr); if (status != 0) - goto abort_with_fw; + goto abort_with_buffer; - hack.ro_char = fw_data; /* Copy the inflated firmware to NIC SRAM. */ - for (i = 0; i < *limit; i += 256) { + for (i = 0; i < fw_len; i += 256) { mxge_pio_copy(sc->sram + MXGE_FW_OFFSET + i, - hack.rw_char + i, - min(256U, (unsigned)(*limit - i))); + inflate_buffer + i, + min(256U, (unsigned)(fw_len - i))); mb(); dummy = *sc->sram; mb(); } + *limit = fw_len; status = 0; +abort_with_buffer: + free(inflate_buffer, M_TEMP); +abort_with_zs: + inflateEnd(&zs); abort_with_fw: firmware_put(fw, FIRMWARE_UNLOAD); return status; @@ -3205,7 +3245,6 @@ &mxge_verbose); TUNABLE_INT_FETCH("hw.mxge.ticks", &mxge_ticks); TUNABLE_INT_FETCH("hw.mxge.lro_cnt", &sc->lro_cnt); - printf("%d %d\n", sc->lro_cnt, mxge_lro_cnt); if (sc->lro_cnt != 0) mxge_lro_cnt = sc->lro_cnt; ==== //depot/projects/soc2007/rpaulo-macbook/fs/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.66 2007/07/12 21:04:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.67 2007/07/20 11:14:51 rwatson Exp $"); #include #include @@ -227,6 +227,7 @@ printf("coda_unmount: ROOT: vp %p, cp %p\n", mi->mi_rootvp, VTOC(mi->mi_rootvp)); #endif vrele(mi->mi_rootvp); + vrele(coda_ctlvp); active = coda_kill(vfsp, NOT_DOWNCALL); ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); mi->mi_rootvp->v_vflag &= ~VV_ROOT; ==== //depot/projects/soc2007/rpaulo-macbook/fs/coda/coda_vnops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.75 2007/07/12 21:04:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.76 2007/07/20 11:14:51 rwatson Exp $"); #include #include @@ -745,11 +745,6 @@ /* We don't need to send inactive to venus - DCS */ MARK_ENTRY(CODA_INACTIVE_STATS); - if (IS_CTL_VP(vp)) { - MARK_INT_SAT(CODA_INACTIVE_STATS); - return 0; - } - CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %s, vfsp %p\n", coda_f2s(&cp->c_fid), vp->v_mount));) ==== //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ * tmpfs vnode interface. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.7 2007/07/08 15:56:12 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.8 2007/07/19 03:34:50 delphij Exp $"); #include #include @@ -440,72 +440,80 @@ } /* --------------------------------------------------------------------- */ + static int -tmpfs_uio_xfer(struct tmpfs_mount *tmp, struct tmpfs_node *node, - struct uio *uio, vm_object_t uobj) +tmpfs_mappedread(vm_object_t vobj, vm_object_t tobj, size_t len, struct uio *uio) { - struct sf_buf *sf; - vm_pindex_t idx; - vm_offset_t d; - vm_page_t m; - size_t len; - int error = 0; - int behind = 0, ahead = 0; + vm_pindex_t idx; + vm_page_t m; + struct sf_buf *sf; + off_t offset, addr; + size_t tlen; + caddr_t va; + int error; - /* uobj - locked by caller */ + addr = uio->uio_offset; + idx = OFF_TO_IDX(addr); + offset = addr & PAGE_MASK; + tlen = MIN(PAGE_SIZE - offset, len); - VM_OBJECT_LOCK(uobj); - vm_object_pip_add(uobj, 1); - while (error == 0 && uio->uio_resid > 0) { - if (node->tn_size <= uio->uio_offset) - break; + if ((vobj == NULL) || (vobj->resident_page_count == 0)) + goto nocache; - len = MIN(node->tn_size - uio->uio_offset, uio->uio_resid); - if (len == 0) - break; - - idx = OFF_TO_IDX(uio->uio_offset); - d = uio->uio_offset - IDX_TO_OFF(idx); - len = MIN(len, (PAGE_SIZE - d)); - m = vm_page_grab(uobj, idx, VM_ALLOC_WIRED | VM_ALLOC_ZERO | - VM_ALLOC_NORMAL | VM_ALLOC_RETRY); - if (m->valid != VM_PAGE_BITS_ALL){ - if (vm_pager_has_page(uobj, idx, &behind, &ahead)){ - error = vm_pager_get_pages(uobj, &m, 1, 0); - if (error == VM_PAGER_ERROR){ - printf("vm_pager_get_pages error\n"); - goto out; - } -#ifdef DIAGNOSTIC - /* XXX */ - printf("tmpfs gets page from pager\n"); -#endif - } else { - vm_page_zero_invalid(m, TRUE); - } - } - VM_OBJECT_UNLOCK(uobj); + VM_OBJECT_LOCK(vobj); +lookupvpg: + if (((m = vm_page_lookup(vobj, idx)) != NULL) && + vm_page_is_valid(m, offset, tlen)) { + if (vm_page_sleep_if_busy(m, FALSE, "tmfsmr")) + goto lookupvpg; + vm_page_busy(m); + VM_OBJECT_UNLOCK(vobj); sched_pin(); sf = sf_buf_alloc(m, SFB_CPUPRIVATE); - error = uiomove((void *)(sf_buf_kva(sf) + d), len, uio); + va = (caddr_t)sf_buf_kva(sf); + error = uiomove(va + offset, tlen, uio); sf_buf_free(sf); sched_unpin(); - VM_OBJECT_LOCK(uobj); - vm_page_lock_queues(); - if (error == 0 && uio->uio_rw == UIO_WRITE) { - vm_page_set_validclean(m, d, len); + VM_OBJECT_LOCK(vobj); + vm_page_wakeup(m); + VM_OBJECT_UNLOCK(vobj); + return (error); + } + VM_OBJECT_UNLOCK(vobj); +nocache: + VM_OBJECT_LOCK(tobj); + vm_object_pip_add(tobj, 1); + m = vm_page_grab(tobj, idx, VM_ALLOC_WIRED | + VM_ALLOC_ZERO | VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + if (m->valid != VM_PAGE_BITS_ALL) { + int behind, ahead; + if (vm_pager_has_page(tobj, idx, &behind, &ahead)) { + error = vm_pager_get_pages(tobj, &m, 1, 0); + if (error != 0) { + printf("tmpfs get pages from pager error [read]\n"); + goto out; + } + } else vm_page_zero_invalid(m, TRUE); - vm_page_dirty(m); - } - vm_page_unwire(m, 0); - vm_page_activate(m); - vm_page_wakeup(m); - vm_page_unlock_queues(); } + VM_OBJECT_UNLOCK(tobj); + sched_pin(); + sf = sf_buf_alloc(m, SFB_CPUPRIVATE); + va = (caddr_t)sf_buf_kva(sf); + error = uiomove(va + offset, tlen, uio); + sf_buf_free(sf); + sched_unpin(); + VM_OBJECT_LOCK(tobj); out: - vm_object_pip_subtract(uobj, 1); - VM_OBJECT_UNLOCK(uobj); - return error; + vm_page_lock_queues(); + vm_page_unwire(m, 0); + vm_page_activate(m); + vm_page_unlock_queues(); + vm_page_wakeup(m); + vm_object_pip_subtract(tobj, 1); + VM_OBJECT_UNLOCK(tobj); + + return (error); } static int @@ -516,6 +524,8 @@ struct tmpfs_node *node; vm_object_t uobj; + size_t len; + int resid; int error; @@ -534,7 +544,17 @@ node->tn_status |= TMPFS_NODE_ACCESSED; uobj = node->tn_reg.tn_aobj; - error = tmpfs_uio_xfer(VFS_TO_TMPFS(vp->v_mount), node, uio, uobj); + while ((resid = uio->uio_resid) > 0) { + error = 0; + if (node->tn_size <= uio->uio_offset) + break; + len = MIN(node->tn_size - uio->uio_offset, resid); + if (len == 0) + break; + error = tmpfs_mappedread(vp->v_object, uobj, len, uio); + if ((error != 0) || (resid == uio->uio_resid)) + break; + } out: @@ -544,6 +564,100 @@ /* --------------------------------------------------------------------- */ static int +tmpfs_mappedwrite(vm_object_t vobj, vm_object_t tobj, size_t len, struct uio *uio) +{ + vm_pindex_t idx; + vm_page_t vpg, tpg; + struct sf_buf *sf; + off_t offset, addr; + size_t tlen; + caddr_t va; + int error; + + addr = uio->uio_offset; + idx = OFF_TO_IDX(addr); + offset = addr & PAGE_MASK; + tlen = MIN(PAGE_SIZE - offset, len); + + if ((vobj == NULL) || (vobj->resident_page_count == 0)) { + vpg = NULL; + goto nocache; + } + + VM_OBJECT_LOCK(vobj); +lookupvpg: + if (((vpg = vm_page_lookup(vobj, idx)) != NULL) && + vm_page_is_valid(vpg, offset, tlen)) { + if (vm_page_sleep_if_busy(vpg, FALSE, "tmfsmw")) + goto lookupvpg; + vm_page_busy(vpg); + vm_page_lock_queues(); + vm_page_undirty(vpg); + vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(vobj); + sched_pin(); + sf = sf_buf_alloc(vpg, SFB_CPUPRIVATE); + va = (caddr_t)sf_buf_kva(sf); + error = uiomove(va + offset, tlen, uio); + sf_buf_free(sf); + sched_unpin(); + } else { + VM_OBJECT_UNLOCK(vobj); + vpg = NULL; + } +nocache: + VM_OBJECT_LOCK(tobj); + vm_object_pip_add(tobj, 1); + tpg = vm_page_grab(tobj, idx, VM_ALLOC_WIRED | + VM_ALLOC_ZERO | VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + if (tpg->valid != VM_PAGE_BITS_ALL) { + int behind, ahead; + if (vm_pager_has_page(tobj, idx, &behind, &ahead)) { + error = vm_pager_get_pages(tobj, &tpg, 1, 0); + if (error != 0) { + printf("tmpfs get pages from pager error [write]\n"); + goto out; + } + } else + vm_page_zero_invalid(tpg, TRUE); + } + VM_OBJECT_UNLOCK(tobj); + if (vpg == NULL) { + sched_pin(); + sf = sf_buf_alloc(tpg, SFB_CPUPRIVATE); + va = (caddr_t)sf_buf_kva(sf); + error = uiomove(va + offset, tlen, uio); + sf_buf_free(sf); + sched_unpin(); + } else { + KASSERT(vpg->valid == VM_PAGE_BITS_ALL, ("parts of vpg invalid")); + pmap_copy_page(vpg, tpg); + } + VM_OBJECT_LOCK(tobj); +out: + if (vobj != NULL) + VM_OBJECT_LOCK(vobj); + vm_page_lock_queues(); + if (error == 0) { + vm_page_set_validclean(tpg, offset, tlen); + vm_page_zero_invalid(tpg, TRUE); + vm_page_dirty(tpg); + } + vm_page_unwire(tpg, 0); + vm_page_activate(tpg); + vm_page_unlock_queues(); + vm_page_wakeup(tpg); + if (vpg != NULL) + vm_page_wakeup(vpg); + if (vobj != NULL) + VM_OBJECT_UNLOCK(vobj); + vm_object_pip_subtract(tobj, 1); + VM_OBJECT_UNLOCK(tobj); + + return (error); +} + +static int tmpfs_write(struct vop_write_args *v) { struct vnode *vp = v->a_vp; @@ -552,10 +666,12 @@ struct thread *td = uio->uio_td; boolean_t extended; - int error; + int error = 0; off_t oldsize; struct tmpfs_node *node; vm_object_t uobj; + size_t len; + int resid; node = VP_TO_TMPFS_NODE(vp); oldsize = node->tn_size; @@ -596,7 +712,16 @@ } uobj = node->tn_reg.tn_aobj; - error = tmpfs_uio_xfer(VFS_TO_TMPFS(vp->v_mount), node, uio, uobj); + while ((resid = uio->uio_resid) > 0) { + if (node->tn_size <= uio->uio_offset) + break; + len = MIN(node->tn_size - uio->uio_offset, resid); + if (len == 0) + break; + error = tmpfs_mappedwrite(vp->v_object, uobj, len, uio); + if ((error != 0) || (resid == uio->uio_resid)) + break; + } node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | (extended ? TMPFS_NODE_CHANGED : 0); ==== //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_machdep.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.77 2007/07/04 23:06:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.78 2007/07/20 08:35:18 attilio Exp $"); #include #include @@ -846,9 +846,7 @@ iia.start = args->start; iia.length = args->length; iia.enable = args->enable; - mtx_lock(&Giant); error = i386_set_ioperm(td, &iia); - mtx_unlock(&Giant); return (error); } @@ -884,10 +882,8 @@ ldt.start = 0; ldt.descs = uap->ptr; ldt.num = uap->bytecount / sizeof(union descriptor); - mtx_lock(&Giant); error = i386_get_ldt(td, &ldt); td->td_retval[0] *= sizeof(union descriptor); - mtx_unlock(&Giant); break; case 0x01: /* write_ldt */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 16:45:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A178316A420; Fri, 20 Jul 2007 16:45:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 333A116A41B for ; Fri, 20 Jul 2007 16:45:16 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 211D113C461 for ; Fri, 20 Jul 2007 16:45:16 +0000 (UTC) (envelope-from cnst@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 l6KGjFFJ089589 for ; Fri, 20 Jul 2007 16:45:15 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KGjFhe089586 for perforce@freebsd.org; Fri, 20 Jul 2007 16:45:15 GMT (envelope-from cnst@FreeBSD.org) Date: Fri, 20 Jul 2007 16:45:15 GMT Message-Id: <200707201645.l6KGjFhe089586@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 123805 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, 20 Jul 2007 16:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123805 Change 123805 by cnst@dale on 2007/07/20 16:44:36 use device_set_desc, as suggested by imp@ Because description is printed during probe, split out lm_probe() from lm_attach(). Also, use device_printf() in a bus_space_map(9) error message that had nothing prepended to it previously. %dmesg | fgrep lm | fgrep isa | tail -n1 lm0: at port 0x290 on isa0 Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#4 edit .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#2 edit .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78var.h#2 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#3 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#4 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78.c,v 1.18 2007/05/26 22:47:39 cnst Exp $ */ @@ -389,14 +389,19 @@ }; void -lm_attach(struct lm_softc *sc) +lm_probe(struct lm_softc *sc) { - u_int i, config; - - printf("%s", device_get_nameunit(sc->sc_dev)); + int i; + for (i = 0; i < sizeof(lm_chips) / sizeof(lm_chips[0]); i++) if (lm_chips[i].chip_match(sc)) break; +} + +void +lm_attach(struct lm_softc *sc) +{ + u_int i, config; /* No point in doing anything if we don't have any sensors. */ if (sc->numsensors == 0) @@ -412,6 +417,8 @@ sc->lm_writereg(sc, LM_CONFIG, config | 0x01); /* Add sensors */ + strlcpy(sc->sensordev.xname, device_get_nameunit(sc->sc_dev), + sizeof(sc->sensordev.xname)); for (i = 0; i < sc->numsensors; ++i) sensor_attach(&sc->sensordev, &sc->sensors[i]); sensordev_install(&sc->sensordev); @@ -446,25 +453,30 @@ lm_match(struct lm_softc *sc) { int chipid; + const char *cdesc; + char fulldesc[64]; /* See if we have an LM78 or LM79. */ chipid = sc->lm_readreg(sc, LM_CHIPID) & LM_CHIPID_MASK; switch(chipid) { case LM_CHIPID_LM78: - printf(": LM78\n"); + cdesc = "LM78"; break; case LM_CHIPID_LM78J: - printf(": LM78J\n"); + cdesc = "LM78J"; break; case LM_CHIPID_LM79: - printf(": LM79\n"); + cdesc = "LM79"; break; case LM_CHIPID_LM81: - printf(": LM81\n"); + cdesc = "LM81"; break; default: return 0; } + snprintf(fulldesc, sizeof(fulldesc), + "National Semiconductor %s Hardware Monitor", cdesc); + device_set_desc_copy(sc->sc_dev, fulldesc); lm_setup_sensors(sc, lm78_sensors); sc->refresh_sensor_data = lm_refresh_sensor_data; @@ -475,9 +487,12 @@ def_match(struct lm_softc *sc) { int chipid; + char fulldesc[64]; chipid = sc->lm_readreg(sc, LM_CHIPID) & LM_CHIPID_MASK; - printf(": unknown chip (ID %d)\n", chipid); + snprintf(fulldesc, sizeof(fulldesc), + "unknown Hardware Monitor (ID 0x%x)\n", chipid); + device_set_desc_copy(sc->sc_dev, fulldesc); lm_setup_sensors(sc, lm78_sensors); sc->refresh_sensor_data = lm_refresh_sensor_data; @@ -488,6 +503,9 @@ wb_match(struct lm_softc *sc) { int banksel, vendid, devid; + const char *cdesc; + char desc[64]; + char fulldesc[64]; /* Read vendor ID */ banksel = sc->lm_readreg(sc, WB_BANKSEL); @@ -508,23 +526,23 @@ DPRINTF((" winbond chip id 0x%x\n", sc->chipid)); switch(sc->chipid) { case WB_CHIPID_W83627HF: - printf(": W83627HF\n"); + cdesc = "W83627HF"; lm_setup_sensors(sc, w83627hf_sensors); break; case WB_CHIPID_W83627THF: - printf(": W83627THF\n"); + cdesc = "W83627THF"; lm_setup_sensors(sc, w83637hf_sensors); break; case WB_CHIPID_W83627EHF: - printf(": W83627EHF\n"); + cdesc = "W83627EHF"; lm_setup_sensors(sc, w83627ehf_sensors); break; case WB_CHIPID_W83627DHG: - printf(": W83627DHG\n"); + cdesc = "W83627DHG"; lm_setup_sensors(sc, w83627dhg_sensors); break; case WB_CHIPID_W83637HF: - printf(": W83637HF\n"); + cdesc = "W83637HF"; sc->lm_writereg(sc, WB_BANKSEL, WB_BANKSEL_B0); if (sc->lm_readreg(sc, WB_BANK0_CONFIG) & WB_CONFIG_VMR9) sc->vrm9 = 1; @@ -532,53 +550,66 @@ lm_setup_sensors(sc, w83637hf_sensors); break; case WB_CHIPID_W83697HF: - printf(": W83697HF\n"); + cdesc = "W83697HF"; lm_setup_sensors(sc, w83697hf_sensors); break; case WB_CHIPID_W83781D: case WB_CHIPID_W83781D_2: - printf(": W83781D\n"); + cdesc = "W83781D"; lm_setup_sensors(sc, w83781d_sensors); break; case WB_CHIPID_W83782D: - printf(": W83782D\n"); + cdesc = "W83782D"; lm_setup_sensors(sc, w83782d_sensors); break; case WB_CHIPID_W83783S: - printf(": W83783S\n"); + cdesc = "W83783S"; lm_setup_sensors(sc, w83783s_sensors); break; case WB_CHIPID_W83791D: - printf(": W83791D\n"); + cdesc = "W83791D"; lm_setup_sensors(sc, w83791d_sensors); break; case WB_CHIPID_W83791SD: - printf(": W83791SD\n"); + cdesc = "W83791SD"; break; case WB_CHIPID_W83792D: if (devid >= 0x10 && devid <= 0x29) - printf(": W83792D rev %c\n", 'A' + devid - 0x10); + snprintf(desc, sizeof(desc), + "W83792D rev %c", 'A' + devid - 0x10); else - printf(": W83792D rev 0x%x\n", devid); + snprintf(desc, sizeof(desc), + "W83792D rev 0x%x", devid); + cdesc = desc; lm_setup_sensors(sc, w83792d_sensors); break; case WB_CHIPID_AS99127F: if (vendid == WB_VENDID_ASUS) { - printf(": AS99127F\n"); + cdesc = "AS99127F"; lm_setup_sensors(sc, w83781d_sensors); } else { - printf(": AS99127F rev 2\n"); + cdesc = "AS99127F rev 2"; lm_setup_sensors(sc, as99127f_sensors); } break; default: - printf(": unknown Winbond chip (ID 0x%x)\n", sc->chipid); + snprintf(fulldesc, sizeof(fulldesc), + "unknown Winbond Hardware Monitor (Chip ID 0x%x)\n", sc->chipid); + device_set_desc_copy(sc->sc_dev, fulldesc); /* Handle as a standard LM78. */ lm_setup_sensors(sc, lm78_sensors); sc->refresh_sensor_data = lm_refresh_sensor_data; return 1; } + if (cdesc[0] == 'W') + snprintf(fulldesc, sizeof(fulldesc), + "Winbond %s Hardware Monitor", cdesc); + else + snprintf(fulldesc, sizeof(fulldesc), + "ASUS %s Hardware Monitor", cdesc); + device_set_desc_copy(sc->sc_dev, fulldesc); + sc->refresh_sensor_data = wb_refresh_sensor_data; return 1; } @@ -588,9 +619,6 @@ { int i; - strlcpy(sc->sensordev.xname, device_get_nameunit(sc->sc_dev), - sizeof(sc->sensordev.xname)); - for (i = 0; sensors[i].desc; i++) { sc->sensors[i].type = sensors[i].type; strlcpy(sc->sensors[i].desc, sensors[i].desc, ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#1 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#2 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78_isa.c,v 1.2 2007/07/01 21:48:57 cnst Exp $ */ @@ -87,6 +87,7 @@ int lm_isa_probe(struct device *dev) { + struct lm_isa_softc *sc = device_get_softc(dev); bus_space_tag_t iot; bus_addr_t iobase; bus_space_handle_t ioh; @@ -148,6 +149,14 @@ return (1); found: + /* Bus-independent probe */ + sc->sc_lmsc.sc_dev = dev; + sc->sc_iot = iot; + sc->sc_ioh = ioh; + sc->sc_lmsc.lm_writereg = lm_isa_writereg; + sc->sc_lmsc.lm_readreg = lm_isa_readreg; + lm_probe(&sc->sc_lmsc); + bus_space_unmap(iot, ioh, 8); #ifdef fixme @@ -172,7 +181,6 @@ u_int8_t sbusaddr; #endif - sc->sc_lmsc.sc_dev = dev; sc->sc_iot = I386_BUS_SPACE_IO; if (device_get_unit(dev) == 0) @@ -181,13 +189,11 @@ return (1); if (bus_space_map(sc->sc_iot, iobase, 8, 0, &sc->sc_ioh)) { - printf(": can't map i/o space\n"); + device_printf(dev, "can't map i/o space\n"); return (1); } - /* Bus-independant attachment */ - sc->sc_lmsc.lm_writereg = lm_isa_writereg; - sc->sc_lmsc.lm_readreg = lm_isa_readreg; + /* Bus-independent attachment */ lm_attach(&sc->sc_lmsc); #ifdef notyet ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78var.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78var.h#1 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78var.h#2 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78var.h,v 1.12 2007/05/25 02:26:43 cnst Exp $ */ @@ -154,5 +154,6 @@ u_int8_t vrm9; }; +void lm_probe(struct lm_softc *); void lm_attach(struct lm_softc *); int lm_detach(struct lm_softc *); From owner-p4-projects@FreeBSD.ORG Fri Jul 20 16:46:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1ED4B16A420; Fri, 20 Jul 2007 16:46:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D68C116A41A for ; Fri, 20 Jul 2007 16:46:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C37AB13C457 for ; Fri, 20 Jul 2007 16:46:20 +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 l6KGkKv4089654 for ; Fri, 20 Jul 2007 16:46:20 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 l6KGkHKI089651 for perforce@freebsd.org; Fri, 20 Jul 2007 16:46:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 16:46:17 GMT Message-Id: <200707201646.l6KGkHKI089651@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 123806 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, 20 Jul 2007 16:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=123806 Change 123806 by rwatson@rwatson_zoo on 2007/07/20 16:45:24 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - netatm disabled in build as non-MPSAFE for 7.0 - libarchive security fixes - more SCTPage - Coda moved from src/sys/coda to src/sys/fs/coda, fixes - Giant removed from i386 ldt (etc) paths - Fixes to kernel lock profiling - sched_lock now effectively sched_4bsd-only - sched_ule significantly upgraded - UDPv6 feature parity with UDPv4, including MAC support - netstat now works (again) on coredumps - Countless bug fixes, cleanups, minor driver enhancements, etc. Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#27 integrate .. //depot/projects/trustedbsd/base/contrib/diff/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/bootstrap#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/doc/diagmeet.note#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/exgettext#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/alloca.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/alloca_.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/dirname.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch_.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/fnmatch_loop.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/getopt_int.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/gettimeofday.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/imaxtostr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/inttostr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/malloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/mkstemp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/offtostr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/realloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/regex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/regex.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/setmode.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/stdbool_.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/stripslash.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtol.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoll.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoul.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/strtoull.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/tempname.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/time_r.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/time_r.h#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/umaxtostr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/waitpid.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrdup.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtol.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtoul.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/lib/xstrtoumax.c#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/man/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/diff/src/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/etc/Makefile#53 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#45 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#47 integrate .. //depot/projects/trustedbsd/base/include/Makefile#62 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#49 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#29 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string_sprintf.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ioctl.2#8 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/reloc.c#8 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/reloc.c#13 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#23 integrate .. //depot/projects/trustedbsd/base/sbin/atm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipmi.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_hda.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#10 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#19 integrate .. //depot/projects/trustedbsd/base/share/man/man9/contigmalloc.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/module.9#5 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/INDEX.keymaps#12 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch .. //depot/projects/trustedbsd/base/share/zoneinfo/leapseconds#13 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#17 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/README#3 delete .. //depot/projects/trustedbsd/base/sys/coda/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/coda/cnode.h#12 delete .. //depot/projects/trustedbsd/base/sys/coda/coda.h#7 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#14 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_io.h#4 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_kernel.h#3 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_namecache.c#8 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_namecache.h#6 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_opstats.h#3 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_pioctl.h#4 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_psdev.c#16 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_psdev.h#4 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#13 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_subr.h#4 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#12 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_venus.h#6 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#17 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.h#6 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#23 delete .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.h#10 delete .. //depot/projects/trustedbsd/base/sys/compat/ia32/ia32_sysvec.c#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#91 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#120 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#86 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#24 integrate .. //depot/projects/trustedbsd/base/sys/fs/coda/README#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/TODO#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/cnode.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/bpb.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_fat.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#41 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfsmount.h#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#29 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/swtch.s#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#35 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/syscall.S#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#68 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#75 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#62 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#91 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/atm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_proto.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/icmp_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.h#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#34 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/agppriv.h#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/agpreg.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#63 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysent.h#18 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#45 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#55 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#26 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#77 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_phys.c#3 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_phys.h#2 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#26 integrate .. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/fstest/fstest.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/fstest/tests/open/16.t#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/fstest/tests/open/18.t#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/mkioctls#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/locate/locate.rc#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/atalk.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/bpf.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/if.c#18 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/inet.c#21 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/inet6.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/ipsec.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/ipx.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#21 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mbuf.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mcast.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mroute.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/mroute6.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netgraph.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.h#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/pfkey.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/route.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/sctp.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/unix.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/getdate.y#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#61 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#27 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.105 2007/07/12 00:02:12 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.107 2007/07/17 17:28:59 delphij 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,79 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070715: netatm temporarily disconnected +OLD_FILES+=rescue/atm +OLD_FILES+=rescue/fore_dnld +OLD_FILES+=rescue/ilmid +OLD_FILES+=sbin/atm +OLD_FILES+=sbin/fore_dnld +OLD_FILES+=sbin/ilmid +OLD_FILES+=usr/include/libatm.h +OLD_FILES+=usr/include/netatm/atm.h +OLD_FILES+=usr/include/netatm/atm_cm.h +OLD_FILES+=usr/include/netatm/atm_if.h +OLD_FILES+=usr/include/netatm/atm_ioctl.h +OLD_FILES+=usr/include/netatm/atm_pcb.h +OLD_FILES+=usr/include/netatm/atm_sap.h +OLD_FILES+=usr/include/netatm/atm_sigmgr.h +OLD_FILES+=usr/include/netatm/atm_stack.h +OLD_FILES+=usr/include/netatm/atm_sys.h +OLD_FILES+=usr/include/netatm/atm_var.h +OLD_FILES+=usr/include/netatm/atm_vc.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h +OLD_FILES+=usr/include/netatm/port.h +OLD_FILES+=usr/include/netatm/queue.h +OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h +OLD_FILES+=usr/include/netatm/spans/spans_cls.h +OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h +OLD_FILES+=usr/include/netatm/spans/spans_var.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h +OLD_FILES+=usr/include/netatm/uni/sscop.h +OLD_FILES+=usr/include/netatm/uni/sscop_misc.h +OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h +OLD_FILES+=usr/include/netatm/uni/sscop_var.h +OLD_FILES+=usr/include/netatm/uni/uni.h +OLD_FILES+=usr/include/netatm/uni/uniip_var.h +OLD_FILES+=usr/include/netatm/uni/unisig.h +OLD_FILES+=usr/include/netatm/uni/unisig_decode.h +OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h +OLD_FILES+=usr/include/netatm/uni/unisig_msg.h +OLD_FILES+=usr/include/netatm/uni/unisig_print.h +OLD_FILES+=usr/include/netatm/uni/unisig_var.h +OLD_FILES+=usr/lib/libatm.a +OLD_FILES+=usr/lib/libatm_p.a +OLD_FILES+=usr/sbin/atmarpd +OLD_FILES+=usr/sbin/scspd +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz +OLD_FILES+=usr/share/man/man8/atm.8.gz +OLD_FILES+=usr/share/man/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/man8/scspd.8.gz +OLD_FILES+=usr/share/examples/atm/NOTES +OLD_FILES+=usr/share/examples/atm/README +OLD_FILES+=usr/share/examples/atm/Startup +OLD_FILES+=usr/share/examples/atm/atm-config.sh +OLD_FILES+=usr/share/examples/atm/atm-sockets.txt +OLD_FILES+=usr/share/examples/atm/cpcs-design.txt +OLD_FILES+=usr/share/examples/atm/fore-microcode.txt +OLD_FILES+=usr/share/examples/atm/sscf-design.txt +OLD_FILES+=usr/share/examples/atm/sscop-design.txt +OLD_LIBS+=lib/libatm.so.5 +OLD_LIBS+=usr/lib/libatm.so +OLD_DIRS+=usr/include/netatm/sigpvc +OLD_DIRS+=usr/include/netatm/spans +OLD_DIRS+=usr/include/netatm/ipatm +OLD_DIRS+=usr/include/netatm/uni +OLD_DIRS+=usr/include/netatm +OLD_DIRS+=usr/share/examples/atm # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -104,6 +177,8 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +# 20070613: IPX over IP tunnel removal +OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz # 20070603: BIND 9.4.1 import @@ -242,6 +317,230 @@ OLD_FILES+=usr/libexec/f771 OLD_FILES+=usr/share/info/g77.info.gz OLD_FILES+=usr/share/man/man1/f77.1.gz +OLD_FILES+=usr/include/c++/3.4/algorithm +OLD_FILES+=usr/include/c++/3.4/backward/algo.h +OLD_FILES+=usr/include/c++/3.4/backward/algobase.h +OLD_FILES+=usr/include/c++/3.4/backward/alloc.h +OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.4/backward/bvector.h +OLD_FILES+=usr/include/c++/3.4/backward/complex.h +OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.4/backward/deque.h +OLD_FILES+=usr/include/c++/3.4/backward/fstream.h +OLD_FILES+=usr/include/c++/3.4/backward/function.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.4/backward/heap.h +OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.4/backward/iostream.h +OLD_FILES+=usr/include/c++/3.4/backward/istream.h +OLD_FILES+=usr/include/c++/3.4/backward/iterator.h +OLD_FILES+=usr/include/c++/3.4/backward/list.h +OLD_FILES+=usr/include/c++/3.4/backward/map.h +OLD_FILES+=usr/include/c++/3.4/backward/multimap.h +OLD_FILES+=usr/include/c++/3.4/backward/multiset.h +OLD_FILES+=usr/include/c++/3.4/backward/new.h +OLD_FILES+=usr/include/c++/3.4/backward/ostream.h +OLD_FILES+=usr/include/c++/3.4/backward/pair.h +OLD_FILES+=usr/include/c++/3.4/backward/queue.h +OLD_FILES+=usr/include/c++/3.4/backward/rope.h +OLD_FILES+=usr/include/c++/3.4/backward/set.h +OLD_FILES+=usr/include/c++/3.4/backward/slist.h +OLD_FILES+=usr/include/c++/3.4/backward/stack.h +OLD_FILES+=usr/include/c++/3.4/backward/stream.h +OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.4/backward/strstream +OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.4/backward/tree.h +OLD_FILES+=usr/include/c++/3.4/backward/vector.h +OLD_FILES+=usr/include/c++/3.4/bits/allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h +OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/c++config.h +OLD_FILES+=usr/include/c++/3.4/bits/c++io.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h +OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr.h +OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/list.tcc +OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/postypes.h +OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.4/bits/time_members.h +OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h +OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc +OLD_FILES+=usr/include/c++/3.4/bitset +OLD_FILES+=usr/include/c++/3.4/cassert +OLD_FILES+=usr/include/c++/3.4/cctype +OLD_FILES+=usr/include/c++/3.4/cerrno +OLD_FILES+=usr/include/c++/3.4/cfloat +OLD_FILES+=usr/include/c++/3.4/ciso646 +OLD_FILES+=usr/include/c++/3.4/climits +OLD_FILES+=usr/include/c++/3.4/clocale +OLD_FILES+=usr/include/c++/3.4/cmath +OLD_FILES+=usr/include/c++/3.4/complex +OLD_FILES+=usr/include/c++/3.4/csetjmp +OLD_FILES+=usr/include/c++/3.4/csignal +OLD_FILES+=usr/include/c++/3.4/cstdarg +OLD_FILES+=usr/include/c++/3.4/cstddef +OLD_FILES+=usr/include/c++/3.4/cstdio +OLD_FILES+=usr/include/c++/3.4/cstdlib +OLD_FILES+=usr/include/c++/3.4/cstring +OLD_FILES+=usr/include/c++/3.4/ctime +OLD_FILES+=usr/include/c++/3.4/cwchar +OLD_FILES+=usr/include/c++/3.4/cwctype +OLD_FILES+=usr/include/c++/3.4/cxxabi.h +OLD_FILES+=usr/include/c++/3.4/debug/bitset +OLD_FILES+=usr/include/c++/3.4/debug/debug.h +OLD_FILES+=usr/include/c++/3.4/debug/deque +OLD_FILES+=usr/include/c++/3.4/debug/formatter.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_map +OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_set +OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h +OLD_FILES+=usr/include/c++/3.4/debug/list +OLD_FILES+=usr/include/c++/3.4/debug/map +OLD_FILES+=usr/include/c++/3.4/debug/map.h +OLD_FILES+=usr/include/c++/3.4/debug/multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc +OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h +OLD_FILES+=usr/include/c++/3.4/debug/set +OLD_FILES+=usr/include/c++/3.4/debug/set.h +OLD_FILES+=usr/include/c++/3.4/debug/string +OLD_FILES+=usr/include/c++/3.4/debug/vector +OLD_FILES+=usr/include/c++/3.4/deque +OLD_FILES+=usr/include/c++/3.4/exception +OLD_FILES+=usr/include/c++/3.4/exception_defines.h +OLD_FILES+=usr/include/c++/3.4/ext/algorithm +OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/functional +OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h +OLD_FILES+=usr/include/c++/3.4/ext/hash_map +OLD_FILES+=usr/include/c++/3.4/ext/hash_set +OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h +OLD_FILES+=usr/include/c++/3.4/ext/iterator +OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/memory +OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/numeric +OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h +OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/rb_tree +OLD_FILES+=usr/include/c++/3.4/ext/rope +OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.4/ext/slist +OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h +OLD_FILES+=usr/include/c++/3.4/fstream +OLD_FILES+=usr/include/c++/3.4/functional +OLD_FILES+=usr/include/c++/3.4/iomanip +OLD_FILES+=usr/include/c++/3.4/ios +OLD_FILES+=usr/include/c++/3.4/iosfwd +OLD_FILES+=usr/include/c++/3.4/iostream +OLD_FILES+=usr/include/c++/3.4/istream +OLD_FILES+=usr/include/c++/3.4/iterator +OLD_FILES+=usr/include/c++/3.4/limits +OLD_FILES+=usr/include/c++/3.4/list +OLD_FILES+=usr/include/c++/3.4/locale +OLD_FILES+=usr/include/c++/3.4/map +OLD_FILES+=usr/include/c++/3.4/memory +OLD_FILES+=usr/include/c++/3.4/new +OLD_FILES+=usr/include/c++/3.4/numeric +OLD_FILES+=usr/include/c++/3.4/ostream +OLD_FILES+=usr/include/c++/3.4/queue +OLD_FILES+=usr/include/c++/3.4/set +OLD_FILES+=usr/include/c++/3.4/sstream +OLD_FILES+=usr/include/c++/3.4/stack +OLD_FILES+=usr/include/c++/3.4/stdexcept +OLD_FILES+=usr/include/c++/3.4/streambuf +OLD_FILES+=usr/include/c++/3.4/string +OLD_FILES+=usr/include/c++/3.4/typeinfo +OLD_FILES+=usr/include/c++/3.4/utility +OLD_FILES+=usr/include/c++/3.4/valarray +OLD_FILES+=usr/include/c++/3.4/vector +OLD_DIRS+=usr/include/c++/3.4/backward +OLD_DIRS+=usr/include/c++/3.4/bits +OLD_DIRS+=usr/include/c++/3.4/debug +OLD_DIRS+=usr/include/c++/3.4/ext +OLD_DIRS+=usr/include/c++/3.4 # 20070510: zpool/zfs moved to /sbin OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool ==== //depot/projects/trustedbsd/base/contrib/diff/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,17 +1,61 @@ -# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.1 2007/06/15 07:28:00 delphij Exp $ +# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.2 2007/07/19 06:57:44 delphij Exp $ INSTALL +Makefile.am +Makefile.in +aclocal.m4 +bootstrap +config.hin config/ +configure +configure.ac +doc/Makefile.am +doc/Makefile.in +doc/diagmeet.note +exgettext +lib/Makefile.am +lib/Makefile.in +lib/alloca.c +lib/alloca_.h +lib/dirname.c +lib/fnmatch.c +lib/fnmatch_.h +lib/fnmatch_loop.c +lib/getopt.c +lib/getopt1.c +lib/getopt_int.h +lib/gettimeofday.c +lib/imaxtostr.c +lib/inttostr.c +lib/malloc.c +lib/mkstemp.c +lib/offtostr.c +lib/posix/Makefile.in +lib/realloc.c +lib/regex.c +lib/regex.h +lib/setmode.c +lib/stdbool_.h +lib/strcasecmp.c +lib/stripslash.c +lib/strncasecmp.c +lib/strtol.c +lib/strtoll.c +lib/strtoul.c +lib/strtoull.c +lib/tempname.c +lib/time_r.c +lib/time_r.h +lib/umaxtostr.c +lib/waitpid.c +lib/xstrdup.c +lib/xstrtol.c +lib/xstrtoul.c +lib/xstrtoumax.c m4/ +man/Makefile.am +man/Makefile.in ms/ po/ +src/Makefile.am src/Makefile.in -lib/posix/Makefile.in -lib/Makefile.in -doc/Makefile.in -man/Makefile.in -Makefile.in -aclocal.m4 -config.hin -configure -configure.ac ==== //depot/projects/trustedbsd/base/etc/Makefile#53 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.359 2007/06/18 05:44:38 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.360 2007/07/13 14:28:10 imp Exp $ .include @@ -184,9 +184,11 @@ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ +.if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ ${DESTDIR}/boot/device.hints +.endif distrib-dirs: mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.117 2007/07/06 07:20:59 bz Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -205,16 +205,17 @@ .. netatalk .. - netatm - ipatm - .. - sigpvc - .. - spans - .. - uni - .. - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# netatm +# ipatm +# .. +# sigpvc +# .. +# spans +# .. +# uni +# .. +# .. netgraph atm .. ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.326 2007/03/02 14:56:14 flz Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.327 2007/07/14 21:49:21 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -187,8 +187,9 @@ .. IPv6 .. - atm - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# atm +# .. bc .. bootforth ==== //depot/projects/trustedbsd/base/include/Makefile#62 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.273 2007/07/06 07:20:59 bz Exp $ +# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $ # # Doing a "make install" builds /usr/include. @@ -36,10 +36,11 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ +LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ netipsec ${_netipx} netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ pccard sys vm +#LDIRS+= netatm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -49,12 +50,12 @@ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +#LSUBDIRS+= netatm/ipatm netatm/sigpvc netatm/spans netatm/uni .if ${MACHINE_ARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram ==== //depot/projects/trustedbsd/base/lib/Makefile#49 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.221 2007/05/19 04:55:14 kan Exp $ +# $FreeBSD: src/lib/Makefile,v 1.222 2007/07/14 21:49:22 rwatson Exp $ .include @@ -48,7 +48,8 @@ .endif .if ${MK_ATM} != "no" -_libatm= libatm +# Disabled in 7.0 as netatm is not MPSAFE. +#_libatm= libatm _libngatm= libngatm .endif ==== //depot/projects/trustedbsd/base/lib/libarchive/Makefile#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.75 2007/07/07 16:55:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.77 2007/07/15 19:10:34 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -9,7 +9,7 @@ # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.2.3 +VERSION= 2.2.4 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/\..*//' @@ -121,11 +121,13 @@ MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 MLINKS+= archive_entry.3 archive_entry_copy_fflags_text_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname.3 MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname.3 MLINKS+= archive_entry.3 archive_entry_copy_uname_w.3 MLINKS+= archive_entry.3 archive_entry_dev.3 MLINKS+= archive_entry.3 archive_entry_devmajor.3 ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.14 2007/05/29 01:00:18 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -41,6 +41,7 @@ .Nm archive_entry_clear , .Nm archive_entry_clone , .Nm archive_entry_copy_fflags_text_w , +.Nm archive_entry_copy_gname , .Nm archive_entry_copy_gname_w , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , @@ -48,6 +49,7 @@ .Nm archive_entry_copy_stat , .Nm archive_entry_copy_symlink , .Nm archive_entry_copy_symlink_w , +.Nm archive_entry_copy_uname , .Nm archive_entry_copy_uname_w , .Nm archive_entry_dev , .Nm archive_entry_devmajor , @@ -125,6 +127,8 @@ .Ft const wchar_t * .Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_copy_gname "struct archive_entry *" "const char *" +.Ft void .Fn archive_entry_copy_gname_w "struct archive_entry *" "const wchar_t *" .Ft void .Fn archive_entry_copy_hardlink "struct archive_entry *" "const char *" @@ -139,6 +143,8 @@ .Ft void .Fn archive_entry_copy_symlink_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_copy_uname "struct archive_entry *" "const char *" +.Ft void .Fn archive_entry_copy_uname_w "struct archive_entry *" "const wchar_t *" .Ft dev_t .Fn archive_entry_dev "struct archive_entry *" ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#22 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.43 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.44 2007/07/15 19:10:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -652,6 +652,12 @@ } void +archive_entry_copy_gname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_gname, name); +} + +void archive_entry_copy_gname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_gname, name); @@ -836,6 +842,12 @@ } void +archive_entry_copy_uname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_uname, name); +} + +void archive_entry_copy_uname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_uname, name); ==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#15 (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_entry.h,v 1.22 2007/05/29 01:00:18 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.23 2007/07/15 19:10:34 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -135,6 +135,7 @@ const wchar_t *); void archive_entry_set_gid(struct archive_entry *, gid_t); void archive_entry_set_gname(struct archive_entry *, const char *); +void archive_entry_copy_gname(struct archive_entry *, const char *); void archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *); void archive_entry_set_hardlink(struct archive_entry *, const char *); void archive_entry_copy_hardlink(struct archive_entry *, const char *); @@ -156,6 +157,7 @@ void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 16:55:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8F2816A421; Fri, 20 Jul 2007 16:55:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5463F16A418 for ; Fri, 20 Jul 2007 16:55:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40B2F13C474 for ; Fri, 20 Jul 2007 16:55:36 +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 l6KGtauq098707 for ; Fri, 20 Jul 2007 16:55:36 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 l6KGtWef098704 for perforce@freebsd.org; Fri, 20 Jul 2007 16:55:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 16:55:32 GMT Message-Id: <200707201655.l6KGtWef098704@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 123808 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, 20 Jul 2007 16:55:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=123808 Change 123808 by rwatson@rwatson_zoo on 2007/07/20 16:55:20 Integrate TrustedBSD audit3 branch from TrustedBSD base through change set 123806. Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#19 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/diff/Makefile.am#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/bootstrap#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/doc/diagmeet.note#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/exgettext#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/Makefile.am#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/alloca.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/alloca_.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/dirname.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch_.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/fnmatch_loop.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt1.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/getopt_int.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/gettimeofday.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/imaxtostr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/inttostr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/malloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/mkstemp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/offtostr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/realloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/regex.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/regex.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/setmode.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/stdbool_.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/stripslash.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strncasecmp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtol.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoll.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoul.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/strtoull.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/tempname.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/time_r.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/time_r.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/umaxtostr.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/waitpid.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrdup.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtol.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtoul.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/lib/xstrtoumax.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/man/Makefile.am#2 delete .. //depot/projects/trustedbsd/audit3/contrib/diff/src/Makefile.am#2 delete .. //depot/projects/trustedbsd/audit3/etc/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#17 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#11 integrate .. //depot/projects/trustedbsd/audit3/include/Makefile#16 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.3#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#17 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string_sprintf.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/read_open_memory.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_tar.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_pax_truncated.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ioctl.2#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/powerpc/reloc.c#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/sparc64/reloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#12 integrate .. //depot/projects/trustedbsd/audit3/sbin/atm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ipmi.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/src.conf.5#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/ports.7#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/contigmalloc.9#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/module.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/trustedbsd/audit3/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/share/syscons/keymaps/fr.macbook.acc.kbd#1 branch .. //depot/projects/trustedbsd/audit3/share/zoneinfo/leapseconds#8 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/cpu_switch.S#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/board.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/README#2 delete .. //depot/projects/trustedbsd/audit3/sys/coda/TODO#2 delete .. //depot/projects/trustedbsd/audit3/sys/coda/cnode.h#6 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda.h#6 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_fbsd.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_io.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_kernel.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_namecache.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_namecache.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_opstats.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_pioctl.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_psdev.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_psdev.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_subr.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_subr.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_venus.c#5 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_venus.h#5 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vfsops.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vfsops.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.c#11 delete .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.h#6 delete .. //depot/projects/trustedbsd/audit3/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#26 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#35 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#23 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ipmi/ipmi_isa.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/eth_z8e.dat.gz.uu#5 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/eth_z8e.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/ethp_z8e.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mcp_gen_header.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_eth_z8e.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_ethp_z8e.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/coda/README#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/TODO#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/cnode.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_fbsd.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_io.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_kernel.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_namecache.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_namecache.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_opstats.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_pioctl.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_psdev.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_psdev.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_subr.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_subr.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_venus.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_venus.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_vfsops.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_vfsops.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_vnops.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/coda/coda_vnops.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/bpb.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_fat.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfsmount.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/swtch.s#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/syscall.S#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_switch.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#27 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#22 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda5/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/atm/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netatm/atm_proto.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/icmp_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_cc_functions.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_cc_functions.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_os.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agppriv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agpreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mutex.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rwlock.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysent.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_meter.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_phys.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_phys.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#14 integrate .. //depot/projects/trustedbsd/audit3/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/fstest/fstest.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/fstest/tests/open/16.t#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/fstest/tests/open/18.t#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/mkioctls#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/locate/locate.rc#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/atalk.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/bpf.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/if.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/inet.c#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/inet6.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/ipsec.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/ipx.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/main.c#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mbuf.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mcast.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mroute.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mroute6.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/netgraph.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/netstat.h#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/pfkey.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/route.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/unix.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/getdate.y#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/read.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#25 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.105 2007/07/12 00:02:12 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.107 2007/07/17 17:28:59 delphij 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,79 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070715: netatm temporarily disconnected +OLD_FILES+=rescue/atm +OLD_FILES+=rescue/fore_dnld +OLD_FILES+=rescue/ilmid +OLD_FILES+=sbin/atm +OLD_FILES+=sbin/fore_dnld +OLD_FILES+=sbin/ilmid +OLD_FILES+=usr/include/libatm.h +OLD_FILES+=usr/include/netatm/atm.h +OLD_FILES+=usr/include/netatm/atm_cm.h +OLD_FILES+=usr/include/netatm/atm_if.h +OLD_FILES+=usr/include/netatm/atm_ioctl.h +OLD_FILES+=usr/include/netatm/atm_pcb.h +OLD_FILES+=usr/include/netatm/atm_sap.h +OLD_FILES+=usr/include/netatm/atm_sigmgr.h +OLD_FILES+=usr/include/netatm/atm_stack.h +OLD_FILES+=usr/include/netatm/atm_sys.h +OLD_FILES+=usr/include/netatm/atm_var.h +OLD_FILES+=usr/include/netatm/atm_vc.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h +OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h +OLD_FILES+=usr/include/netatm/port.h +OLD_FILES+=usr/include/netatm/queue.h +OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h +OLD_FILES+=usr/include/netatm/spans/spans_cls.h +OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h +OLD_FILES+=usr/include/netatm/spans/spans_var.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni.h +OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h +OLD_FILES+=usr/include/netatm/uni/sscop.h +OLD_FILES+=usr/include/netatm/uni/sscop_misc.h +OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h +OLD_FILES+=usr/include/netatm/uni/sscop_var.h +OLD_FILES+=usr/include/netatm/uni/uni.h +OLD_FILES+=usr/include/netatm/uni/uniip_var.h +OLD_FILES+=usr/include/netatm/uni/unisig.h +OLD_FILES+=usr/include/netatm/uni/unisig_decode.h +OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h +OLD_FILES+=usr/include/netatm/uni/unisig_msg.h +OLD_FILES+=usr/include/netatm/uni/unisig_print.h +OLD_FILES+=usr/include/netatm/uni/unisig_var.h +OLD_FILES+=usr/lib/libatm.a +OLD_FILES+=usr/lib/libatm_p.a +OLD_FILES+=usr/sbin/atmarpd +OLD_FILES+=usr/sbin/scspd +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz +OLD_FILES+=usr/share/man/man8/atm.8.gz +OLD_FILES+=usr/share/man/man8/atmarpd.8.gz +OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz +OLD_FILES+=usr/share/man/man8/ilmid.8.gz +OLD_FILES+=usr/share/man/man8/scspd.8.gz +OLD_FILES+=usr/share/examples/atm/NOTES +OLD_FILES+=usr/share/examples/atm/README +OLD_FILES+=usr/share/examples/atm/Startup +OLD_FILES+=usr/share/examples/atm/atm-config.sh +OLD_FILES+=usr/share/examples/atm/atm-sockets.txt +OLD_FILES+=usr/share/examples/atm/cpcs-design.txt +OLD_FILES+=usr/share/examples/atm/fore-microcode.txt +OLD_FILES+=usr/share/examples/atm/sscf-design.txt +OLD_FILES+=usr/share/examples/atm/sscop-design.txt +OLD_LIBS+=lib/libatm.so.5 +OLD_LIBS+=usr/lib/libatm.so +OLD_DIRS+=usr/include/netatm/sigpvc +OLD_DIRS+=usr/include/netatm/spans +OLD_DIRS+=usr/include/netatm/ipatm +OLD_DIRS+=usr/include/netatm/uni +OLD_DIRS+=usr/include/netatm +OLD_DIRS+=usr/share/examples/atm # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -104,6 +177,8 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +# 20070613: IPX over IP tunnel removal +OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz # 20070603: BIND 9.4.1 import @@ -242,6 +317,230 @@ OLD_FILES+=usr/libexec/f771 OLD_FILES+=usr/share/info/g77.info.gz OLD_FILES+=usr/share/man/man1/f77.1.gz +OLD_FILES+=usr/include/c++/3.4/algorithm +OLD_FILES+=usr/include/c++/3.4/backward/algo.h +OLD_FILES+=usr/include/c++/3.4/backward/algobase.h +OLD_FILES+=usr/include/c++/3.4/backward/alloc.h +OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.4/backward/bvector.h +OLD_FILES+=usr/include/c++/3.4/backward/complex.h +OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.4/backward/deque.h +OLD_FILES+=usr/include/c++/3.4/backward/fstream.h +OLD_FILES+=usr/include/c++/3.4/backward/function.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.4/backward/heap.h +OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.4/backward/iostream.h +OLD_FILES+=usr/include/c++/3.4/backward/istream.h +OLD_FILES+=usr/include/c++/3.4/backward/iterator.h +OLD_FILES+=usr/include/c++/3.4/backward/list.h +OLD_FILES+=usr/include/c++/3.4/backward/map.h +OLD_FILES+=usr/include/c++/3.4/backward/multimap.h +OLD_FILES+=usr/include/c++/3.4/backward/multiset.h +OLD_FILES+=usr/include/c++/3.4/backward/new.h +OLD_FILES+=usr/include/c++/3.4/backward/ostream.h +OLD_FILES+=usr/include/c++/3.4/backward/pair.h +OLD_FILES+=usr/include/c++/3.4/backward/queue.h +OLD_FILES+=usr/include/c++/3.4/backward/rope.h +OLD_FILES+=usr/include/c++/3.4/backward/set.h +OLD_FILES+=usr/include/c++/3.4/backward/slist.h +OLD_FILES+=usr/include/c++/3.4/backward/stack.h +OLD_FILES+=usr/include/c++/3.4/backward/stream.h +OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.4/backward/strstream +OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.4/backward/tree.h +OLD_FILES+=usr/include/c++/3.4/backward/vector.h +OLD_FILES+=usr/include/c++/3.4/bits/allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h +OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h +OLD_FILES+=usr/include/c++/3.4/bits/c++config.h +OLD_FILES+=usr/include/c++/3.4/bits/c++io.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h +OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice.h +OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.4/bits/gthr.h +OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/list.tcc +OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/postypes.h +OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.4/bits/time_members.h +OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h +OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc +OLD_FILES+=usr/include/c++/3.4/bitset +OLD_FILES+=usr/include/c++/3.4/cassert +OLD_FILES+=usr/include/c++/3.4/cctype +OLD_FILES+=usr/include/c++/3.4/cerrno +OLD_FILES+=usr/include/c++/3.4/cfloat +OLD_FILES+=usr/include/c++/3.4/ciso646 +OLD_FILES+=usr/include/c++/3.4/climits +OLD_FILES+=usr/include/c++/3.4/clocale +OLD_FILES+=usr/include/c++/3.4/cmath +OLD_FILES+=usr/include/c++/3.4/complex +OLD_FILES+=usr/include/c++/3.4/csetjmp +OLD_FILES+=usr/include/c++/3.4/csignal +OLD_FILES+=usr/include/c++/3.4/cstdarg +OLD_FILES+=usr/include/c++/3.4/cstddef +OLD_FILES+=usr/include/c++/3.4/cstdio +OLD_FILES+=usr/include/c++/3.4/cstdlib +OLD_FILES+=usr/include/c++/3.4/cstring +OLD_FILES+=usr/include/c++/3.4/ctime +OLD_FILES+=usr/include/c++/3.4/cwchar +OLD_FILES+=usr/include/c++/3.4/cwctype +OLD_FILES+=usr/include/c++/3.4/cxxabi.h +OLD_FILES+=usr/include/c++/3.4/debug/bitset +OLD_FILES+=usr/include/c++/3.4/debug/debug.h +OLD_FILES+=usr/include/c++/3.4/debug/deque +OLD_FILES+=usr/include/c++/3.4/debug/formatter.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_map +OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/hash_set +OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h +OLD_FILES+=usr/include/c++/3.4/debug/list +OLD_FILES+=usr/include/c++/3.4/debug/map +OLD_FILES+=usr/include/c++/3.4/debug/map.h +OLD_FILES+=usr/include/c++/3.4/debug/multimap.h +OLD_FILES+=usr/include/c++/3.4/debug/multiset.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h +OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc +OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h +OLD_FILES+=usr/include/c++/3.4/debug/set +OLD_FILES+=usr/include/c++/3.4/debug/set.h +OLD_FILES+=usr/include/c++/3.4/debug/string +OLD_FILES+=usr/include/c++/3.4/debug/vector +OLD_FILES+=usr/include/c++/3.4/deque +OLD_FILES+=usr/include/c++/3.4/exception +OLD_FILES+=usr/include/c++/3.4/exception_defines.h +OLD_FILES+=usr/include/c++/3.4/ext/algorithm +OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/functional +OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h +OLD_FILES+=usr/include/c++/3.4/ext/hash_map +OLD_FILES+=usr/include/c++/3.4/ext/hash_set +OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h +OLD_FILES+=usr/include/c++/3.4/ext/iterator +OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/memory +OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/numeric +OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h +OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h +OLD_FILES+=usr/include/c++/3.4/ext/rb_tree +OLD_FILES+=usr/include/c++/3.4/ext/rope +OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.4/ext/slist +OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h +OLD_FILES+=usr/include/c++/3.4/fstream +OLD_FILES+=usr/include/c++/3.4/functional +OLD_FILES+=usr/include/c++/3.4/iomanip +OLD_FILES+=usr/include/c++/3.4/ios +OLD_FILES+=usr/include/c++/3.4/iosfwd +OLD_FILES+=usr/include/c++/3.4/iostream +OLD_FILES+=usr/include/c++/3.4/istream +OLD_FILES+=usr/include/c++/3.4/iterator +OLD_FILES+=usr/include/c++/3.4/limits +OLD_FILES+=usr/include/c++/3.4/list +OLD_FILES+=usr/include/c++/3.4/locale +OLD_FILES+=usr/include/c++/3.4/map +OLD_FILES+=usr/include/c++/3.4/memory +OLD_FILES+=usr/include/c++/3.4/new +OLD_FILES+=usr/include/c++/3.4/numeric +OLD_FILES+=usr/include/c++/3.4/ostream +OLD_FILES+=usr/include/c++/3.4/queue +OLD_FILES+=usr/include/c++/3.4/set +OLD_FILES+=usr/include/c++/3.4/sstream +OLD_FILES+=usr/include/c++/3.4/stack +OLD_FILES+=usr/include/c++/3.4/stdexcept +OLD_FILES+=usr/include/c++/3.4/streambuf +OLD_FILES+=usr/include/c++/3.4/string +OLD_FILES+=usr/include/c++/3.4/typeinfo +OLD_FILES+=usr/include/c++/3.4/utility +OLD_FILES+=usr/include/c++/3.4/valarray +OLD_FILES+=usr/include/c++/3.4/vector +OLD_DIRS+=usr/include/c++/3.4/backward +OLD_DIRS+=usr/include/c++/3.4/bits +OLD_DIRS+=usr/include/c++/3.4/debug +OLD_DIRS+=usr/include/c++/3.4/ext +OLD_DIRS+=usr/include/c++/3.4 # 20070510: zpool/zfs moved to /sbin OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool ==== //depot/projects/trustedbsd/audit3/contrib/diff/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,17 +1,61 @@ -# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.1 2007/06/15 07:28:00 delphij Exp $ +# $FreeBSD: src/contrib/diff/FREEBSD-Xlist,v 1.2 2007/07/19 06:57:44 delphij Exp $ INSTALL +Makefile.am +Makefile.in +aclocal.m4 +bootstrap +config.hin config/ +configure +configure.ac +doc/Makefile.am +doc/Makefile.in +doc/diagmeet.note +exgettext +lib/Makefile.am +lib/Makefile.in +lib/alloca.c +lib/alloca_.h +lib/dirname.c +lib/fnmatch.c +lib/fnmatch_.h +lib/fnmatch_loop.c +lib/getopt.c +lib/getopt1.c +lib/getopt_int.h +lib/gettimeofday.c +lib/imaxtostr.c +lib/inttostr.c +lib/malloc.c +lib/mkstemp.c +lib/offtostr.c +lib/posix/Makefile.in +lib/realloc.c +lib/regex.c +lib/regex.h +lib/setmode.c +lib/stdbool_.h +lib/strcasecmp.c +lib/stripslash.c +lib/strncasecmp.c +lib/strtol.c +lib/strtoll.c +lib/strtoul.c +lib/strtoull.c +lib/tempname.c +lib/time_r.c +lib/time_r.h +lib/umaxtostr.c +lib/waitpid.c +lib/xstrdup.c +lib/xstrtol.c +lib/xstrtoul.c +lib/xstrtoumax.c m4/ +man/Makefile.am +man/Makefile.in ms/ po/ +src/Makefile.am src/Makefile.in -lib/posix/Makefile.in -lib/Makefile.in -doc/Makefile.in -man/Makefile.in -Makefile.in -aclocal.m4 -config.hin -configure -configure.ac ==== //depot/projects/trustedbsd/audit3/etc/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.359 2007/06/18 05:44:38 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.360 2007/07/13 14:28:10 imp Exp $ .include @@ -184,9 +184,11 @@ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ +.if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints) ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ ${DESTDIR}/boot/device.hints +.endif distrib-dirs: mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.117 2007/07/06 07:20:59 bz Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -205,16 +205,17 @@ .. netatalk .. - netatm - ipatm - .. - sigpvc - .. - spans - .. - uni - .. - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# netatm +# ipatm +# .. +# sigpvc +# .. +# spans +# .. +# uni +# .. +# .. netgraph atm .. ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.326 2007/03/02 14:56:14 flz Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.327 2007/07/14 21:49:21 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -187,8 +187,9 @@ .. IPv6 .. - atm - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# atm +# .. bc .. bootforth ==== //depot/projects/trustedbsd/audit3/include/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.273 2007/07/06 07:20:59 bz Exp $ +# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $ # # Doing a "make install" builds /usr/include. @@ -36,10 +36,11 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ +LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ netipsec ${_netipx} netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ pccard sys vm +#LDIRS+= netatm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -49,12 +50,12 @@ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +#LSUBDIRS+= netatm/ipatm netatm/sigpvc netatm/spans netatm/uni .if ${MACHINE_ARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram ==== //depot/projects/trustedbsd/audit3/lib/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.221 2007/05/19 04:55:14 kan Exp $ +# $FreeBSD: src/lib/Makefile,v 1.222 2007/07/14 21:49:22 rwatson Exp $ .include @@ -48,7 +48,8 @@ .endif .if ${MK_ATM} != "no" -_libatm= libatm +# Disabled in 7.0 as netatm is not MPSAFE. +#_libatm= libatm _libngatm= libngatm .endif ==== //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.75 2007/07/07 16:55:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.77 2007/07/15 19:10:34 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -9,7 +9,7 @@ # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.2.3 +VERSION= 2.2.4 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/\..*//' @@ -121,11 +121,13 @@ MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 MLINKS+= archive_entry.3 archive_entry_copy_fflags_text_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname.3 MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname.3 MLINKS+= archive_entry.3 archive_entry_copy_uname_w.3 MLINKS+= archive_entry.3 archive_entry_dev.3 MLINKS+= archive_entry.3 archive_entry_devmajor.3 ==== //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.3#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.14 2007/05/29 01:00:18 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -41,6 +41,7 @@ .Nm archive_entry_clear , .Nm archive_entry_clone , .Nm archive_entry_copy_fflags_text_w , +.Nm archive_entry_copy_gname , .Nm archive_entry_copy_gname_w , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , @@ -48,6 +49,7 @@ .Nm archive_entry_copy_stat , .Nm archive_entry_copy_symlink , .Nm archive_entry_copy_symlink_w , +.Nm archive_entry_copy_uname , .Nm archive_entry_copy_uname_w , .Nm archive_entry_dev , .Nm archive_entry_devmajor , @@ -125,6 +127,8 @@ .Ft const wchar_t * .Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_copy_gname "struct archive_entry *" "const char *" +.Ft void .Fn archive_entry_copy_gname_w "struct archive_entry *" "const wchar_t *" .Ft void .Fn archive_entry_copy_hardlink "struct archive_entry *" "const char *" @@ -139,6 +143,8 @@ .Ft void .Fn archive_entry_copy_symlink_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_copy_uname "struct archive_entry *" "const char *" +.Ft void .Fn archive_entry_copy_uname_w "struct archive_entry *" "const wchar_t *" .Ft dev_t .Fn archive_entry_dev "struct archive_entry *" ==== //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.43 2007/05/29 01:00:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.44 2007/07/15 19:10:34 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -652,6 +652,12 @@ } void +archive_entry_copy_gname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_gname, name); +} + +void archive_entry_copy_gname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_gname, name); @@ -836,6 +842,12 @@ } void +archive_entry_copy_uname(struct archive_entry *entry, const char *name) +{ + aes_copy_mbs(&entry->ae_uname, name); +} + +void archive_entry_copy_uname_w(struct archive_entry *entry, const wchar_t *name) { aes_copy_wcs(&entry->ae_uname, name); ==== //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.h#9 (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_entry.h,v 1.22 2007/05/29 01:00:18 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.23 2007/07/15 19:10:34 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -135,6 +135,7 @@ const wchar_t *); void archive_entry_set_gid(struct archive_entry *, gid_t); void archive_entry_set_gname(struct archive_entry *, const char *); +void archive_entry_copy_gname(struct archive_entry *, const char *); void archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *); void archive_entry_set_hardlink(struct archive_entry *, const char *); void archive_entry_copy_hardlink(struct archive_entry *, const char *); @@ -156,6 +157,7 @@ void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); void archive_entry_set_uid(struct archive_entry *, uid_t); void archive_entry_set_uname(struct archive_entry *, const char *); +void archive_entry_copy_uname(struct archive_entry *, const char *); void archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *); /* ==== //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_program.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 17:10:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA6416A475; Fri, 20 Jul 2007 17:10:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1182B16A46E for ; Fri, 20 Jul 2007 17:10:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFE7013C4B7 for ; Fri, 20 Jul 2007 17:10:55 +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 l6KHAtCS000825 for ; Fri, 20 Jul 2007 17:10:55 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 l6KHAt4W000820 for perforce@freebsd.org; Fri, 20 Jul 2007 17:10:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 20 Jul 2007 17:10:55 GMT Message-Id: <200707201710.l6KHAt4W000820@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 123809 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, 20 Jul 2007 17:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123809 Change 123809 by rwatson@rwatson_zoo on 2007/07/20 17:10:42 security.audit has been added to audit.c and is no longer required here. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#46 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#46 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -56,9 +55,6 @@ #include #include -SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, - "TrustedBSD audit controls"); - #ifdef AUDIT /* From owner-p4-projects@FreeBSD.ORG Fri Jul 20 17:22:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CDF116A41A; Fri, 20 Jul 2007 17:22:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF0F716A417 for ; Fri, 20 Jul 2007 17:22:10 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD69813C4B6 for ; Fri, 20 Jul 2007 17:22:10 +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 l6KHMAwQ001604 for ; Fri, 20 Jul 2007 17:22:10 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KHMA9O001601 for perforce@freebsd.org; Fri, 20 Jul 2007 17:22:10 GMT (envelope-from loafier@FreeBSD.org) Date: Fri, 20 Jul 2007 17:22:10 GMT Message-Id: <200707201722.l6KHMA9O001601@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 123811 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, 20 Jul 2007 17:22:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=123811 Change 123811 by loafier@chrisdsoc on 2007/07/20 17:21:29 Used bus_alloc_resources, changed write functions. Sound still plays Affected files ... .. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/solo.c#2 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/solo.c#2 (text+ko) ==== @@ -86,9 +86,28 @@ u_int32_t fmt, spd, blksz; }; +enum { + RES_IO, + RES_SB, + RES_VC, + RES_MPU, + RES_GP, + RES_IRQ, + RES_SZ +}; + +static struct resource_spec ess_res_spec[] = { + {SYS_RES_IOPORT, PCIR_BAR(0), RF_ACTIVE}, + {SYS_RES_IOPORT, PCIR_BAR(1), RF_ACTIVE}, + {SYS_RES_IOPORT, PCIR_BAR(2), RF_ACTIVE}, + {SYS_RES_IOPORT, PCIR_BAR(3), RF_ACTIVE}, + {SYS_RES_IOPORT, PCIR_BAR(4), RF_ACTIVE}, + {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE}, + {-1, 0, 0} +}; + struct ess_info { - struct resource *io, *sb, *vc, *mpu, *gp; /* I/O address for the board */ - struct resource *irq; + struct resource *res[RES_SZ]; void *ih; bus_dma_tag_t parent_dmat; @@ -112,8 +131,9 @@ #define ess_lock_assert(_ess) #endif -static int ess_rd(struct ess_info *sc, int reg); -static void ess_wr(struct ess_info *sc, int reg, u_int8_t val); +#define ess_rd(_sc, _reg) bus_read_1((_sc)->res[RES_SB], _reg) +#define ess_wr(_sc, _reg, _val) bus_write_1((_sc)->res[RES_SB], _reg, _val) + static int ess_dspready(struct ess_info *sc); static int ess_cmd(struct ess_info *sc, u_char val); static int ess_cmd1(struct ess_info *sc, u_char cmd, int val); @@ -147,55 +167,6 @@ */ static int -port_rd(struct resource *port, int regno, int size) -{ - bus_space_tag_t st = rman_get_bustag(port); - bus_space_handle_t sh = rman_get_bushandle(port); - - switch (size) { - case 1: - return bus_space_read_1(st, sh, regno); - case 2: - return bus_space_read_2(st, sh, regno); - case 4: - return bus_space_read_4(st, sh, regno); - default: - return 0xffffffff; - } -} - -static void -port_wr(struct resource *port, int regno, u_int32_t data, int size) -{ - bus_space_tag_t st = rman_get_bustag(port); - bus_space_handle_t sh = rman_get_bushandle(port); - - switch (size) { - case 1: - bus_space_write_1(st, sh, regno, data); - break; - case 2: - bus_space_write_2(st, sh, regno, data); - break; - case 4: - bus_space_write_4(st, sh, regno, data); - break; - } -} - -static int -ess_rd(struct ess_info *sc, int reg) -{ - return port_rd(sc->sb, reg, 1); -} - -static void -ess_wr(struct ess_info *sc, int reg, u_int8_t val) -{ - port_wr(sc->sb, reg, val, 1); -} - -static int ess_dspready(struct ess_info *sc) { return ((ess_rd(sc, SBDSP_STATUS) & 0x80) == 0); @@ -767,17 +738,18 @@ KASSERT(ch == 1 || ch == 2, ("bad ch")); sc->dmasz[ch - 1] = cnt; if (ch == 1) { - port_wr(sc->vc, 0x8, 0xc4, 1); /* command */ - port_wr(sc->vc, 0xd, 0xff, 1); /* reset */ - port_wr(sc->vc, 0xf, 0x01, 1); /* mask */ - port_wr(sc->vc, 0xb, dir == PCMDIR_PLAY? 0x58 : 0x54, 1); /* mode */ - port_wr(sc->vc, 0x0, base, 4); - port_wr(sc->vc, 0x4, cnt - 1, 2); + bus_write_1(sc->res[RES_VC], 0x8, 0xc4); /* command */ + bus_write_1(sc->res[RES_VC], 0xd, 0xff); /* reset */ + bus_write_1(sc->res[RES_VC], 0xf, 0x01); /* mask */ + bus_write_1(sc->res[RES_VC], 0xb, + dir == PCMDIR_PLAY? 0x58 : 0x54); /* mode */ + bus_write_4(sc->res[RES_VC], 0x0, base); + bus_write_2(sc->res[RES_VC], 0x4, cnt - 1); } else if (ch == 2) { - port_wr(sc->io, 0x6, 0x08, 1); /* autoinit */ - port_wr(sc->io, 0x0, base, 4); - port_wr(sc->io, 0x4, cnt, 2); + bus_write_1(sc->res[RES_IO], 0x6, 0x08); /* autoinit */ + bus_write_4(sc->res[RES_IO], 0x0, base); + bus_write_2(sc->res[RES_IO], 0x4, cnt); } return 0; } @@ -804,13 +776,13 @@ if (j > 1) printf("DMA count reg bogus: %04x & %04x\n", i, p); - i = port_rd(sc->vc, 0x4, 2) + 1; - p = port_rd(sc->vc, 0x4, 2) + 1; + i = bus_read_2(sc->res[RES_VC], 0x4) + 1; + p = bus_read_2(sc->res[RES_VC], 0x4) + 1; } while ((p > sc->dmasz[ch - 1] || i < p || (p - i) > 0x8) && j++ < 1000); ess_dmatrigger(sc, ch, 1); } else if (ch == 2) - p = port_rd(sc->io, 0x4, 2); + p = bus_read_2(sc->res[RES_IO], 0x4); return sc->dmasz[ch - 1] - p; } @@ -819,46 +791,24 @@ { KASSERT(ch == 1 || ch == 2, ("bad ch")); if (ch == 1) - port_wr(sc->vc, 0xf, go? 0x00 : 0x01, 1); /* mask */ + bus_write_1(sc->res[RES_VC], 0xf, go? 0x00 : 0x01); /* mask */ else if (ch == 2) - port_wr(sc->io, 0x6, 0x08 | (go? 0x02 : 0x00), 1); /* autoinit */ + bus_write_1(sc->res[RES_IO], 0x6, + 0x08 | (go? 0x02 : 0x00)); /* autoinit */ return 0; } static void ess_release_resources(struct ess_info *sc, device_t dev) { - if (sc->irq) { + if (sc->res[RES_IRQ]) { if (sc->ih) - bus_teardown_intr(dev, sc->irq, sc->ih); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq); - sc->irq = 0; + bus_teardown_intr(dev, sc->res[RES_IRQ], sc->ih); + sc->ih = NULL; } - if (sc->io) { - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), sc->io); - sc->io = 0; - } - - if (sc->sb) { - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(1), sc->sb); - sc->sb = 0; - } - - if (sc->vc) { - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(2), sc->vc); - sc->vc = 0; - } + + bus_release_resources(dev, ess_res_spec, sc->res); - if (sc->mpu) { - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(3), sc->mpu); - sc->mpu = 0; - } - - if (sc->gp) { - bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(4), sc->gp); - sc->gp = 0; - } - if (sc->parent_dmat) { bus_dma_tag_destroy(sc->parent_dmat); sc->parent_dmat = 0; @@ -875,40 +825,6 @@ } static int -ess_alloc_resources(struct ess_info *sc, device_t dev) -{ - int rid; - - rid = PCIR_BAR(0); - sc->io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - rid = PCIR_BAR(1); - sc->sb = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - rid = PCIR_BAR(2); - sc->vc = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - rid = PCIR_BAR(3); - sc->mpu = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - rid = PCIR_BAR(4); - sc->gp = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - rid = 0; - sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE | RF_SHAREABLE); - -#if ESS18XX_MPSAFE == 1 - sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_solo softc"); - - return (sc->irq && sc->io && sc->sb && sc->vc && - sc->mpu && sc->gp && sc->lock)? 0 : ENXIO; -#else - return (sc->irq && sc->io && sc->sb && sc->vc && sc->mpu && sc->gp)? 0 : ENXIO; -#endif -} - -static int ess_probe(device_t dev) { char *s = NULL; @@ -954,7 +870,7 @@ pci_write_config(dev, PCIR_COMMAND, data, 2); data = pci_read_config(dev, PCIR_COMMAND, 2); - ddma = rman_get_start(sc->vc) | 1; + ddma = rman_get_start(sc->res[RES_VC]) | 1; pci_write_config(dev, ESS_PCI_LEGACYCONTROL, 0x805f, 2); pci_write_config(dev, ESS_PCI_DDMACONTROL, ddma, 2); pci_write_config(dev, ESS_PCI_CONFIG, 0, 2); @@ -970,7 +886,7 @@ if (sc->newspeed) ess_setmixer(sc, 0x71, 0x2a); - port_wr(sc->io, 0x7, 0xb0, 1); /* enable irqs */ + bus_write_1(sc->res[RES_IO], 0x7, 0xb0); /* enable irqs */ ess_unlock(sc); return 0; @@ -992,17 +908,23 @@ pci_write_config(dev, PCIR_COMMAND, data, 2); data = pci_read_config(dev, PCIR_COMMAND, 2); - if (ess_alloc_resources(sc, dev)) + if (bus_alloc_resources(dev, ess_res_spec, sc->res) != 0) goto no; +#if ESS18XX_MPSAFE == 1 + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_solo softc"); + if (sc->lock == NULL) + goto no; +#endif + sc->bufsz = pcm_getbuffersize(dev, 4096, SOLO_DEFAULT_BUFSZ, 65536); - ddma = rman_get_start(sc->vc) | 1; + ddma = rman_get_start(sc->res[RES_VC]) | 1; pci_write_config(dev, ESS_PCI_LEGACYCONTROL, 0x805f, 2); pci_write_config(dev, ESS_PCI_DDMACONTROL, ddma, 2); pci_write_config(dev, ESS_PCI_CONFIG, 0, 2); - port_wr(sc->io, 0x7, 0xb0, 1); /* enable irqs */ + bus_write_1(sc->res[RES_IO], 0x7, 0xb0); /* enable irqs */ #ifdef ESS18XX_DUPLEX sc->duplex = 1; #else @@ -1014,7 +936,7 @@ #else sc->newspeed = 0; #endif - if (snd_setup_intr(dev, sc->irq, + if (snd_setup_intr(dev, sc->res[RES_IRQ], #if ESS18XX_MPSAFE == 1 INTR_MPSAFE #else @@ -1058,15 +980,18 @@ goto no; snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld %s", - rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc), - rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo)); + rman_get_start(sc->res[RES_IO]), + rman_get_start(sc->res[RES_SB]), + rman_get_start(sc->res[RES_VC]), + rman_get_start(sc->res[RES_IRQ]), + PCM_KLDSTRING(snd_solo)); if (pcm_register(dev, sc, 1, 1)) goto no; pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc); pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc); pcm_setstatus(dev, status); - + return 0; no: From owner-p4-projects@FreeBSD.ORG Fri Jul 20 17:23:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7186F16A41F; Fri, 20 Jul 2007 17:23:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DF6A16A41A for ; Fri, 20 Jul 2007 17:23:13 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C4EB13C47E for ; Fri, 20 Jul 2007 17:23:13 +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 l6KHNDOL001648 for ; Fri, 20 Jul 2007 17:23:13 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KHNCam001645 for perforce@freebsd.org; Fri, 20 Jul 2007 17:23:12 GMT (envelope-from taleks@FreeBSD.org) Date: Fri, 20 Jul 2007 17:23:12 GMT Message-Id: <200707201723.l6KHNCam001645@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 123812 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, 20 Jul 2007 17:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=123812 Change 123812 by taleks@taleks_th on 2007/07/20 17:22:11 all: added license, updated rest of files with style problems, added debug macro for modules, which produces too many debug output, printf() format characters changed in many places to be more correct.. Some other cosmetic changes. pxe_http: started implementing of keep-alive connections, previous pxe_get() became pxe_get_close() function, which closes connection after every reading operation. Some changes also in parameter types. pxe_connection: added pxe_force_filter_release() and force_alloc_connection() functions to use structures for connections in TIME_WAIT state, if there are no other free structures. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#10 edit .. //depot/projects/soc2007/taleks-pxe_http/httpfs.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/httpfs.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_await.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_conv.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_conv.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#22 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#18 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_http.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#13 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.S#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_mem.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_mem.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#15 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#13 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.h#5 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#10 (text+ko) ==== @@ -17,4 +17,19 @@ #CFLAGS+= -DPXE_DEBUG #CFLAGS+= -DPXE_DEBUG_HELL +# core module debug +#CFLAGS+= -DPXE_CORE_DEBUG_HELL +#CFLAGS+= -DPXE_CORE_DEBUG +# TCP module debug +#CFLAGS+= -DPXE_TCP_DEBUG +#CFLAGS+= -DPXE_TCP_DEBUG_HELL +# IP module debug +#CFLAGS+= -DPXE_IP_DEBUG +#CFLAGS+= -DPXE_IP_DEBUG_HELL +# ARP module debug +#CFLAGS+= -DPXE_ARP_DEBUG +#CFLAGS+= -DPXE_ARP_DEBUG_HELL +# httpfs module +#CFLAGS+= -DPXE_HTTP_DEBUG + .include ==== //depot/projects/soc2007/taleks-pxe_http/httpfs.c#3 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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 #include @@ -28,6 +55,9 @@ void handle_cleanup(PXE_HTTP_HANDLE *httpfile) { + if (httpfile == NULL) + return; + if (httpfile->buf != NULL) free(httpfile->buf); @@ -37,22 +67,30 @@ if (httpfile->servername != NULL) free(httpfile->servername); + if (httpfile->socket != -1) + pxe_close(httpfile->socket); + free(httpfile); } static int http_open(const char *path, struct open_file *f) { +#ifdef PXE_HTTP_DEBUG + printf("http_open(): %s\n", path); +#endif PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *)malloc(sizeof(PXE_HTTP_HANDLE)); - if (!httpfile) + if (httpfile == NULL) return (ENOMEM); pxe_memset(httpfile, 0, sizeof(PXE_HTTP_HANDLE)); httpfile->ip = pxe_get_ip32(PXE_IP_WWW); httpfile->offset = 0; + httpfile->socket = -1; + httpfile->filename = strdup(path); if (httpfile->filename == NULL) { @@ -65,7 +103,7 @@ PXE_IPADDR server; server.ip = httpfile->ip; - httpfile->servername = malloc(16); + httpfile->servername = strdup(inet_ntoa(server.ip)); if (httpfile->servername == NULL) { handle_cleanup(httpfile); @@ -94,15 +132,49 @@ http_read(struct open_file *f, void *addr, size_t size, size_t *resid) { PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *) f->f_fsdata; + + if (httpfile == NULL) { + printf("http_read(): NULL file descriptor.\n"); + return (EINVAL); + } + +#ifdef PXE_HTTP_DEBUG + printf("http_read(): %s:%llu+%lu\n", + httpfile->filename, httpfile->offset, size); +#endif + if (((httpfile->size != PXE_HTTP_SIZE_UNKNOWN) && + (httpfile->offset >= httpfile->size)) || + (size == 0)) + { + if (resid) + *resid = size; +#ifdef PXE_HTTP_DEBUG + printf("http_read(): EOF\n"); +#endif + return (0); + } + + size_t to_read = (httpfile->offset + size < httpfile->size) ? + size: httpfile->size - (size_t)httpfile->offset; + + int result = pxe_get(httpfile, to_read, addr); - int result = pxe_get(httpfile, size, addr); - if (result == -1) { + printf("http_read(): failed to read\n"); return (EINVAL); } + httpfile->offset += result; + +#ifdef PXE_HTTP_DEBUG + if (httpfile->size != PXE_HTTP_SIZE_UNKNOWN) + printf("http_read(): %llu bytes read (%llu %% read)\n", + httpfile->offset, 100LL * httpfile->offset / httpfile->size); + else + printf("http_read(): %llu byte(s) read\n", httpfile->offset); +#endif if (resid) - *resid = result; + *resid = size - result; return (0); } @@ -112,6 +184,9 @@ { PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *) f->f_fsdata; +#ifdef PXE_HTTP_DEBUG + printf("http_close(): closing file %s\n", httpfile->filename); +#endif handle_cleanup(httpfile); return (0); @@ -127,12 +202,17 @@ static int http_stat(struct open_file *f, struct stat *sb) { - + PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *) f->f_fsdata; + +#ifdef PXE_HTTP_DEBUG + printf("http_stat(): stat for file %s\n", httpfile->filename); +#endif sb->st_mode = 0444 | S_IFREG; sb->st_nlink = 1; sb->st_uid = 0; sb->st_gid = 0; - sb->st_size = -1; + + sb->st_size = (httpfile != NULL) ? httpfile->size : -1; return (0); } @@ -141,6 +221,10 @@ http_seek(struct open_file *f, off_t offset, int where) { PXE_HTTP_HANDLE *httpfile = (PXE_HTTP_HANDLE *) f->f_fsdata; + +#ifdef PXE_HTTP_DEBUG + printf("http_seek(): file 0x%x\n", httpfile); +#endif if (httpfile == NULL) { /* to be sure */ errno = EINVAL; ==== //depot/projects/soc2007/taleks-pxe_http/httpfs.h#3 (text+ko) ==== @@ -1,8 +1,39 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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. + * + */ + #ifndef HTTPFS_INCLUDED #define HTTPFS_INCLUDED +/* + * Implements httpfs - illusion of filesystem through http + */ + #include extern struct fs_ops http_fsops; -#endif+#endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#12 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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 #include "pxe_arp.h" @@ -21,7 +48,7 @@ void pxe_arp_init() { -#ifdef PXE_DEBUG +#ifdef PXE_ARP_DEBUG printf("pxe_arp_init() started.\n"); if (packet_to_send.hdr.hsize != 0) { @@ -63,7 +90,7 @@ const MAC_ADDR * pxe_arp_table_search(uint32_t ip) { -#ifdef PXE_DEBUG_HELL +#ifdef PXE_ARP_DEBUG_HELL printf("pxe_arp_table_search(): started\n"); #endif int entry = 0; @@ -73,7 +100,7 @@ if (arp_table[entry].ip4.ip == ip) { uint8_t *mac = &arp_table[entry].mac[0]; -#ifdef PXE_DEBUG_HELL +#ifdef PXE_ARP_DEBUG_HELL printf("pxe_arp_table_search(): %6D\n", mac, ":"); #endif return (const MAC_ADDR *)mac; @@ -125,7 +152,7 @@ int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function) { -#ifdef PXE_DEBUG_HELL +#ifdef PXE_ARP_DEBUG_HELL printf("pxe_arp_protocol() started.\n"); #endif PXE_ARP_PACK_DATA *arp_reply = (PXE_ARP_PACK_DATA *)pack->raw_data; @@ -142,13 +169,13 @@ if (ip4_src.ip == pxe_get_ip32(PXE_IP_MY)) { /* got broadcast send by us */ -#ifdef PXE_DEBUG_HELL +#ifdef PXE_ARP_DEBUG_HELL printf("arp request from myself ignored.\n"); #endif return (0); } -#ifdef PXE_DEBUG +#ifdef PXE_ARP_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], @@ -220,7 +247,7 @@ const MAC_ADDR *kmac = pxe_arp_table_search(arp_reply->body.src_paddr); if (NULL != kmac) { -#ifdef PXE_DEBUG +#ifdef PXE_ARP_DEBUG 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], @@ -240,7 +267,7 @@ ++arp_usage; -#ifdef PXE_DEBUG_HELL +#ifdef PXE_ARP_DEBUG_HELL printf("pxe_arp_protocol(): arp usage = %d\n", arp_usage); #endif @@ -259,7 +286,6 @@ int pxe_arp_send_whois(uint32_t ip) { - PXE_PACKET pack; pack.raw_size = sizeof(PXE_ARP_PACK_DATA); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#8 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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. + * + */ + #ifndef PXE_ARP_H #define PXE_ARP_H ==== //depot/projects/soc2007/taleks-pxe_http/pxe_await.c#3 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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 #include "pxe_await.h" @@ -89,4 +116,4 @@ */ return (0); } - + ==== //depot/projects/soc2007/taleks-pxe_http/pxe_await.h#4 (text+ko) ==== @@ -1,6 +1,37 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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. + * + */ + #ifndef PXE_AWAIT_H_INCLUDED #define PXE_AWAIT_H_INCLUDED +/* + * Implements await functions wrapper + */ + #include /* await callback function type */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#7 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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 + #include "pxe_buffer.h" #include "pxe_mem.h" @@ -12,8 +41,19 @@ uint16_t pxe_buffer_write(PXE_BUFFER *buf, const void *from, uint16_t size) { + + if (buf == NULL) { + printf("pxe_buffer_write(): NULL buffer\n"); + return (0); + } + uint16_t to_write = (size < buf->bufleft) ? size : buf->bufleft; + if (buf->data == NULL) { + printf("pxe_buffer_write(): NULL buffer data\n"); + return (0); + } + #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, @@ -68,13 +108,23 @@ uint16_t pxe_buffer_read(PXE_BUFFER *buf, void *to, uint16_t size) { + + if (buf == NULL) { + printf("pxe_buffer_read(): NULL buffer\n"); + return (0); + } + + if (buf->data == NULL) { + printf("pxe_buffer_read(): NULL buffer data\n"); + return (0); + } + uint16_t usage = buf->bufsize - buf->bufleft; uint16_t to_read = (size <= usage) ? size : usage; - + if (to_read == 0) /* nothing to read */ return (0); - uint16_t fstart = buf->fstart; uint16_t fend = buf->fend; uint16_t bufsize = buf->bufsize; @@ -127,6 +177,13 @@ pxe_buffer_space(PXE_BUFFER *buffer) { + if (buffer == NULL) { +#ifdef PXE_DEBUG + printf("pxe_buffer_space(): NULL buffer\n"); +#endif + return (0); + } + return (buffer->bufleft); } @@ -142,11 +199,21 @@ pxe_buffer_memalloc(PXE_BUFFER *buffer, uint16_t size) { + if (buffer == NULL) { +#ifdef PXE_DEBUG + printf("pxe_buffer_memalloc(): NULL buffer\n"); +#endif + return (0); + } + if (buffer->data == NULL) { /* alloc if not already allocated */ buffer->data = pxe_alloc(size); if (buffer->data == NULL) return (0); + } else { + printf("pxe_buffer_memalloc(): already %u bytes, asked %u.\n", + buffer->bufsize, size); } buffer->bufsize = size; @@ -155,7 +222,7 @@ buffer->fend = size; #ifdef PXE_DEBUG_HELL - printf("pxe_buffer_memalloc(): buffer 0x%x, data 0x%x.\n", + printf("pxe_buffer_memalloc(): buffer 0x%x, data 0x%x, bufleft %u.\n", buffer, buffer->data, buffer->bufleft ); #endif @@ -172,8 +239,17 @@ pxe_buffer_memfree(PXE_BUFFER *buffer) { - if (buffer->data == NULL) /* already released */ + if (buffer == NULL) { +#ifdef PXE_DEBUG + printf("pxe_buffer_memfree(): NULL buffer\n"); +#endif + return; + } + + if (buffer->data == NULL) { /* already released */ + printf("pxe_buffer_memfree(): already released.\n"); return; + } #ifdef PXE_DEBUG_HELL printf("pxe_buffer_memfree(): buffer 0x%x, data 0x%x, bufleft: %d.\n", @@ -181,4 +257,5 @@ ); #endif pxe_free(buffer->data); + buffer->data = NULL; } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#7 (text+ko) ==== @@ -1,6 +1,37 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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. + * + */ + #ifndef PXE_BUFFER_H_INCLUDED #define PXE_BUFFER_H_INCLUDED +/* + * Implements cyclic buffer routines + */ + #include /* buffer size choosed by default for sending/recieving */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#9 (text+ko) ==== @@ -1,3 +1,30 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 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 #include "pxe_await.h" @@ -48,6 +75,7 @@ PXE_TCP_CONNECTION * alloc_connection() { + if (all_connections == PXE_MAX_TCP_CONNECTIONS) return (NULL); @@ -66,6 +94,78 @@ return (NULL); } +/* force_alloc_connection() - returns pointer to free connection structure + * forces connection structures in TIME_WAIT state to + * be allocated if there are no free connection + * structure. + * in: + * none + * out: + * NULL - failed to alloc + * non NULL- pointer to allocated structure + */ +PXE_TCP_CONNECTION * +force_alloc_connection() +{ + + if (all_connections < PXE_MAX_TCP_CONNECTIONS) + return alloc_connection(); + + uint16_t index = 0; + + for ( ; index < PXE_MAX_TCP_CONNECTIONS; ++index) { + + if (tcp_connections[index].state == PXE_TCP_TIME_WAIT) { + + tcp_connections[index].state = PXE_TCP_CLOSED; + + /* release filter */ + PXE_FILTER_ENTRY *filter = tcp_connections[index].filter; + + if (filter != NULL) /* it must always be non NULL */ + pxe_filter_remove(filter); +#ifdef PXE_TCP_DEBUG + printf("force_alloc_connection(): forced allocation\n"); +#endif + return &tcp_connections[index]; + } + } + + return (NULL); +} + +/* pxe_force_filter_release() - releases filter if used by connections + * in TIME_WAIT state. Needed when filters table + * is full, but there are no really active connections. + * in/out: + * none + */ +void +pxe_force_filter_release() +{ + uint16_t index = 0; + + for ( ; index < PXE_MAX_TCP_CONNECTIONS; ++index) { + + if (tcp_connections[index].state == PXE_TCP_TIME_WAIT) { + /* free also connection structure */ + tcp_connections[index].state = PXE_TCP_CLOSED; + + /* release filter */ + PXE_FILTER_ENTRY *filter = tcp_connections[index].filter; + + if (filter != NULL) /* it must always be non NULL */ + pxe_filter_remove(filter); + + all_connections -= 1; +#ifdef PXE_TCP_DEBUG + printf("pxe_force_filter_release(): filter released.\n"); +#endif + break; + } + } +} + /* free_connection() - releases connections * in: * connection - pointer to connection to release @@ -79,6 +179,9 @@ connection->state = PXE_TCP_CLOSED; all_connections -= 1; +#ifdef PXE_TCP_DEBUG_HELL + printf("free_connection(): %d connections used\n", all_connections); +#endif } /* tcp_await() - await function for some TCP protocol functions (handshaking, @@ -133,16 +236,18 @@ pxe_tcp_connect(PXE_SOCKET *sock) { - if (all_connections == PXE_MAX_TCP_CONNECTIONS) { - printf("pxe_tcp_connections(): too many connections.\n"); +/* if (all_connections == PXE_MAX_TCP_CONNECTIONS) { + printf("pxe_tcp_connect(): too many connections.\n"); return (0); } - +*/ PXE_FILTER_ENTRY *filter = sock->filter; - PXE_TCP_CONNECTION *connection = alloc_connection(); + PXE_TCP_CONNECTION *connection = force_alloc_connection(); - if (connection == NULL) + if (connection == NULL) { + printf("pxe_tcp_connect(): too many connections.\n"); return (0); + } pxe_memset(connection, 0, sizeof(PXE_TCP_CONNECTION)); @@ -171,7 +276,7 @@ connection->state = PXE_TCP_SYN_SENT; connection->next_send = connection->iss + 1; -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_connect(): new state - SYN_SENT\n"); #endif PXE_TCP_WAIT_DATA wait_data; @@ -189,7 +294,7 @@ return (0); } -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_connect(): connection established.\n"); #endif return (1); @@ -205,20 +310,23 @@ int pxe_tcp_disconnect(PXE_SOCKET *sock) { -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_disconnect(): started.\n"); #endif PXE_FILTER_ENTRY *filter = sock->filter; if (filter == NULL) { /* NULL filters means there are no connection for socket */ + printf("pxe_tcp_disconnect(): NULL filter\n"); return (1); } PXE_TCP_CONNECTION *connection = filter_to_connection(filter); - if (connection == NULL) + if (connection == NULL) { + printf("pxe_tcp_disconnect(): NULL connection\n"); return (0); + } /* process recieved, queued but not processed packets. * This is useful if server requested breaking of connection @@ -227,8 +335,8 @@ */ pxe_core_recv_packets(); - if (connection->state == PXE_TCP_CLOSED) { /* already closed */ -#ifdef PXE_DEBUG + if ( connection->state == PXE_TCP_CLOSED) { /* already closed */ +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_disconnect(): connection already is closed.\n"); #endif return (1); @@ -248,7 +356,7 @@ if (connection->state == PXE_TCP_ESTABLISHED) { /* active closing by our host */ connection->state = PXE_TCP_FIN_WAIT1; -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); #endif wait_data.state = PXE_TCP_TIME_WAIT; @@ -267,16 +375,22 @@ /* failed to get expected state */ free_connection(connection); - if (connection->state != PXE_TCP_CLOSED) + if (connection->state != PXE_TCP_CLOSED) { +#ifdef PXE_TCP_DEBUG + printf("pxe_tcp_disconnect(): felt to wrong state.\n"); +#endif return (0); + } } - if (connection->state == PXE_TCP_CLOSED) + if (connection->state == PXE_TCP_CLOSED) { pxe_filter_remove(filter); - + free_connection(connection); + } + pxe_resend_free(connection); -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_disconnect(): connection closed.\n"); #endif return (1); @@ -514,7 +628,7 @@ int pxe_tcp_check_connection(PXE_SOCKET *sock) { -#ifdef PXE_DEBUG +#ifdef PXE_TCP_DEBUG printf("pxe_tcp_check_connection(): started.\n"); #endif PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); @@ -554,7 +668,7 @@ void pxe_connection_stats() { - printf("pxe_connection_stats():\n"); + printf("pxe_connection_stats(): %d connections\n", all_connections); int con_index = 0; PXE_TCP_CONNECTION *connection = NULL; @@ -564,8 +678,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", + " nxt_snd: %lu, nxt_rcv: %lu, iss: %lu, irs: %lu\n", con_index, connection->filter, connection->state, - connection->next_send, connection->next_recv); + connection->next_send, connection->next_recv, + connection->iss, connection->irs); } } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#7 (text+ko) ==== @@ -1,6 +1,37 @@ +/*- + * Copyright (c) 2007 Alexey Tarasov + * 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 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 18:22:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94D3016A41F; Fri, 20 Jul 2007 18:22:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6931216A41B for ; Fri, 20 Jul 2007 18:22:30 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 572F213C48D for ; Fri, 20 Jul 2007 18:22:30 +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 l6KIMUdT010742 for ; Fri, 20 Jul 2007 18:22:30 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KIMUud010739 for perforce@freebsd.org; Fri, 20 Jul 2007 18:22:30 GMT (envelope-from loafier@FreeBSD.org) Date: Fri, 20 Jul 2007 18:22:30 GMT Message-Id: <200707201822.l6KIMUud010739@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 123815 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, 20 Jul 2007 18:22:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123815 Change 123815 by loafier@chrisdsoc on 2007/07/20 18:21:42 Used pci_enable_busmaster() and pci_enable_io() Affected files ... .. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/solo.c#3 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/solo.c#3 (text+ko) ==== @@ -861,14 +861,11 @@ ess_resume(device_t dev) { uint16_t ddma; - uint32_t data; struct ess_info *sc = pcm_getdevinfo(dev); ess_lock(sc); - data = pci_read_config(dev, PCIR_COMMAND, 2); - data |= PCIM_CMD_PORTEN | PCIM_CMD_BUSMASTEREN; - pci_write_config(dev, PCIR_COMMAND, data, 2); - data = pci_read_config(dev, PCIR_COMMAND, 2); + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_IOPORT); ddma = rman_get_start(sc->res[RES_VC]) | 1; pci_write_config(dev, ESS_PCI_LEGACYCONTROL, 0x805f, 2); @@ -900,13 +897,10 @@ struct ess_info *sc; char status[SND_STATUSLEN]; u_int16_t ddma; - u_int32_t data; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); - data = pci_read_config(dev, PCIR_COMMAND, 2); - data |= PCIM_CMD_PORTEN | PCIM_CMD_BUSMASTEREN; - pci_write_config(dev, PCIR_COMMAND, data, 2); - data = pci_read_config(dev, PCIR_COMMAND, 2); + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_IOPORT); if (bus_alloc_resources(dev, ess_res_spec, sc->res) != 0) goto no; From owner-p4-projects@FreeBSD.ORG Fri Jul 20 18:58:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 829BD16A421; Fri, 20 Jul 2007 18:58:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00BF716A41B for ; Fri, 20 Jul 2007 18:58:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E35CF13C428 for ; Fri, 20 Jul 2007 18:58:14 +0000 (UTC) (envelope-from peter@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 l6KIwExM012774 for ; Fri, 20 Jul 2007 18:58:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KIwEVK012771 for perforce@freebsd.org; Fri, 20 Jul 2007 18:58:14 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 18:58:14 GMT Message-Id: <200707201858.l6KIwEVK012771@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 123816 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, 20 Jul 2007 18:58:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=123816 Change 123816 by peter@peter_overcee on 2007/07/20 18:57:27 Check in silby's tcp patch. Affected files ... .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#44 edit Differences ... ==== //depot/projects/hammer/sys/netinet/tcp_syncache.c#44 (text+ko) ==== @@ -142,7 +142,6 @@ struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; struct callout sch_timer; - int sch_nextc; u_int sch_length; u_int sch_oddeven; u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; @@ -233,16 +232,10 @@ #define ENDPTS6_EQ(a, b) (memcmp(a, b, sizeof(*a)) == 0) -#define SYNCACHE_TIMEOUT(sc, sch, co) do { \ +#define SYNCACHE_TIMEOUT(sc) do { \ (sc)->sc_rxmits++; \ (sc)->sc_rxttime = ticks + \ TCPTV_RTOBASE * tcp_backoff[(sc)->sc_rxmits - 1]; \ - if ((sch)->sch_nextc > (sc)->sc_rxttime) \ - (sch)->sch_nextc = (sc)->sc_rxttime; \ - if (!TAILQ_EMPTY(&(sch)->sch_bucket) && !(co)) \ - callout_reset(&(sch)->sch_timer, \ - (sch)->sch_nextc - ticks, \ - syncache_timer, (void *)(sch)); \ } while (0) #define SCH_LOCK(sch) mtx_lock(&(sch)->sch_mtx) @@ -268,6 +261,7 @@ syncache_init(void) { int i; + struct syncache_head *sch; tcp_syncache.cache_count = 0; tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; @@ -310,6 +304,17 @@ tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(tcp_syncache.zone, tcp_syncache.cache_limit); + + /* + * Start the syncache head timers running. They each run ten times + * a second, and are spread out so that they are not all running on + * the same clock tick. + */ + for (i = 0; i < tcp_syncache.hashsize; i++) { + sch = &tcp_syncache.hashbase[i]; + callout_reset(&(sch)->sch_timer, i * (hz / 10), + syncache_timer, (void *)(sch)); + } } /* @@ -339,8 +344,8 @@ TAILQ_INSERT_HEAD(&sch->sch_bucket, sc, sc_hash); sch->sch_length++; - /* Reinitialize the bucket row's timer. */ - SYNCACHE_TIMEOUT(sc, sch, 1); + /* Set the retransmit timer for this socket. */ + SYNCACHE_TIMEOUT(sc); SCH_UNLOCK(sch); @@ -391,8 +396,6 @@ * host does the SYN/ACK->ACK. */ if (sc->sc_rxttime >= tick) { - if (sc->sc_rxttime < sch->sch_nextc) - sch->sch_nextc = sc->sc_rxttime; continue; } @@ -409,11 +412,10 @@ (void) syncache_respond(sc); tcpstat.tcps_sc_retransmitted++; - SYNCACHE_TIMEOUT(sc, sch, 0); + SYNCACHE_TIMEOUT(sc); } - if (!TAILQ_EMPTY(&(sch)->sch_bucket)) - callout_reset(&(sch)->sch_timer, (sch)->sch_nextc - tick, - syncache_timer, (void *)(sch)); + callout_reset(&(sch)->sch_timer, hz / 10, + syncache_timer, (void *)(sch)); } /* @@ -995,7 +997,7 @@ ("%s: label not initialized", __func__)); #endif if (syncache_respond(sc) == 0) { - SYNCACHE_TIMEOUT(sc, sch, 1); + SYNCACHE_TIMEOUT(sc); tcpstat.tcps_sndacks++; tcpstat.tcps_sndtotal++; } From owner-p4-projects@FreeBSD.ORG Fri Jul 20 18:58:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C506716A535; Fri, 20 Jul 2007 18:58:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C7CE16A420 for ; Fri, 20 Jul 2007 18:58:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B40113C459 for ; Fri, 20 Jul 2007 18:58:15 +0000 (UTC) (envelope-from peter@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 l6KIwFVM012781 for ; Fri, 20 Jul 2007 18:58:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KIwE22012777 for perforce@freebsd.org; Fri, 20 Jul 2007 18:58:14 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 18:58:14 GMT Message-Id: <200707201858.l6KIwE22012777@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 123817 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, 20 Jul 2007 18:58:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123817 Change 123817 by peter@peter_overcee on 2007/07/20 18:58:11 Lower the SIO fifo trigger threshold one click. This seems to stop the regular sio overflows on my amd64 box. Affected files ... .. //depot/projects/hammer/sys/dev/sio/sio.c#55 edit Differences ... ==== //depot/projects/hammer/sys/dev/sio/sio.c#55 (text+ko) ==== @@ -1820,7 +1820,7 @@ */ com->fifo_image = com->unit == siotsunit ? 0 : t->c_ispeed <= 4800 - ? FIFO_ENABLE : FIFO_ENABLE | FIFO_RX_MEDH; + ? FIFO_ENABLE : FIFO_ENABLE | FIFO_RX_MEDL; #ifdef COM_ESP /* * The Hayes ESP card needs the fifo DMA mode bit set From owner-p4-projects@FreeBSD.ORG Fri Jul 20 18:59:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 660EC16A419; Fri, 20 Jul 2007 18:59:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4326816A420 for ; Fri, 20 Jul 2007 18:59:17 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30D4513C461 for ; Fri, 20 Jul 2007 18:59:17 +0000 (UTC) (envelope-from peter@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 l6KIxH9I012831 for ; Fri, 20 Jul 2007 18:59:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KIxGK0012826 for perforce@freebsd.org; Fri, 20 Jul 2007 18:59:16 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 18:59:16 GMT Message-Id: <200707201859.l6KIxGK0012826@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 123818 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, 20 Jul 2007 18:59:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123818 Change 123818 by peter@peter_overcee on 2007/07/20 18:58:39 Fix guaranteed crash when ttys go away while a kevent is active. Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#54 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#54 (text+ko) ==== @@ -1319,6 +1319,8 @@ int s; tp = tty_gettp(dev); + if (tp->t_state & TS_GONE) + return (ENODEV); switch (kn->kn_filter) { case EVFILT_READ: @@ -1333,7 +1335,7 @@ return (EINVAL); } - kn->kn_hook = (caddr_t)dev; + kn->kn_hook = (caddr_t)tp; s = spltty(); knlist_add(klist, kn, 0); @@ -1345,7 +1347,7 @@ static void filt_ttyrdetach(struct knote *kn) { - struct tty *tp = ((struct cdev *)kn->kn_hook)->si_tty; + struct tty *tp = (struct tty *)kn->kn_hook; int s = spltty(); knlist_remove(&tp->t_rsel.si_note, kn, 0); @@ -1355,10 +1357,10 @@ static int filt_ttyread(struct knote *kn, long hint) { - struct tty *tp = ((struct cdev *)kn->kn_hook)->si_tty; + struct tty *tp = (struct tty *)kn->kn_hook; kn->kn_data = ttnread(tp); - if (ISSET(tp->t_state, TS_ZOMBIE)) { + if ((tp->t_state & TS_GONE) || ISSET(tp->t_state, TS_ZOMBIE)) { kn->kn_flags |= EV_EOF; return (1); } @@ -1368,7 +1370,7 @@ static void filt_ttywdetach(struct knote *kn) { - struct tty *tp = ((struct cdev *)kn->kn_hook)->si_tty; + struct tty *tp = (struct tty *)kn->kn_hook; int s = spltty(); knlist_remove(&tp->t_wsel.si_note, kn, 0); @@ -1378,10 +1380,10 @@ static int filt_ttywrite(struct knote *kn, long hint) { - struct tty *tp = ((struct cdev *)kn->kn_hook)->si_tty; + struct tty *tp = (struct tty *)kn->kn_hook; kn->kn_data = tp->t_outq.c_cc; - if (ISSET(tp->t_state, TS_ZOMBIE)) + if ((tp->t_state & TS_GONE) || ISSET(tp->t_state, TS_ZOMBIE)) return (1); return (kn->kn_data <= tp->t_olowat && ISSET(tp->t_state, TS_CONNECTED)); @@ -3015,11 +3017,19 @@ { tp->t_state |= TS_GONE; + if (SEL_WAITING(&tp->t_rsel)) + selwakeuppri(&tp->t_rsel, TTIPRI); + if (SEL_WAITING(&tp->t_wsel)) + selwakeuppri(&tp->t_wsel, TTOPRI); + if (ISSET(tp->t_state, TS_ASYNC) && tp->t_sigio != NULL) + pgsigio(&tp->t_sigio, SIGIO, (tp->t_session != NULL)); wakeup(&tp->t_dtr_wait); wakeup(TSA_CARR_ON(tp)); wakeup(TSA_HUP_OR_INPUT(tp)); wakeup(TSA_OCOMPLETE(tp)); wakeup(TSA_OLOWAT(tp)); + KNOTE_UNLOCKED(&tp->t_rsel.si_note, 0); + KNOTE_UNLOCKED(&tp->t_wsel.si_note, 0); tt_purge(tp); } @@ -3040,6 +3050,7 @@ ttygone(tp); unit = tp->t_devunit; destroy_dev(tp->t_mdev); + ttyrel(tp); /* release refcount from ttyalloc() */ free_unr(tty_unit, unit); } From owner-p4-projects@FreeBSD.ORG Fri Jul 20 19:00:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8821916A419; Fri, 20 Jul 2007 19:00:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42D9D16A417 for ; Fri, 20 Jul 2007 19:00:19 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25A5F13C45A for ; Fri, 20 Jul 2007 19:00:19 +0000 (UTC) (envelope-from peter@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 l6KJ0Jgb012949 for ; Fri, 20 Jul 2007 19:00:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KJ0Ijm012946 for perforce@freebsd.org; Fri, 20 Jul 2007 19:00:18 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 19:00:18 GMT Message-Id: <200707201900.l6KJ0Ijm012946@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 123819 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, 20 Jul 2007 19:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123819 Change 123819 by peter@peter_daintree on 2007/07/20 18:59:32 IFC @123810 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#8 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#29 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#11 integrate .. //depot/projects/hammer/sys/kern/tty.c#55 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#9 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1051 2007/07/15 01:59:35 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1052 2007/07/20 15:48:02 bmah Exp $ 2000 @@ -416,9 +416,14 @@ performance improvements. The ULE process scheduler has been revised to improve its - behavior, in particular interactivity under load. This - implementation can commonly be referred to as ULE - 2.0. + behavior, in particular interactivity under load, for both + uniprocessor and multiprocessor machines. This + implementation has commonly been referred to as ULE + 3.0. (ULE 3.0 was formerly known as SCHED_SMP, + which in turn was based on version 2.0 of the ULE scheduler. + ULE 2.0 was never a part of any &os; release, however it + was the subject of many development, testing, and + benchmarking efforts.) The SIGCHLD signal queuing has been added. For each child process whose status has been changed, @@ -836,6 +841,9 @@ net/iwi-firmware port/package. &merged; + The ixgbe driver, which supports the Intel 10G PCI-Express + adapter (82598), has been added. + The &man.le.4; driver, which supports AMD Am7900 LANCE and Am79C9xx PCnet NICs, has been added. While the &man.lnc.4; driver also supports these @@ -938,6 +946,14 @@ cards, as well as quarter- and half-channel support for 802.11a. &merged; + ISDN4BSD, &man.ng.h4.4;, and netatm have been temporarily + disconnected from the build. These modules all require + the Giant kernel lock for their operation; disconnecting + them allows the removal of the NET_NEEDS_GIANT compatability + shim and allows the &os; network stack to run completely + without the Giant kernel lock. It is planned to convert + these modules to fine-grained kernel locking and re-connect + them for &os; 7.1-RELEASE. ==== //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.66 2007/07/12 21:04:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.67 2007/07/20 11:14:51 rwatson Exp $"); #include #include @@ -227,6 +227,7 @@ printf("coda_unmount: ROOT: vp %p, cp %p\n", mi->mi_rootvp, VTOC(mi->mi_rootvp)); #endif vrele(mi->mi_rootvp); + vrele(coda_ctlvp); active = coda_kill(vfsp, NOT_DOWNCALL); ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); mi->mi_rootvp->v_vflag &= ~VV_ROOT; ==== //depot/projects/hammer/sys/fs/coda/coda_vnops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.75 2007/07/12 21:04:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.76 2007/07/20 11:14:51 rwatson Exp $"); #include #include @@ -745,11 +745,6 @@ /* We don't need to send inactive to venus - DCS */ MARK_ENTRY(CODA_INACTIVE_STATS); - if (IS_CTL_VP(vp)) { - MARK_INT_SAT(CODA_INACTIVE_STATS); - return 0; - } - CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %s, vfsp %p\n", coda_f2s(&cp->c_fid), vp->v_mount));) ==== //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.41 2007/07/12 16:09:07 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_fat.c,v 1.42 2007/07/20 16:21:47 bde Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -1105,7 +1105,7 @@ else bp->b_blkno = blkno; } - clrbuf(bp); + vfs_bio_clrbuf(bp); if (bpp) { *bpp = bp; bpp = NULL; ==== //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#29 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.170 2007/06/12 00:11:58 rwatson Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.172 2007/07/20 17:06:57 bde Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -579,6 +579,9 @@ if (uio->uio_offset >= dep->de_FileSize) break; lbn = de_cluster(pmp, uio->uio_offset); + rablock = lbn + 1; + blsize = pmp->pm_bpcluster; + on = uio->uio_offset & pmp->pm_crbomask; /* * If we are operating on a directory file then be sure to * do i/o with the vnode for the filesystem instead of the @@ -593,23 +596,22 @@ } else if (error) break; error = bread(pmp->pm_devvp, lbn, blsize, NOCRED, &bp); + } else if (de_cn2off(pmp, rablock) >= dep->de_FileSize) { + error = bread(vp, lbn, blsize, NOCRED, &bp); + } else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) { + error = cluster_read(vp, dep->de_FileSize, lbn, blsize, + NOCRED, on + uio->uio_resid, seqcount, &bp); + } else if (seqcount > 1) { + rasize = blsize; + error = breadn(vp, lbn, + blsize, &rablock, &rasize, 1, NOCRED, &bp); } else { - blsize = pmp->pm_bpcluster; - rablock = lbn + 1; - if (seqcount > 1 && - de_cn2off(pmp, rablock) < dep->de_FileSize) { - rasize = pmp->pm_bpcluster; - error = breadn(vp, lbn, blsize, - &rablock, &rasize, 1, NOCRED, &bp); - } else { - error = bread(vp, lbn, blsize, NOCRED, &bp); - } + error = bread(vp, lbn, blsize, NOCRED, &bp); } if (error) { brelse(bp); break; } - on = uio->uio_offset & pmp->pm_crbomask; diff = pmp->pm_bpcluster - on; n = diff > uio->uio_resid ? uio->uio_resid : diff; diff = dep->de_FileSize - uio->uio_offset; @@ -645,6 +647,7 @@ u_long osize; int error = 0; u_long count; + int seqcount; daddr_t bn, lastcn; struct buf *bp; int ioflag = ap->a_ioflag; @@ -730,6 +733,7 @@ } else lastcn = de_clcount(pmp, osize) - 1; + seqcount = ioflag >> IO_SEQSHIFT; do { if (de_cluster(pmp, uio->uio_offset) > lastcn) { error = ENOSPC; @@ -755,7 +759,7 @@ * then no need to read data from disk. */ bp = getblk(thisvp, bn, pmp->pm_bpcluster, 0, 0, 0); - clrbuf(bp); + vfs_bio_clrbuf(bp); /* * Do the bmap now, since pcbmap needs buffers * for the fat table. (see msdosfs_strategy) @@ -798,18 +802,31 @@ break; } + /* Prepare for clustered writes in some else clauses. */ + if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) + bp->b_flags |= B_CLUSTEROK; + /* - * If they want this synchronous then write it and wait for - * it. Otherwise, if on a cluster boundary write it - * asynchronously so we can move on to the next block - * without delay. Otherwise do a delayed write because we - * may want to write somemore into the block later. + * If IO_SYNC, then each buffer is written synchronously. + * Otherwise, if we have a severe page deficiency then + * write the buffer asynchronously. Otherwise, if on a + * cluster boundary then write the buffer asynchronously, + * combining it with contiguous clusters if permitted and + * possible, since we don't expect more writes into this + * buffer soon. Otherwise, do a delayed write because we + * expect more writes into this buffer soon. */ if (ioflag & IO_SYNC) - (void) bwrite(bp); - else if (n + croffset == pmp->pm_bpcluster) + (void)bwrite(bp); + else if (vm_page_count_severe() || buf_dirty_count_severe()) bawrite(bp); - else + else if (n + croffset == pmp->pm_bpcluster) { + if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) + cluster_write(vp, bp, dep->de_FileSize, + seqcount); + else + bawrite(bp); + } else bdwrite(bp); dep->de_flag |= DE_UPDATE; } while (error == 0 && uio->uio_resid > 0); @@ -1755,12 +1772,16 @@ return (error); } -/* - * vp - address of vnode file the file - * bn - which cluster we are interested in mapping to a filesystem block number. - * vpp - returns the vnode for the block special file holding the filesystem - * containing the file of interest - * bnp - address of where to return the filesystem relative block number +/*- + * a_vp - pointer to the file's vnode + * a_bn - logical block number within the file (cluster number for us) + * a_bop - where to return the bufobj of the special file containing the fs + * a_bnp - where to return the "physical" block number corresponding to a_bn + * (relative to the special file; units are blocks of size DEV_BSIZE) + * a_runp - where to return the "run past" a_bn. This is the count of logical + * blocks whose physical blocks (together with a_bn's physical block) + * are contiguous. + * a_runb - where to return the "run before" a_bn. */ static int msdosfs_bmap(ap) @@ -1773,26 +1794,54 @@ int *a_runb; } */ *ap; { - struct denode *dep = VTODE(ap->a_vp); - daddr_t blkno; - int error; + struct denode *dep; + struct mount *mp; + struct msdosfsmount *pmp; + struct vnode *vp; + daddr_t runbn; + u_long cn; + int bnpercn, error, maxio, maxrun, run; + vp = ap->a_vp; + dep = VTODE(vp); + pmp = dep->de_pmp; if (ap->a_bop != NULL) - *ap->a_bop = &dep->de_pmp->pm_devvp->v_bufobj; + *ap->a_bop = &pmp->pm_devvp->v_bufobj; if (ap->a_bnp == NULL) return (0); - if (ap->a_runp) { - /* - * Sequential clusters should be counted here. - */ + if (ap->a_runp != NULL) *ap->a_runp = 0; + if (ap->a_runb != NULL) + *ap->a_runb = 0; + cn = ap->a_bn; + if (cn != ap->a_bn) + return (EFBIG); + error = pcbmap(dep, cn, ap->a_bnp, NULL, NULL); + if (error != 0 || (ap->a_runp == NULL && ap->a_runb == NULL)) + return (error); + + mp = vp->v_mount; + maxio = mp->mnt_iosize_max / mp->mnt_stat.f_iosize; + bnpercn = de_cn2bn(pmp, 1); + if (ap->a_runp != NULL) { + maxrun = ulmin(maxio - 1, pmp->pm_maxcluster - cn); + for (run = 1; run <= maxrun; run++) { + if (pcbmap(dep, cn + run, &runbn, NULL, NULL) != 0 || + runbn != *ap->a_bnp + run * bnpercn) + break; + } + *ap->a_runp = run - 1; } - if (ap->a_runb) { - *ap->a_runb = 0; + if (ap->a_runb != NULL) { + maxrun = ulmin(maxio - 1, cn); + for (run = 1; run < maxrun; run++) { + if (pcbmap(dep, cn - run, &runbn, NULL, NULL) != 0 || + runbn != *ap->a_bnp - run * bnpercn) + break; + } + *ap->a_runb = run - 1; } - error = pcbmap(dep, ap->a_bn, &blkno, 0, 0); - *ap->a_bnp = blkno; - return (error); + return (0); } static int ==== //depot/projects/hammer/sys/i386/linux/linux_machdep.c#27 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.77 2007/07/04 23:06:43 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.78 2007/07/20 08:35:18 attilio Exp $"); #include #include @@ -846,9 +846,7 @@ iia.start = args->start; iia.length = args->length; iia.enable = args->enable; - mtx_lock(&Giant); error = i386_set_ioperm(td, &iia); - mtx_unlock(&Giant); return (error); } @@ -884,10 +882,8 @@ ldt.start = 0; ldt.descs = uap->ptr; ldt.num = uap->bytecount / sizeof(union descriptor); - mtx_lock(&Giant); error = i386_get_ldt(td, &ldt); td->td_retval[0] *= sizeof(union descriptor); - mtx_unlock(&Giant); break; case 0x01: /* write_ldt */ case 0x11: /* write_ldt */ @@ -912,9 +908,7 @@ desc.sd.sd_xx = 0; desc.sd.sd_def32 = ld.seg_32bit; desc.sd.sd_gran = ld.limit_in_pages; - mtx_lock(&Giant); error = i386_set_ldt(td, &ldt, &desc); - mtx_unlock(&Giant); break; default: error = EINVAL; ==== //depot/projects/hammer/sys/kern/kern_rwlock.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.27 2007/06/26 21:31:56 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.28 2007/07/20 08:43:41 attilio Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" @@ -45,7 +45,7 @@ #include #include #include -#include + #include CTASSERT((RW_RECURSE & LO_CLASSFLAGS) == RW_RECURSE); @@ -221,8 +221,10 @@ #ifdef ADAPTIVE_RWLOCKS volatile struct thread *owner; #endif +#ifdef LOCK_PROFILING_SHARED uint64_t waittime = 0; int contested = 0; +#endif uintptr_t x; KASSERT(rw->rw_lock != RW_DESTROYED, @@ -265,22 +267,22 @@ MPASS((x & RW_LOCK_READ_WAITERS) == 0); if (atomic_cmpset_acq_ptr(&rw->rw_lock, x, x + RW_ONE_READER)) { +#ifdef LOCK_PROFILING_SHARED + if (RW_READERS(x) == 0) + lock_profile_obtain_lock_success( + &rw->lock_object, contested, + waittime, file, line); +#endif if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR4(KTR_LOCK, "%s: %p succeed %p -> %p", __func__, rw, (void *)x, (void *)(x + RW_ONE_READER)); - if (RW_READERS(x) == 0) - lock_profile_obtain_lock_success( - &rw->lock_object, contested, waittime, - file, line); break; } cpu_spinwait(); continue; } - lock_profile_obtain_lock_failed(&rw->lock_object, &contested, - &waittime); /* * Okay, now it's the hard case. Some other thread already @@ -331,6 +333,10 @@ if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR3(KTR_LOCK, "%s: spinning on %p held by %p", __func__, rw, owner); +#ifdef LOCK_PROFILING_SHARED + lock_profile_obtain_lock_failed(&rw->lock_object, + &contested, &waittime); +#endif while ((struct thread*)RW_OWNER(rw->rw_lock)== owner && TD_IS_RUNNING(owner)) cpu_spinwait(); @@ -345,6 +351,10 @@ if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p blocking on turnstile", __func__, rw); +#ifdef LOCK_PROFILING_SHARED + lock_profile_obtain_lock_failed(&rw->lock_object, &contested, + &waittime); +#endif turnstile_wait(ts, rw_owner(rw), TS_SHARED_QUEUE); if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p resuming from turnstile", @@ -403,6 +413,9 @@ */ KASSERT(!(x & RW_LOCK_READ_WAITERS), ("%s: waiting readers", __func__)); +#ifdef LOCK_PROFILING_SHARED + lock_profile_release_lock(&rw->lock_object); +#endif /* * If there aren't any waiters for a write lock, then try @@ -479,7 +492,6 @@ turnstile_chain_unlock(&rw->lock_object); break; } - lock_profile_release_lock(&rw->lock_object); } /* @@ -494,7 +506,9 @@ #ifdef ADAPTIVE_RWLOCKS volatile struct thread *owner; #endif + uint64_t waittime = 0; uintptr_t v; + int contested = 0; if (rw_wlocked(rw)) { KASSERT(rw->lock_object.lo_flags & RW_RECURSE, @@ -578,6 +592,8 @@ if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR3(KTR_LOCK, "%s: spinning on %p held by %p", __func__, rw, owner); + lock_profile_obtain_lock_failed(&rw->lock_object, + &contested, &waittime); while ((struct thread*)RW_OWNER(rw->rw_lock)== owner && TD_IS_RUNNING(owner)) cpu_spinwait(); @@ -592,11 +608,15 @@ if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p blocking on turnstile", __func__, rw); + lock_profile_obtain_lock_failed(&rw->lock_object, &contested, + &waittime); turnstile_wait(ts, rw_owner(rw), TS_EXCLUSIVE_QUEUE); if (LOCK_LOG_TEST(&rw->lock_object, 0)) CTR2(KTR_LOCK, "%s: %p resuming from turnstile", __func__, rw); } + lock_profile_obtain_lock_success(&rw->lock_object, contested, waittime, + file, line); } /* ==== //depot/projects/hammer/sys/kern/tty.c#55 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.272 2007/07/01 00:17:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.273 2007/07/20 09:41:54 kib Exp $"); #include "opt_compat.h" #include "opt_tty.h" ==== //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.3 2007/07/12 17:22:43 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.4 2007/07/20 11:38:12 sephe Exp $"); /* * IEEE 802.11 station scanning support. @@ -376,17 +376,23 @@ break; c = ieee80211_find_channel(ic, freq[i], modeflags); - if (c == NULL || isexcluded(ic, c)) + if (c != NULL && isexcluded(ic, c)) continue; if (mode == IEEE80211_MODE_AUTO) { /* * XXX special-case 11b/g channels so we select - * the g channel if both are present. + * the g channel if both are present or there + * are only g channels. */ - if (IEEE80211_IS_CHAN_B(c) && - (cg = find11gchannel(ic, i, c->ic_freq)) != NULL) - c = cg; + if (c == NULL || IEEE80211_IS_CHAN_B(c)) { + cg = find11gchannel(ic, i, freq[i]); + if (cg != NULL) + c = cg; + } } + if (c == NULL) + continue; + ss->ss_chans[ss->ss_last++] = c; } #undef N ==== //depot/projects/hammer/sys/sys/rwlock.h#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/rwlock.h,v 1.13 2007/06/26 21:31:56 attilio Exp $ + * $FreeBSD: src/sys/sys/rwlock.h,v 1.14 2007/07/20 08:43:42 attilio Exp $ */ #ifndef _SYS_RWLOCK_H_ @@ -34,6 +34,7 @@ #include #include +#include #ifdef _KERNEL #include @@ -98,18 +99,14 @@ */ /* Acquire a write lock. */ -#define __rw_wlock(rw, tid, file, line) do { \ +#define __rw_wlock(rw, tid, file, line) do { \ uintptr_t _tid = (uintptr_t)(tid); \ - int contested = 0; \ - uint64_t waitstart = 0; \ \ - if (!_rw_write_lock((rw), _tid)) { \ - lock_profile_obtain_lock_failed(&(rw)->lock_object, \ - &contested, &waitstart); \ + if (!_rw_write_lock((rw), _tid)) \ _rw_wlock_hard((rw), _tid, (file), (line)); \ - } \ - lock_profile_obtain_lock_success(&(rw)->lock_object, contested, \ - waitstart, (file), (line)); \ + else \ + lock_profile_obtain_lock_success(&(rw)->lock_object, 0, \ + 0, (file), (line)); \ } while (0) /* Release a write lock. */ From owner-p4-projects@FreeBSD.ORG Fri Jul 20 19:15:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B15A16A41A; Fri, 20 Jul 2007 19:15:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D9BB16A41F for ; Fri, 20 Jul 2007 19:15:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 593EE13C474 for ; Fri, 20 Jul 2007 19:15:55 +0000 (UTC) (envelope-from peter@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 l6KJFsWf015237 for ; Fri, 20 Jul 2007 19:15:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KJFsig015234 for perforce@freebsd.org; Fri, 20 Jul 2007 19:15:54 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 19:15:54 GMT Message-Id: <200707201915.l6KJFsig015234@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 123821 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, 20 Jul 2007 19:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123821 Change 123821 by peter@peter_overcee on 2007/07/20 19:14:54 Nuke. Utterly OBE. Affected files ... .. //depot/projects/pmap/sys/Makefile#3 delete .. //depot/projects/pmap/sys/alpha/Makefile#2 delete .. //depot/projects/pmap/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/api_up1000.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/atomic.s#2 delete .. //depot/projects/pmap/sys/alpha/alpha/autoconf.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/busdma_machdep.c#4 delete .. //depot/projects/pmap/sys/alpha/alpha/busspace.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/clock.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/clock_if.m#2 delete .. //depot/projects/pmap/sys/alpha/alpha/cpuconf.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/db_disasm.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/db_instruction.h#3 delete .. //depot/projects/pmap/sys/alpha/alpha/db_interface.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/db_trace.c#4 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_1000a.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_2100_a50.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_2100_a500.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_3000_300.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_3000_500.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_axppci_33.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_eb164.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_eb64plus.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_kn20aa.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_kn300.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_kn8ae.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_st550.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/dec_st6600.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/divrem.m4#2 delete .. //depot/projects/pmap/sys/alpha/alpha/dump_machdep.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/elf_machdep.c#5 delete .. //depot/projects/pmap/sys/alpha/alpha/exception.s#4 delete .. //depot/projects/pmap/sys/alpha/alpha/fp_emulate.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/genassym.c#6 delete .. //depot/projects/pmap/sys/alpha/alpha/ieee_float.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/pmap/sys/alpha/alpha/in_cksum.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/interrupt.c#6 delete .. //depot/projects/pmap/sys/alpha/alpha/locore.s#3 delete .. //depot/projects/pmap/sys/alpha/alpha/machdep.c#7 delete .. //depot/projects/pmap/sys/alpha/alpha/mem.c#4 delete .. //depot/projects/pmap/sys/alpha/alpha/mp_machdep.c#7 delete .. //depot/projects/pmap/sys/alpha/alpha/pal.s#3 delete .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#9 delete .. //depot/projects/pmap/sys/alpha/alpha/prom.c#4 delete .. //depot/projects/pmap/sys/alpha/alpha/prom_disp.s#3 delete .. //depot/projects/pmap/sys/alpha/alpha/promcons.c#3 delete .. //depot/projects/pmap/sys/alpha/alpha/setdef0.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/setdef1.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/sgmap.c#2 delete .. //depot/projects/pmap/sys/alpha/alpha/support.s#3 delete .. //depot/projects/pmap/sys/alpha/alpha/swtch.s#4 delete .. //depot/projects/pmap/sys/alpha/alpha/sys_machdep.c#6 delete .. //depot/projects/pmap/sys/alpha/alpha/timerreg.h#2 delete .. //depot/projects/pmap/sys/alpha/alpha/trap.c#9 delete .. //depot/projects/pmap/sys/alpha/alpha/vm_machdep.c#5 delete .. //depot/projects/pmap/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/pmap/sys/alpha/conf/GENERIC#7 delete .. //depot/projects/pmap/sys/alpha/conf/GENERIC.hints#2 delete .. //depot/projects/pmap/sys/alpha/conf/Makefile#2 delete .. //depot/projects/pmap/sys/alpha/conf/NOTES#3 delete .. //depot/projects/pmap/sys/alpha/conf/SIMOS#5 delete .. //depot/projects/pmap/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/pmap/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/pmap/sys/alpha/include/_stdint.h#2 delete .. //depot/projects/pmap/sys/alpha/include/alpha_cpu.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ansi.h#5 delete .. //depot/projects/pmap/sys/alpha/include/asm.h#3 delete .. //depot/projects/pmap/sys/alpha/include/atomic.h#3 delete .. //depot/projects/pmap/sys/alpha/include/bootinfo.h#3 delete .. //depot/projects/pmap/sys/alpha/include/bus.h#3 delete .. //depot/projects/pmap/sys/alpha/include/bus_memio.h#2 delete .. //depot/projects/pmap/sys/alpha/include/bus_pio.h#2 delete .. //depot/projects/pmap/sys/alpha/include/bwx.h#2 delete .. //depot/projects/pmap/sys/alpha/include/chipset.h#2 delete .. //depot/projects/pmap/sys/alpha/include/clock.h#3 delete .. //depot/projects/pmap/sys/alpha/include/clockvar.h#2 delete .. //depot/projects/pmap/sys/alpha/include/cpu.h#3 delete .. //depot/projects/pmap/sys/alpha/include/cpuconf.h#3 delete .. //depot/projects/pmap/sys/alpha/include/cpufunc.h#3 delete .. //depot/projects/pmap/sys/alpha/include/critical.h#2 delete .. //depot/projects/pmap/sys/alpha/include/db_machdep.h#4 delete .. //depot/projects/pmap/sys/alpha/include/elf.h#3 delete .. //depot/projects/pmap/sys/alpha/include/endian.h#5 delete .. //depot/projects/pmap/sys/alpha/include/exec.h#2 delete .. //depot/projects/pmap/sys/alpha/include/float.h#3 delete .. //depot/projects/pmap/sys/alpha/include/floatingpoint.h#2 delete .. //depot/projects/pmap/sys/alpha/include/fpu.h#2 delete .. //depot/projects/pmap/sys/alpha/include/frame.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ieee.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ieeefp.h#2 delete .. //depot/projects/pmap/sys/alpha/include/in_cksum.h#2 delete .. //depot/projects/pmap/sys/alpha/include/inst.h#2 delete .. //depot/projects/pmap/sys/alpha/include/intr.h#2 delete .. //depot/projects/pmap/sys/alpha/include/intrcnt.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ioctl_bt848.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ioctl_meteor.h#2 delete .. //depot/projects/pmap/sys/alpha/include/kse.h#2 delete .. //depot/projects/pmap/sys/alpha/include/limits.h#3 delete .. //depot/projects/pmap/sys/alpha/include/md_var.h#3 delete .. //depot/projects/pmap/sys/alpha/include/mutex.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pal.h#2 delete .. //depot/projects/pmap/sys/alpha/include/param.h#3 delete .. //depot/projects/pmap/sys/alpha/include/pc/bios.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pc/vesa.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pcb.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pcpu.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pmap.h#6 delete .. //depot/projects/pmap/sys/alpha/include/proc.h#4 delete .. //depot/projects/pmap/sys/alpha/include/profile.h#3 delete .. //depot/projects/pmap/sys/alpha/include/prom.h#3 delete .. //depot/projects/pmap/sys/alpha/include/psl.h#2 delete .. //depot/projects/pmap/sys/alpha/include/pte.h#2 delete .. //depot/projects/pmap/sys/alpha/include/ptrace.h#3 delete .. //depot/projects/pmap/sys/alpha/include/reg.h#3 delete .. //depot/projects/pmap/sys/alpha/include/reloc.h#2 delete .. //depot/projects/pmap/sys/alpha/include/resource.h#2 delete .. //depot/projects/pmap/sys/alpha/include/rpb.h#2 delete .. //depot/projects/pmap/sys/alpha/include/runq.h#2 delete .. //depot/projects/pmap/sys/alpha/include/setjmp.h#2 delete .. //depot/projects/pmap/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/pmap/sys/alpha/include/sigframe.h#3 delete .. //depot/projects/pmap/sys/alpha/include/signal.h#3 delete .. //depot/projects/pmap/sys/alpha/include/smp.h#2 delete .. //depot/projects/pmap/sys/alpha/include/stdarg.h#3 delete .. //depot/projects/pmap/sys/alpha/include/swiz.h#2 delete .. //depot/projects/pmap/sys/alpha/include/sysarch.h#3 delete .. //depot/projects/pmap/sys/alpha/include/types.h#3 delete .. //depot/projects/pmap/sys/alpha/include/ucontext.h#3 delete .. //depot/projects/pmap/sys/alpha/include/varargs.h#3 delete .. //depot/projects/pmap/sys/alpha/include/vmparam.h#2 delete .. //depot/projects/pmap/sys/alpha/isa/isa.c#3 delete .. //depot/projects/pmap/sys/alpha/isa/isa_dma.c#3 delete .. //depot/projects/pmap/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/pmap/sys/alpha/isa/mcclock_isa.c#2 delete .. //depot/projects/pmap/sys/alpha/linux/Makefile#2 delete .. //depot/projects/pmap/sys/alpha/linux/linux.h#2 delete .. //depot/projects/pmap/sys/alpha/linux/linux_dummy.c#3 delete .. //depot/projects/pmap/sys/alpha/linux/linux_genassym.c#2 delete .. //depot/projects/pmap/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/pmap/sys/alpha/linux/linux_machdep.c#4 delete .. //depot/projects/pmap/sys/alpha/linux/linux_proto.h#4 delete .. //depot/projects/pmap/sys/alpha/linux/linux_syscall.h#3 delete .. //depot/projects/pmap/sys/alpha/linux/linux_sysent.c#3 delete .. //depot/projects/pmap/sys/alpha/linux/linux_sysvec.c#5 delete .. //depot/projects/pmap/sys/alpha/linux/syscalls.conf#2 delete .. //depot/projects/pmap/sys/alpha/linux/syscalls.master#3 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcbus.c#3 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcbusreg.h#2 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcbusvar.h#3 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcmem.c#2 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcpcia.c#4 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcpciareg.h#2 delete .. //depot/projects/pmap/sys/alpha/mcbus/mcpciavar.h#3 delete .. //depot/projects/pmap/sys/alpha/osf1/Makefile#2 delete .. //depot/projects/pmap/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/pmap/sys/alpha/osf1/exec_ecoff.h#2 delete .. //depot/projects/pmap/sys/alpha/osf1/imgact_osf1.c#5 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1.h#3 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_ioctl.c#3 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_misc.c#6 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_mount.c#4 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_proto.h#3 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_signal.c#4 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_signal.h#3 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_syscall.h#2 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_sysent.c#2 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_sysvec.c#3 delete .. //depot/projects/pmap/sys/alpha/osf1/osf1_util.h#3 delete .. //depot/projects/pmap/sys/alpha/osf1/syscalls.conf#2 delete .. //depot/projects/pmap/sys/alpha/osf1/syscalls.master#2 delete .. //depot/projects/pmap/sys/alpha/pci/alphapci_if.m#2 delete .. //depot/projects/pmap/sys/alpha/pci/apecs.c#2 delete .. //depot/projects/pmap/sys/alpha/pci/apecs_pci.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/apecsreg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/bwx.c#2 delete .. //depot/projects/pmap/sys/alpha/pci/cia.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/cia_pci.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/ciareg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/irongate.c#2 delete .. //depot/projects/pmap/sys/alpha/pci/irongate_pci.c#4 delete .. //depot/projects/pmap/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/lca.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/lca_pci.c#4 delete .. //depot/projects/pmap/sys/alpha/pci/lcareg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/pci_eb164_intr.s#2 delete .. //depot/projects/pmap/sys/alpha/pci/pci_eb64plus_intr.s#2 delete .. //depot/projects/pmap/sys/alpha/pci/pcibus.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/pmap/sys/alpha/pci/swiz.c#2 delete .. //depot/projects/pmap/sys/alpha/pci/t2.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/t2_pci.c#4 delete .. //depot/projects/pmap/sys/alpha/pci/t2reg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/tsunami.c#3 delete .. //depot/projects/pmap/sys/alpha/pci/tsunami_pci.c#4 delete .. //depot/projects/pmap/sys/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/pmap/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/dwlpx.c#3 delete .. //depot/projects/pmap/sys/alpha/tlsb/dwlpxreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/dwlpxvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/gbus.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/kftxx.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/kftxxreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/mcclock_tlsb.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/tlsb.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/tlsbcpu.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/tlsbmem.c#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/tlsbreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/tlsbvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/zs_tlsb.c#3 delete .. //depot/projects/pmap/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/pmap/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/pmap/sys/arm/include/_stdint.h#2 delete .. //depot/projects/pmap/sys/arm/include/ansi.h#4 delete .. //depot/projects/pmap/sys/arm/include/elf.h#2 delete .. //depot/projects/pmap/sys/arm/include/endian.h#2 delete .. //depot/projects/pmap/sys/arm/include/exec.h#2 delete .. //depot/projects/pmap/sys/arm/include/limits.h#3 delete .. //depot/projects/pmap/sys/arm/include/param.h#3 delete .. //depot/projects/pmap/sys/arm/include/signal.h#2 delete .. //depot/projects/pmap/sys/arm/include/types.h#4 delete .. //depot/projects/pmap/sys/arm/include/ucontext.h#2 delete .. //depot/projects/pmap/sys/boot/Makefile#3 delete .. //depot/projects/pmap/sys/boot/README#2 delete .. //depot/projects/pmap/sys/boot/alpha/Makefile#2 delete .. //depot/projects/pmap/sys/boot/alpha/Makefile.inc#2 delete .. //depot/projects/pmap/sys/boot/alpha/boot1/Makefile#3 delete .. //depot/projects/pmap/sys/boot/alpha/boot1/boot1.c#3 delete .. //depot/projects/pmap/sys/boot/alpha/cdboot/Makefile#3 delete .. //depot/projects/pmap/sys/boot/alpha/cdboot/version#2 delete .. //depot/projects/pmap/sys/boot/alpha/common/Makefile.common#2 delete .. //depot/projects/pmap/sys/boot/alpha/common/conf.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/common/help.alpha#2 delete .. //depot/projects/pmap/sys/boot/alpha/common/main.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/Makefile#3 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/OSFpal.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/alpha_copy.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/alpha_module.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/bootinfo.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/delay.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/devicename.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/elf_freebsd.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/getsecs.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/libalpha.h#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/prom.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/reboot.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/srmdisk.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/srmnet.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/pmap/sys/boot/alpha/libalpha/time.c#2 delete .. //depot/projects/pmap/sys/boot/alpha/loader/Makefile#3 delete .. //depot/projects/pmap/sys/boot/alpha/loader/version#2 delete .. //depot/projects/pmap/sys/boot/alpha/netboot/Makefile#3 delete .. //depot/projects/pmap/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/pmap/sys/boot/arc/Makefile#2 delete .. //depot/projects/pmap/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/pmap/sys/boot/arc/include/arcfuncs.h#2 delete .. //depot/projects/pmap/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/pmap/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/Makefile#3 delete .. //depot/projects/pmap/sys/boot/arc/lib/abort.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arcconsole.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arcdisk.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/bootinfo.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/delay.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/devicename.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/elf_freebsd.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/module.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/prom.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/setjmperr.c#2 delete .. //depot/projects/pmap/sys/boot/arc/lib/time.c#2 delete .. //depot/projects/pmap/sys/boot/arc/loader/Makefile#3 delete .. //depot/projects/pmap/sys/boot/arc/loader/conf.c#2 delete .. //depot/projects/pmap/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/pmap/sys/boot/arc/loader/main.c#2 delete .. //depot/projects/pmap/sys/boot/arc/loader/version#2 delete .. //depot/projects/pmap/sys/boot/common/Makefile.inc#3 delete .. //depot/projects/pmap/sys/boot/common/bcache.c#3 delete .. //depot/projects/pmap/sys/boot/common/boot.c#2 delete .. //depot/projects/pmap/sys/boot/common/bootstrap.h#4 delete .. //depot/projects/pmap/sys/boot/common/commands.c#2 delete .. //depot/projects/pmap/sys/boot/common/console.c#2 delete .. //depot/projects/pmap/sys/boot/common/dev_net.c#3 delete .. //depot/projects/pmap/sys/boot/common/dev_net.h#2 delete .. //depot/projects/pmap/sys/boot/common/devopen.c#2 delete .. //depot/projects/pmap/sys/boot/common/help.common#3 delete .. //depot/projects/pmap/sys/boot/common/interp.c#2 delete .. //depot/projects/pmap/sys/boot/common/interp_backslash.c#2 delete .. //depot/projects/pmap/sys/boot/common/interp_forth.c#3 delete .. //depot/projects/pmap/sys/boot/common/interp_parse.c#2 delete .. //depot/projects/pmap/sys/boot/common/isapnp.c#2 delete .. //depot/projects/pmap/sys/boot/common/isapnp.h#3 delete .. //depot/projects/pmap/sys/boot/common/load.c#2 delete .. //depot/projects/pmap/sys/boot/common/load_aout.c#2 delete .. //depot/projects/pmap/sys/boot/common/load_elf.c#3 delete .. //depot/projects/pmap/sys/boot/common/loader.8#7 delete .. //depot/projects/pmap/sys/boot/common/ls.c#2 delete .. //depot/projects/pmap/sys/boot/common/merge_help.awk#2 delete .. //depot/projects/pmap/sys/boot/common/misc.c#2 delete .. //depot/projects/pmap/sys/boot/common/module.c#3 delete .. //depot/projects/pmap/sys/boot/common/newvers.sh#2 delete .. //depot/projects/pmap/sys/boot/common/panic.c#2 delete .. //depot/projects/pmap/sys/boot/common/pnp.c#2 delete .. //depot/projects/pmap/sys/boot/common/pnpdata#2 delete .. //depot/projects/pmap/sys/boot/common/ufsread.c#2 delete .. //depot/projects/pmap/sys/boot/efi/Makefile#2 delete .. //depot/projects/pmap/sys/boot/efi/Makefile.inc#4 delete .. //depot/projects/pmap/sys/boot/efi/include/README#2 delete .. //depot/projects/pmap/sys/boot/efi/include/efi.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efi_nii.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efiapi.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/eficon.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efidebug.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efidef.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efidevp.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efierr.h#2 delete .. //depot/projects/pmap/sys/boot/efi/include/efifpswa.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efifs.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efilib.h#2 delete .. //depot/projects/pmap/sys/boot/efi/include/efinet.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efipart.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efiprot.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efipxebc.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efiser.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/efistdarg.h#2 delete .. //depot/projects/pmap/sys/boot/efi/include/i386/efibind.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/i386/pe.h#2 delete .. //depot/projects/pmap/sys/boot/efi/include/ia64/efibind.h#3 delete .. //depot/projects/pmap/sys/boot/efi/include/ia64/pe.h#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/Makefile#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/arch/ia64/start.S#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/bootinfo.c#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/copy.c#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/delay.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/efi_console.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/efifs.c#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/efinet.c#4 delete .. //depot/projects/pmap/sys/boot/efi/libefi/elf_freebsd.c#3 delete .. //depot/projects/pmap/sys/boot/efi/libefi/exit.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/libefi.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/pmap/sys/boot/efi/libefi/time.c#2 delete .. //depot/projects/pmap/sys/boot/efi/loader/Makefile#3 delete .. //depot/projects/pmap/sys/boot/efi/loader/conf.c#4 delete .. //depot/projects/pmap/sys/boot/efi/loader/main.c#4 delete .. //depot/projects/pmap/sys/boot/efi/loader/version#3 delete .. //depot/projects/pmap/sys/boot/ficl/Makefile#3 delete .. //depot/projects/pmap/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/alpha/sysdep.h#3 delete .. //depot/projects/pmap/sys/boot/ficl/dict.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/ficl.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/ficl.h#3 delete .. //depot/projects/pmap/sys/boot/ficl/fileaccess.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/float.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/i386/sysdep.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/i386/sysdep.h#3 delete .. //depot/projects/pmap/sys/boot/ficl/ia64/sysdep.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/ia64/sysdep.h#3 delete .. //depot/projects/pmap/sys/boot/ficl/loader.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/math64.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/math64.h#3 delete .. //depot/projects/pmap/sys/boot/ficl/prefix.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/search.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/classes.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/ficlclass.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/ficllocal.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/fileaccess.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/forml.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/freebsd.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/ifbrack.fr#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/jhlocal.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/marker.fr#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/oo.fr#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/prefix.fr#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/softcore.awk#2 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/softcore.fr#3 delete .. //depot/projects/pmap/sys/boot/ficl/softwords/string.fr#2 delete .. //depot/projects/pmap/sys/boot/ficl/sparc64/sysdep.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/sparc64/sysdep.h#2 delete .. //depot/projects/pmap/sys/boot/ficl/stack.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/testmain.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/tools.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/unix.c#2 delete .. //depot/projects/pmap/sys/boot/ficl/vm.c#3 delete .. //depot/projects/pmap/sys/boot/ficl/words.c#3 delete .. //depot/projects/pmap/sys/boot/forth/loader.4th#3 delete .. //depot/projects/pmap/sys/boot/forth/loader.4th.8#4 delete .. //depot/projects/pmap/sys/boot/forth/loader.conf#7 delete .. //depot/projects/pmap/sys/boot/forth/loader.conf.5#3 delete .. //depot/projects/pmap/sys/boot/forth/loader.rc#2 delete .. //depot/projects/pmap/sys/boot/forth/pnp.4th#2 delete .. //depot/projects/pmap/sys/boot/forth/support.4th#3 delete .. //depot/projects/pmap/sys/boot/i386/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/Makefile.inc#3 delete .. //depot/projects/pmap/sys/boot/i386/boot0/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/boot0/boot0.s#2 delete .. //depot/projects/pmap/sys/boot/i386/boot2/Makefile#4 delete .. //depot/projects/pmap/sys/boot/i386/boot2/boot1.s#2 delete .. //depot/projects/pmap/sys/boot/i386/boot2/boot2.c#5 delete .. //depot/projects/pmap/sys/boot/i386/boot2/lib.h#2 delete .. //depot/projects/pmap/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/btx/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/btx/btx.s#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/btxldr/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/btxldr/btxldr.s#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/lib/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/btx/lib/btxcsu.s#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/lib/btxsys.s#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/lib/btxv86.h#2 delete .. //depot/projects/pmap/sys/boot/i386/btx/lib/btxv86.s#2 delete .. //depot/projects/pmap/sys/boot/i386/cdboot/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/cdboot/cdboot.s#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/boot.c#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/crt.s#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/kgzldr.h#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/kgzldr.m4#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/lib.c#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/sio.s#2 delete .. //depot/projects/pmap/sys/boot/i386/kgzldr/start.s#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/libi386/aout_freebsd.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/biosacpi.c#3 delete .. //depot/projects/pmap/sys/boot/i386/libi386/bioscd.c#3 delete .. //depot/projects/pmap/sys/boot/i386/libi386/biosdisk.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/biosmem.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/biospci.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/biospnp.c#3 delete .. //depot/projects/pmap/sys/boot/i386/libi386/bootinfo.c#4 delete .. //depot/projects/pmap/sys/boot/i386/libi386/comconsole.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/devicename.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/elf_freebsd.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/i386_copy.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/i386_module.c#3 delete .. //depot/projects/pmap/sys/boot/i386/libi386/libi386.h#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/nullconsole.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/pread.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/pxe.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/pxe.h#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/pxetramp.s#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/time.c#2 delete .. //depot/projects/pmap/sys/boot/i386/libi386/vidconsole.c#2 delete .. //depot/projects/pmap/sys/boot/i386/liloldr/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/liloldr/lilobsect.s#2 delete .. //depot/projects/pmap/sys/boot/i386/liloldr/liloldr.s#2 delete .. //depot/projects/pmap/sys/boot/i386/loader/Makefile#3 delete .. //depot/projects/pmap/sys/boot/i386/loader/conf.c#3 delete .. //depot/projects/pmap/sys/boot/i386/loader/help.i386#3 delete .. //depot/projects/pmap/sys/boot/i386/loader/main.c#2 delete .. //depot/projects/pmap/sys/boot/i386/loader/version#2 delete .. //depot/projects/pmap/sys/boot/i386/mbr/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/mbr/mbr.s#2 delete .. //depot/projects/pmap/sys/boot/i386/pxeldr/Makefile#2 delete .. //depot/projects/pmap/sys/boot/i386/pxeldr/pxeboot.8#3 delete .. //depot/projects/pmap/sys/boot/i386/pxeldr/pxeldr.s#2 delete .. //depot/projects/pmap/sys/boot/ia64/Makefile#2 delete .. //depot/projects/pmap/sys/boot/ia64/Makefile.inc#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/Makefile#3 delete .. //depot/projects/pmap/sys/boot/ia64/libski/bootinfo.c#3 delete .. //depot/projects/pmap/sys/boot/ia64/libski/copy.c#3 delete .. //depot/projects/pmap/sys/boot/ia64/libski/delay.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/devicename.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/elf_freebsd.c#3 delete .. //depot/projects/pmap/sys/boot/ia64/libski/exit.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/libski.h#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/module.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/skiconsole.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/skifs.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/ssc.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/libski/time.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/Makefile#3 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/conf.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/ldscript.ia64#2 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/main.c#2 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/skiload.cmd#2 delete .. //depot/projects/pmap/sys/boot/ia64/skiload/version#3 delete .. //depot/projects/pmap/sys/boot/ofw/Makefile#2 delete .. //depot/projects/pmap/sys/boot/ofw/common/Makefile.inc#2 delete .. //depot/projects/pmap/sys/boot/ofw/common/main.c#2 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/Makefile#4 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/devicename.c#3 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/elf_freebsd.c#5 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/libofw.h#3 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_console.c#3 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_copy.c#3 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_disk.c#5 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_memory.c#3 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_module.c#2 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_net.c#4 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_reboot.c#2 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_time.c#2 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/openfirm.c#4 delete .. //depot/projects/pmap/sys/boot/ofw/libofw/openfirm.h#4 delete .. //depot/projects/pmap/sys/boot/pc98/Makefile#4 delete .. //depot/projects/pmap/sys/boot/pc98/Makefile.inc#3 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/Makefile#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/boot.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/boot0.5.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/disk.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/selector.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/start.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/support.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0.5/syscons.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0/Makefile#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot0/boot0.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/Makefile#5 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/asm.h#3 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/boot.h#4 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/serial_16550.S#4 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/start.S#3 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/sys.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/Makefile#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/btx/Makefile#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/btx/btx.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/btxldr/Makefile#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/btxldr/btxldr.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/lib/Makefile#3 delete .. //depot/projects/pmap/sys/boot/pc98/btx/lib/btxcsu.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/lib/btxsys.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/lib/btxv86.h#2 delete .. //depot/projects/pmap/sys/boot/pc98/btx/lib/btxv86.s#2 delete .. //depot/projects/pmap/sys/boot/pc98/kgzldr/Makefile#3 delete .. //depot/projects/pmap/sys/boot/pc98/kgzldr/crt.s#3 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/Makefile#3 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/biosdisk.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/biosmem.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/comconsole.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/time.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/libpc98/vidconsole.c#2 delete .. //depot/projects/pmap/sys/boot/pc98/loader/Makefile#3 delete .. //depot/projects/pmap/sys/boot/pc98/loader/main.c#2 delete .. //depot/projects/pmap/sys/boot/powerpc/Makefile#2 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/Makefile#4 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/pmap/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/pmap/sys/boot/sparc64/Makefile#2 delete .. //depot/projects/pmap/sys/boot/sparc64/boot1/Makefile#3 delete .. //depot/projects/pmap/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/pmap/sys/boot/sparc64/boot1/boot1.c#3 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/Makefile#4 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/help.sparc64#2 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/locore.S#2 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/main.c#6 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/metadata.c#4 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/version#2 delete .. //depot/projects/pmap/sys/cam/cam.c#3 delete .. //depot/projects/pmap/sys/cam/cam.h#3 delete .. //depot/projects/pmap/sys/cam/cam_ccb.h#2 delete .. //depot/projects/pmap/sys/cam/cam_debug.h#2 delete .. //depot/projects/pmap/sys/cam/cam_extend.c#2 delete .. //depot/projects/pmap/sys/cam/cam_extend.h#2 delete .. //depot/projects/pmap/sys/cam/cam_periph.c#3 delete .. //depot/projects/pmap/sys/cam/cam_periph.h#2 delete .. //depot/projects/pmap/sys/cam/cam_queue.c#2 delete .. //depot/projects/pmap/sys/cam/cam_queue.h#2 delete .. //depot/projects/pmap/sys/cam/cam_sim.c#2 delete .. //depot/projects/pmap/sys/cam/cam_sim.h#2 delete .. //depot/projects/pmap/sys/cam/cam_xpt.c#5 delete .. //depot/projects/pmap/sys/cam/cam_xpt.h#2 delete .. //depot/projects/pmap/sys/cam/cam_xpt_periph.h#2 delete .. //depot/projects/pmap/sys/cam/cam_xpt_sim.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_all.c#4 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_all.h#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_cd.c#5 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_cd.h#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_ch.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_ch.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_da.c#8 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_da.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_dvcfg.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_iu.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_low.c#4 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_low.h#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_low_pisa.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_low_pisa.h#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_message.h#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_pass.c#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_pass.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_pt.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_pt.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_sa.c#3 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_sa.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_ses.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_ses.h#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_targ_bh.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_target.c#2 delete .. //depot/projects/pmap/sys/cam/scsi/scsi_targetio.h#2 delete .. //depot/projects/pmap/sys/coda/00READ#2 delete .. //depot/projects/pmap/sys/coda/README#3 delete .. //depot/projects/pmap/sys/coda/TODO#2 delete .. //depot/projects/pmap/sys/coda/cnode.h#3 delete .. //depot/projects/pmap/sys/coda/coda.h#2 delete .. //depot/projects/pmap/sys/coda/coda_fbsd.c#3 delete .. //depot/projects/pmap/sys/coda/coda_io.h#3 delete .. //depot/projects/pmap/sys/coda/coda_kernel.h#2 delete .. //depot/projects/pmap/sys/coda/coda_namecache.c#4 delete .. //depot/projects/pmap/sys/coda/coda_namecache.h#3 delete .. //depot/projects/pmap/sys/coda/coda_opstats.h#2 delete .. //depot/projects/pmap/sys/coda/coda_pioctl.h#3 delete .. //depot/projects/pmap/sys/coda/coda_psdev.c#3 delete .. //depot/projects/pmap/sys/coda/coda_psdev.h#2 delete .. //depot/projects/pmap/sys/coda/coda_subr.c#4 delete .. //depot/projects/pmap/sys/coda/coda_subr.h#2 delete .. //depot/projects/pmap/sys/coda/coda_venus.c#4 delete .. //depot/projects/pmap/sys/coda/coda_venus.h#2 delete .. //depot/projects/pmap/sys/coda/coda_vfsops.c#5 delete .. //depot/projects/pmap/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/pmap/sys/coda/coda_vnops.c#4 delete .. //depot/projects/pmap/sys/coda/coda_vnops.h#4 delete .. //depot/projects/pmap/sys/compat/linprocfs/linprocfs.c#5 delete .. //depot/projects/pmap/sys/compat/linux/linux_file.c#7 delete .. //depot/projects/pmap/sys/compat/linux/linux_getcwd.c#5 delete .. //depot/projects/pmap/sys/compat/linux/linux_ioctl.c#7 delete .. //depot/projects/pmap/sys/compat/linux/linux_ioctl.h#2 delete .. //depot/projects/pmap/sys/compat/linux/linux_ipc.c#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_ipc.h#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_mib.c#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_mib.h#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_misc.c#6 delete .. //depot/projects/pmap/sys/compat/linux/linux_signal.c#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_signal.h#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_socket.c#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_socket.h#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_stats.c#5 delete .. //depot/projects/pmap/sys/compat/linux/linux_sysctl.c#2 delete .. //depot/projects/pmap/sys/compat/linux/linux_uid16.c#4 delete .. //depot/projects/pmap/sys/compat/linux/linux_util.c#3 delete .. //depot/projects/pmap/sys/compat/linux/linux_util.h#4 delete .. //depot/projects/pmap/sys/compat/pecoff/imgact_pecoff.c#6 delete .. //depot/projects/pmap/sys/compat/pecoff/imgact_pecoff.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/Makefile#2 delete .. //depot/projects/pmap/sys/compat/svr4/imgact_svr4.c#4 delete .. //depot/projects/pmap/sys/compat/svr4/svr4.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_acl.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_dirent.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_errno.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_exec.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_fcntl.c#6 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_fcntl.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_filio.c#5 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_filio.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_fuser.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_hrt.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ioctl.c#4 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ioctl.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ipc.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ipc.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_misc.c#7 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_mman.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_proto.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_resource.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_resource.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_siginfo.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_signal.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_signal.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_socket.c#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_socket.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sockio.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sockio.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sockmod.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_stat.c#4 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_stat.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_statvfs.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_stream.c#5 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_stropts.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_syscall.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_syscallnames.c#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sysconfig.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sysent.c#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_systeminfo.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_sysvec.c#5 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_termios.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_termios.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_time.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_timod.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ttold.c#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_types.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ucontext.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ulimit.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_ustat.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_util.h#3 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_utsname.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/svr4_wait.h#2 delete .. //depot/projects/pmap/sys/compat/svr4/syscalls.conf#2 delete .. //depot/projects/pmap/sys/compat/svr4/syscalls.master#2 delete .. //depot/projects/pmap/sys/conf/Makefile.alpha#5 delete .. //depot/projects/pmap/sys/conf/Makefile.i386#6 delete .. //depot/projects/pmap/sys/conf/Makefile.ia64#6 delete .. //depot/projects/pmap/sys/conf/Makefile.pc98#5 delete .. //depot/projects/pmap/sys/conf/Makefile.powerpc#6 delete .. //depot/projects/pmap/sys/conf/Makefile.sparc64#6 delete .. //depot/projects/pmap/sys/conf/Makefile.x86_64#4 delete .. //depot/projects/pmap/sys/conf/NOTES#7 delete .. //depot/projects/pmap/sys/conf/defines#2 delete .. //depot/projects/pmap/sys/conf/files#13 delete .. //depot/projects/pmap/sys/conf/files.alpha#8 delete .. //depot/projects/pmap/sys/conf/files.i386#11 delete .. //depot/projects/pmap/sys/conf/files.ia64#7 delete .. //depot/projects/pmap/sys/conf/files.pc98#10 delete .. //depot/projects/pmap/sys/conf/files.powerpc#5 delete .. //depot/projects/pmap/sys/conf/files.sparc64#8 delete .. //depot/projects/pmap/sys/conf/files.x86_64#4 delete .. //depot/projects/pmap/sys/conf/kern.post.mk#11 delete .. //depot/projects/pmap/sys/conf/kern.pre.mk#12 delete .. //depot/projects/pmap/sys/conf/kmod.mk#8 delete .. //depot/projects/pmap/sys/conf/kmod_syms.awk#4 delete .. //depot/projects/pmap/sys/conf/ldscript.alpha#2 delete .. //depot/projects/pmap/sys/conf/ldscript.i386#2 delete .. //depot/projects/pmap/sys/conf/ldscript.ia64#2 delete .. //depot/projects/pmap/sys/conf/ldscript.powerpc#2 delete .. //depot/projects/pmap/sys/conf/ldscript.sparc64#2 delete .. //depot/projects/pmap/sys/conf/majors#7 delete .. //depot/projects/pmap/sys/conf/makeLINT.sed#2 delete .. //depot/projects/pmap/sys/conf/newvers.sh#2 delete .. //depot/projects/pmap/sys/conf/options#9 delete .. //depot/projects/pmap/sys/conf/options.alpha#5 delete .. //depot/projects/pmap/sys/conf/options.i386#11 delete .. //depot/projects/pmap/sys/conf/options.ia64#4 delete .. //depot/projects/pmap/sys/conf/options.pc98#11 delete .. //depot/projects/pmap/sys/conf/options.powerpc#3 delete .. //depot/projects/pmap/sys/conf/options.sparc64#4 delete .. //depot/projects/pmap/sys/conf/options.x86_64#2 delete .. //depot/projects/pmap/sys/conf/systags.sh#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acconfig.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acdebug.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acdisasm.h#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acdispat.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acdos16.h#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acefi.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acenv.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acevents.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acexcep.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acfreebsd.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acgcc.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acglobal.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/achware.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acinterp.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/aclocal.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acmacros.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acnamesp.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acobject.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acoutput.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acparser.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acpi.h#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acpica_prep.sh#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acpiosxf.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acpixf.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acresrc.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acstruct.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actables.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actbl.h#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actbl1.h#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actbl2.h#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actbl71.h#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/actypes.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/acutils.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/amlcode.h#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/amlresrc.h#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbcmds.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbdisply.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbexec.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbfileio.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbhistry.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbinput.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbstats.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbutils.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbxface.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmbuffer.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmnames.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmopcode.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrc.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrcl.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrcs.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmutils.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dmwalk.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsfield.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsmethod.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsmthdat.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsobject.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsopcode.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dsutils.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dswexec.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dswload.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dswscope.c#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dswstate.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evevent.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evmisc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evregion.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evrgnini.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evsci.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evxface.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evxfevnt.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/evxfregn.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exconfig.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exconvrt.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/excreate.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exdump.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exfield.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exfldio.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exmisc.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exmutex.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exnames.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg1.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg2.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg3.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg6.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exprep.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exregion.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exresnte.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exresolv.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exresop.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exstore.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exstoren.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exstorob.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exsystem.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/exutils.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/hwacpi.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/hwgpe.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/hwregs.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/hwsleep.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/hwtimer.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsaccess.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsalloc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsdump.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsdumpdv.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nseval.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsinit.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsload.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsnames.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsobject.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nssearch.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsutils.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nswalk.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfeval.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfname.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfobj.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psargs.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psfind.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psopcode.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psparse.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psscope.c#3 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/pstree.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psutils.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/pswalk.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/psxface.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsaddr.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rscalc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rscreate.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsdump.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsio.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsirq.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rslist.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsmemory.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsmisc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsutils.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/rsxface.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbconvrt.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbget.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbinstal.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbutils.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxface.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxfroot.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utalloc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utclib.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utcopy.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utdebug.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utdelete.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/uteval.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utglobal.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utinit.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utmath.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utmisc.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utobject.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/utxface.c#5 delete .. //depot/projects/pmap/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/pmap/sys/contrib/dev/fla/README#2 delete .. //depot/projects/pmap/sys/contrib/dev/fla/fla.c#3 delete .. //depot/projects/pmap/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/pmap/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/pmap/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/pmap/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/COPYRIGHT#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/if_oltr.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/trlld.h#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/trlldbm.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/trlldhm.c#2 delete .. //depot/projects/pmap/sys/contrib/dev/oltr/trlldmac.c#2 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/QNX_OCL.txt#2 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/fil.c#4 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_auth.c#5 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_auth.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_compat.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_fil.c#5 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_fil.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_frag.c#4 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_frag.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_log.c#4 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_nat.c#5 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_nat.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_proxy.c#4 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_proxy.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_state.c#4 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_state.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ipl.h#3 delete .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 delete .. //depot/projects/pmap/sys/crypto/blowfish/arch/i386/bf_enc.S#2 delete .. //depot/projects/pmap/sys/crypto/blowfish/arch/i386/bf_enc_586.S#2 delete .. //depot/projects/pmap/sys/crypto/blowfish/arch/i386/bf_enc_686.S#2 delete .. //depot/projects/pmap/sys/crypto/blowfish/bf_enc.c#3 delete .. //depot/projects/pmap/sys/crypto/blowfish/bf_locl.h#3 delete .. //depot/projects/pmap/sys/crypto/blowfish/bf_pi.h#3 delete .. //depot/projects/pmap/sys/crypto/blowfish/bf_skey.c#3 delete .. //depot/projects/pmap/sys/crypto/blowfish/blowfish.h#4 delete .. //depot/projects/pmap/sys/crypto/cast128/cast128.c#2 delete .. //depot/projects/pmap/sys/crypto/cast128/cast128.h#3 delete .. //depot/projects/pmap/sys/crypto/cast128/cast128_subkey.h#2 delete .. //depot/projects/pmap/sys/crypto/des/arch/i386/des_enc.S#2 delete .. //depot/projects/pmap/sys/crypto/des/des.h#4 delete .. //depot/projects/pmap/sys/crypto/des/des_ecb.c#3 delete .. //depot/projects/pmap/sys/crypto/des/des_enc.c#2 delete .. //depot/projects/pmap/sys/crypto/des/des_locl.h#3 delete .. //depot/projects/pmap/sys/crypto/des/des_setkey.c#3 delete .. //depot/projects/pmap/sys/crypto/des/podd.h#3 delete .. //depot/projects/pmap/sys/crypto/des/sk.h#3 delete .. //depot/projects/pmap/sys/crypto/des/spr.h#3 delete .. //depot/projects/pmap/sys/crypto/md5.c#3 delete .. //depot/projects/pmap/sys/crypto/md5.h#3 delete .. //depot/projects/pmap/sys/crypto/rc4/rc4.c#2 delete .. //depot/projects/pmap/sys/crypto/rc4/rc4.h#2 delete .. //depot/projects/pmap/sys/crypto/rijndael/boxes-fst.dat#2 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-alg-fst.c#2 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-alg-fst.h#2 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-api-fst.c#3 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-api-fst.h#3 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael.h#2 delete .. //depot/projects/pmap/sys/crypto/rijndael/rijndael_local.h#2 delete .. //depot/projects/pmap/sys/crypto/sha1.c#3 delete .. //depot/projects/pmap/sys/crypto/sha1.h#3 delete .. //depot/projects/pmap/sys/crypto/sha2/sha2.c#4 delete .. //depot/projects/pmap/sys/crypto/sha2/sha2.h#3 delete .. //depot/projects/pmap/sys/ddb/db_access.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 20 19:15:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F09116A468; Fri, 20 Jul 2007 19:15:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 950FC16A420 for ; Fri, 20 Jul 2007 19:15:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AEB913C481 for ; Fri, 20 Jul 2007 19:15:55 +0000 (UTC) (envelope-from peter@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 l6KJFtbj015243 for ; Fri, 20 Jul 2007 19:15:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KJFtfK015240 for perforce@freebsd.org; Fri, 20 Jul 2007 19:15:55 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 19:15:55 GMT Message-Id: <200707201915.l6KJFtfK015240@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 123822 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, 20 Jul 2007 19:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=123822 Change 123822 by peter@peter_overcee on 2007/07/20 19:15:11 Add two items to the obliterate list. Affected files ... .. //depot/doc/obliterate#6 edit Differences ... ==== //depot/doc/obliterate#6 (text+ko) ==== @@ -6,3 +6,4 @@ //depot/user/flz/src/... //depot/projects/kmacy_sun4v/doc/... //depot/projects/kmacy_sun4v/www/... +//depot/projects/peter/pmap/... From owner-p4-projects@FreeBSD.ORG Fri Jul 20 19:31:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D74716A420; Fri, 20 Jul 2007 19:31:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E782016A41B for ; Fri, 20 Jul 2007 19:31:14 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE22213C442 for ; Fri, 20 Jul 2007 19:31:14 +0000 (UTC) (envelope-from peter@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 l6KJVExG016228 for ; Fri, 20 Jul 2007 19:31:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6KJVEP5016225 for perforce@freebsd.org; Fri, 20 Jul 2007 19:31:14 GMT (envelope-from peter@freebsd.org) Date: Fri, 20 Jul 2007 19:31:14 GMT Message-Id: <200707201931.l6KJVEP5016225@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 123823 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, 20 Jul 2007 19:31:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=123823 Change 123823 by peter@peter_overcee on 2007/07/20 19:31:05 Add another item Affected files ... .. //depot/doc/obliterate#7 edit Differences ... ==== //depot/doc/obliterate#7 (text+ko) ==== @@ -7,3 +7,4 @@ //depot/projects/kmacy_sun4v/doc/... //depot/projects/kmacy_sun4v/www/... //depot/projects/peter/pmap/... +//depot/projects/pmap/... From owner-p4-projects@FreeBSD.ORG Sat Jul 21 03:49:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E71516A41F; Sat, 21 Jul 2007 03:49:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E6816A417 for ; Sat, 21 Jul 2007 03:49:45 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04E1B13C46B for ; Sat, 21 Jul 2007 03:49:45 +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 l6L3niIL084288 for ; Sat, 21 Jul 2007 03:49:44 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6L3niEe084285 for perforce@freebsd.org; Sat, 21 Jul 2007 03:49:44 GMT (envelope-from andrew@freebsd.org) Date: Sat, 21 Jul 2007 03:49:44 GMT Message-Id: <200707210349.l6L3niEe084285@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 123833 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, 21 Jul 2007 03:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=123833 Change 123833 by andrew@andrew_hermies on 2007/07/21 03:49:03 When a the communications thread is closed also kill the update thread Listen to more signals Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#15 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#15 (text+ko) ==== @@ -76,6 +76,7 @@ static struct facund_response *facund_call_restart_services(const char *, struct facund_object *); +static int facund_signals[] = { SIGHUP, SIGINT, SIGTERM }; static void facund_signal_handler(int, siginfo_t *, void *); /* @@ -152,6 +153,12 @@ /* Add a signal event to check if there was a signal sent */ EV_SET(&event, SIGINT, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); kevent(kq, &event, 1, NULL, 0, NULL); + for (pos = 0; pos < sizeof(facund_signals) / sizeof(facund_signals[0]); + pos++) { + EV_SET(&event, facund_signals[pos], EVFILT_SIGNAL, EV_ADD, + 0, 0, NULL); + kevent(kq, &event, 1, NULL, 0, NULL); + } use_kqueue = 1; found_updates = 0; @@ -557,6 +564,7 @@ struct facund_conn *conn; const char *config_file; char *basedirs_string, **base_dirs; + unsigned int pos; int config_fd; properties config_data; char ch; @@ -580,10 +588,13 @@ basedirs_string = NULL; - sa.sa_sigaction = facund_signal_handler; - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_SIGINFO; - sigaction(SIGINT, &sa, NULL); + for (pos = 0; pos < sizeof(facund_signals) / sizeof(facund_signals[0]); + pos++) { + sa.sa_sigaction = facund_signal_handler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_SIGINFO; + sigaction(facund_signals[pos], &sa, NULL); + } /* Read in the config file */ config_fd = open(config_file, O_RDONLY); @@ -632,6 +643,11 @@ /* Wait for the threads to quit */ pthread_join(comms_thread, NULL); + /* + * As the communications thread has quit we should + * also kill the update thread so we can exit + */ + pthread_kill(update_thread, SIGINT); pthread_join(update_thread, NULL); if (conn != NULL) From owner-p4-projects@FreeBSD.ORG Sat Jul 21 08:17:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F21F16A41F; Sat, 21 Jul 2007 08:17:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D40716A41A for ; Sat, 21 Jul 2007 08:17:16 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F15D713C459 for ; Sat, 21 Jul 2007 08:17:15 +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 l6L8HFd0031560 for ; Sat, 21 Jul 2007 08:17:15 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6L8HF1c031557 for perforce@freebsd.org; Sat, 21 Jul 2007 08:17:15 GMT (envelope-from andrew@freebsd.org) Date: Sat, 21 Jul 2007 08:17:15 GMT Message-Id: <200707210817.l6L8HF1c031557@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 123834 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, 21 Jul 2007 08:17:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123834 Change 123834 by andrew@andrew_hermies on 2007/07/21 08:17:03 In a facuns array only free obj_array_count items. Without this valgrind complains about invalid reads as the last item may not be NULL; Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#8 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#8 (text+ko) ==== @@ -338,7 +338,7 @@ if (obj->obj_array != NULL) { unsigned int i; - for (i = 0; obj->obj_array[i] != NULL; i++) { + for (i = 0; i < obj->obj_array_count; i++) { facund_object_free(obj->obj_array[i]); } free(obj->obj_array); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 09:56:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 305F016A421; Sat, 21 Jul 2007 09:56:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E866616A418 for ; Sat, 21 Jul 2007 09:56:18 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C07BD13C47E for ; Sat, 21 Jul 2007 09:56:18 +0000 (UTC) (envelope-from zhouzhouyi@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 l6L9uI6s048123 for ; Sat, 21 Jul 2007 09:56:18 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6L9uI0g048120 for perforce@freebsd.org; Sat, 21 Jul 2007 09:56:18 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Sat, 21 Jul 2007 09:56:18 GMT Message-Id: <200707210956.l6L9uI0g048120@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 123835 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, 21 Jul 2007 09:56:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123835 Change 123835 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/21 09:56:02 The testcase for link, rwatson! there is a error in mac_mls_check_vnode_link. see case 5 :) Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/link/00.t#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 21 10:52:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B34A016A41B; Sat, 21 Jul 2007 10:52:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E3A316A41A for ; Sat, 21 Jul 2007 10:52:32 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E34D13C46C for ; Sat, 21 Jul 2007 10:52:32 +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 l6LAqW2r052490 for ; Sat, 21 Jul 2007 10:52:32 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LAqV4H052487 for perforce@freebsd.org; Sat, 21 Jul 2007 10:52:31 GMT (envelope-from andrew@freebsd.org) Date: Sat, 21 Jul 2007 10:52:31 GMT Message-Id: <200707211052.l6LAqV4H052487@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 123837 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, 21 Jul 2007 10:52:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=123837 Change 123837 by andrew@andrew_hermies on 2007/07/21 10:52:07 Move the argument decoding for list_updates and list_installed to seperate functions Return dummy data for list_installed In look_for_updates free dir_fd when exiting Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#16 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#16 (text+ko) ==== @@ -63,6 +63,12 @@ static char **get_base_dirs(char *); static void *do_communication(void *); +static struct facund_response * facund_get_update_types(const char *, + const struct facund_object *, int *, int *); +static const char **facund_get_dir_list(const struct facund_object *); +static struct facund_response *facund_read_type_directory(const char *, + const struct facund_object *, const char ***, int *, int *); + static struct facund_response *facund_call_ping(const char *, struct facund_object *); static struct facund_response *facund_call_list_updates(const char *, @@ -248,6 +254,8 @@ sleep(default_check_period); } } + + free(dir_fd); return NULL; } @@ -361,8 +369,58 @@ return resp; } +/* + * Takes either a facund array or a facund string and sets base + * or ports to true if they are contained in the object + */ +static struct facund_response * +facund_get_update_types(const char *id, const struct facund_object *obj, + int *base, int *ports) +{ + const struct facund_object *area_objs[2]; + const char *areas[2]; + enum facund_type type; + + assert(base != NULL); + assert(ports != NULL); + + type = facund_object_get_type(obj); + if (type == FACUND_ARRAY) { + if (facund_object_array_size(obj) != 2) { + return facund_response_new(id, 1, + "Wrong number of arguments", NULL); + } + area_objs[0] = facund_object_get_array_item(obj, 0); + area_objs[1] = facund_object_get_array_item(obj, 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")) + *base = 1; + + if (strcmp(areas[0], "ports") == 0 || strcmp(areas[1], "ports")) + *ports = 1; + + } else if (type == FACUND_STRING) { + areas[0] = facund_object_get_string(obj); + if (strcmp(areas[0], "base") == 0) { + *base = 1; + } else if (strcmp(areas[0], "ports") == 0) { + *ports = 1; + } + } else { + return facund_response_new(id, 1, "Incorrect data type", NULL); + } + return NULL; +} + +/* + * Takes a either facund array of string objects or a single string + * object and returns a C array of C strings of the objects + */ static const char ** -get_dir_list(const struct facund_object *obj) +facund_get_dir_list(const struct facund_object *obj) { const char **dirs; const struct facund_object *cur; @@ -404,22 +462,18 @@ } static struct facund_response * -facund_call_list_updates(const char *id, struct facund_object *obj) +facund_read_type_directory(const char *id, const struct facund_object *obj, + const char ***base_dirs, int *base, int *ports) { - const struct facund_object *cur, *area_objs[2]; - struct facund_object *args; - const char **base_dirs, *areas[2]; - int get_base, get_ports; + const struct facund_object *cur; + struct facund_response *ret; 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); - } + assert(id != NULL); + assert(obj != NULL); + assert(base_dirs != NULL); + assert(base != NULL); + assert(ports != NULL); if (facund_object_get_type(obj) != FACUND_ARRAY) { return facund_response_new(id, 1, "Bad data sent", NULL); @@ -430,51 +484,20 @@ 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); - } + ret = facund_get_update_types(id, cur, base, ports); + if (ret != NULL) + return ret; break; case 1: - /* Read in the directories to fet updates for */ - base_dirs = get_dir_list(cur); - if (base_dirs == NULL) + /* Read in the directories to get updates for */ + *base_dirs = facund_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); + if (*base_dirs != NULL) + free(*base_dirs); return facund_response_new(id, 1, "Too many arguments", NULL); @@ -486,6 +509,37 @@ return facund_response_new(id, 1, "Not enough arguments", NULL); } + return NULL; +} + +static struct facund_response * +facund_call_list_updates(const char *id, struct facund_object *obj) +{ + struct facund_response *ret; + struct facund_object *args; + const char **base_dirs; + int get_base, get_ports; + unsigned int pos; + + 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); + } + + /* Read in the arguments */ + ret = facund_read_type_directory(id, obj, &base_dirs, &get_base, + &get_ports); + if (ret != NULL) { + if (base_dirs != NULL) + free(base_dirs); + return ret; + } + /* This should have been assigned as ret is NULL when successful */ + assert(base_dirs != NULL); + /* * If any of these asserts fail there was * incorrect logic checking arguments @@ -507,7 +561,7 @@ /* 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_set_string(item, "6.2-p2"); facund_object_array_append(updates, item); facund_object_array_append(pair, updates); @@ -517,15 +571,77 @@ printf("STUB: %s (base: %s, ports: %s)\n", __func__, (get_base ? "yes" : "no"), (get_ports ? "yes" : "no")); + for (pos = 0; base_dirs[pos] != NULL; pos++) { + printf("Dir: %s\n", base_dirs[pos]); + } free(base_dirs); return facund_response_new(id, RESP_GOOD, "Success", args); } static struct facund_response * -facund_call_list_installed(const char *id __unused, struct facund_object *obj __unused) +facund_call_list_installed(const char *id, struct facund_object *obj) { - printf("STUB: %s\n", __func__); - return NULL; + struct facund_response *ret; + struct facund_object *args; + const char **base_dirs; + int get_base, get_ports; + unsigned int pos; + + 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); + } + + /* Read in the arguments */ + ret = facund_read_type_directory(id, obj, &base_dirs, &get_base, + &get_ports); + if (ret != NULL) { + if (base_dirs != NULL) + free(base_dirs); + return ret; + } + /* This should have been assigned as ret is NULL when successful */ + assert(base_dirs != 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 (base: %s, ports: %s)\n", __func__, + (get_base ? "yes" : "no"), (get_ports ? "yes" : "no")); + for (pos = 0; base_dirs[pos] != NULL; pos++) { + printf("Dir: %s\n", base_dirs[pos]); + } + free(base_dirs); + return facund_response_new(id, RESP_GOOD, "Success", args); } static struct facund_response * From owner-p4-projects@FreeBSD.ORG Sat Jul 21 17:21:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40F7416A41B; Sat, 21 Jul 2007 17:21:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FB3716A419 for ; Sat, 21 Jul 2007 17:21:46 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0091113C480 for ; Sat, 21 Jul 2007 17:21:46 +0000 (UTC) (envelope-from gonzo@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 l6LHLjBR001476 for ; Sat, 21 Jul 2007 17:21:45 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LHLjqW001473 for perforce@freebsd.org; Sat, 21 Jul 2007 17:21:45 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 21 Jul 2007 17:21:45 GMT Message-Id: <200707211721.l6LHLjqW001473@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 123850 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, 21 Jul 2007 17:21:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=123850 Change 123850 by gonzo@gonzo_jeeves on 2007/07/21 17:21:07 o Move all platform-dependent code to XXX_machdep.c files o Change tick_init_params prototype, now it accept's platform timer frequency and double_count flag. o Move sysbeep to tick.c Affected files ... .. //depot/projects/mips2/src/sys/mips/include/clock.h#4 edit .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#34 edit .. //depot/projects/mips2/src/sys/mips/mips/tick.c#17 edit .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 add .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#4 edit .. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#2 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#10 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/clock.h#4 (text+ko) ==== @@ -32,7 +32,13 @@ #define wall_cmos_clock 0 #define adjkerntz 0 -void tick_init_params(void); +/* + * Default is to assume a CPU pipeline clock of 100Mhz, and + * that CP0_COUNT increments every 2 cycles. + */ +#define MIPS_DEFAULT_HZ (100 * 1000 * 1000) + +void tick_init_params(uint64_t, int); void tick_init(void); int sysbeep(int pitch, int period); ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#34 (text+ko) ==== @@ -70,25 +70,14 @@ #include #include -#ifdef CFE -#include -#endif - #ifdef DDB #include #endif -#ifdef CFE -extern uint32_t cfe_handle; -extern uint32_t cfe_vector; -#endif - int cold = 1; int clocks_running = 0; long realmem = 0; -extern int *edata; -extern int *end; static struct pcpu pcpu0; struct pcpu *pcpup = &pcpu0; @@ -166,82 +155,9 @@ } void -mips_init(void) +cpu_startup(void *dummy) { - int i; - - printf("entry: mips_init()\n"); - bootverbose = 0; -#ifdef CFE - /* - * Query DRAM memory map from CFE. - */ - physmem = 0; - for (i = 0; i < 10; i += 2) { - int result; - uint64_t addr, len, type; - - result = cfe_enummem(i, 0, &addr, &len, &type); - if (result < 0) { - phys_avail[i] = phys_avail[i + 1] = 0; - break; - } - if (type != CFE_MI_AVAILABLE) - continue; - - phys_avail[i] = addr; - if (i == 0 && addr == 0) { - /* - * If this is the first physical memory segment probed - * from CFE, omit the region at the start of physical - * memory where the kernel has been loaded. - */ - phys_avail[i] += MIPS_KSEG0_TO_PHYS((vm_offset_t)&end); - } - phys_avail[i + 1] = addr + len; - physmem += len; - } - - realmem = btoc(physmem); -#else /* !CFE */ - realmem = btoc(64 << 20); - - for (i = 0; i < 10; i++) { - phys_avail[i] = 0; - } - - /* phys_avail regions are in bytes */ - phys_avail[0] = MIPS_KSEG0_TO_PHYS((vm_offset_t)&end); - phys_avail[1] = ctob(realmem); -#endif - - physmem = realmem; - - init_param1(); - init_param2(physmem); - - /* XXX: Catch 22. Something touches the tlb. */ - mips_cpu_init(); - pmap_bootstrap(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kstack0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - pcpup->pc_curthread = &thread0; - cpu_thread_setup(curthread); - pcpup->pc_curpcb = curthread->td_pcb; - - mutex_init(); - -#ifdef DDB - kdb_init(); -#endif -} - -void -cpu_startup(void *dummy) -{ cpu_identify(); platform_identify(); vm_ksubmap_init(&kmi); @@ -253,12 +169,14 @@ int cpu_est_clockrate(int cpu_id, uint64_t *rate) { + return (ENXIO); } void cpu_halt(void) { + printf("Halting...\n"); platform_halt(); } @@ -385,6 +303,7 @@ int fill_regs(struct thread *td, struct reg *regs) { + __asm __volatile("break"); return (0); } @@ -392,6 +311,7 @@ int fill_dbregs(struct thread *td, struct dbreg *dbregs) { + __asm __volatile("break"); return (0); } @@ -399,12 +319,14 @@ int fill_fpregs(struct thread *td, struct fpreg *fpregs) { + return (0); } int set_regs(struct thread *td, struct reg *regs) { + __asm __volatile("break"); return (0); } @@ -412,36 +334,42 @@ int set_dbregs(struct thread *td, struct dbreg *dbregs) { + return (0); } int set_fpregs(struct thread *td, struct fpreg *fpregs) { + return (0); } int ptrace_set_pc(struct thread *td, u_long addr) { + return (0); } int ptrace_clear_single_step(struct thread *td) { + return (0); } int ptrace_single_step(struct thread *td) { + return (0); } void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t sz) { + } void @@ -452,8 +380,8 @@ tf->tf_regs[TF_EPC] = (register_t)entry; tf->tf_regs[TF_SP] = (register_t)stack; tf->tf_regs[TF_SR] |= MIPS_SR_KSU_USER; + tf->tf_regs[TF_SR] |= MIPS_SR_EXL; 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 */ } @@ -481,68 +409,6 @@ intr_restore(td->td_md.md_saved_sr); } -void -platform_halt(void) -{ - -} - - -void -platform_identify(void) -{ - -} - -void -platform_reset(void) -{ - -#if defined(CFE) - cfe_exit(0, 0); -#endif -} - -void -platform_trap_enter(void) -{ - -} - -void -platform_trap_exit(void) -{ - -} - -void -platform_start(int argc, char **argv) -{ - vm_offset_t kernend; - - /* clear the BSS and SBSS segments */ - kernend = round_page((vm_offset_t)&end); - memset(&edata, 0, kernend - (vm_offset_t)(&edata)); - -#ifdef CFE - /* - * Initialize CFE firmware trampolines before - * we initialize the low-level console. - */ - if (cfe_handle != 0) - cfe_init(cfe_handle, cfe_vector); -#endif - cninit(); - -#ifdef CFE - if (cfe_handle == 0) - panic("CFE was not detected by locore.\n"); -#endif - - mips_init(); - tick_init_params(); -} - void setPQL2(int *const size, int *const ways); void @@ -602,12 +468,4 @@ } -/* - * XXX Needed by syscons - */ -int -sysbeep(int pitch, int period) -{ - return (0); -} ==== //depot/projects/mips2/src/sys/mips/mips/tick.c#17 (text+ko) ==== @@ -49,28 +49,6 @@ #include #include -#ifdef TICK_USE_YAMON_FREQ -#include -#endif - -#ifdef TICK_USE_MALTA_RTC -#include -#include -#include -#endif - -#ifdef CPU_SENTRY5 -#include -#include -#endif - -/* - * Default is to assume a CPU pipeline clock of 100Mhz, and - * that CP0_COUNT increments every 2 cycles. - */ -#define MIPS_DEFAULT_HZ (100 * 1000 * 1000) -#define MIPS_DOUBLE_COUNT 1 - uint64_t counter_freq; uint64_t counts_per_hz; uint32_t counts_per_usec; @@ -94,28 +72,6 @@ 800, /* quality (adjusted in code) */ }; -#ifdef TICK_USE_MALTA_RTC -static __inline uint8_t -rtcin(uint8_t addr) -{ - - *((volatile uint8_t *) - MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCADR))) = addr; - return (*((volatile uint8_t *) - MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCDAT)))); -} - -static __inline void -writertc(uint8_t addr, uint8_t val) -{ - - *((volatile uint8_t *) - MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCADR))) = addr; - *((volatile uint8_t *) - MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCDAT))) = val; -} -#endif - static uint64_t tick_ticker(void) { @@ -124,89 +80,11 @@ } void -tick_init_params(void) +tick_init_params(uint64_t platform_counter_freq, int double_count) { - if (bootverbose) - printf("Calibrating MIPS32 clock ... "); - - do { -#if defined(TICK_USE_YAMON_FREQ) - /* - * If we are running on a board which uses YAMON firmware, - * then query CPU pipeline clock from the syscon object. - * If unsuccessful, use hard-coded default. - */ - counter_freq = yamon_getcpufreq(); - if (counter_freq == 0) { - counter_freq = MIPS_DEFAULT_HZ; - } -#elif defined(TICK_USE_MALTA_RTC) - /* - * If we are running on a board with the MC146818 RTC, - * use it to determine CPU pipeline clock frequency. - */ - u_int64_t counterval[2]; - - /* Set RTC to binary mode. */ - writertc(RTC_STATUSB, (rtcin(RTC_STATUSB) | RTCSB_BCD)); - - /* Busy-wait for falling edge of RTC update. */ - while (((rtcin(RTC_STATUSA) & RTCSA_TUP) == 0)) - ; - while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0)) - ; - counterval[0] = mips_rd_count(); - - /* Busy-wait for falling edge of RTC update. */ - while (((rtcin(RTC_STATUSA) & RTCSA_TUP) == 0)) - ; - while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0)) - ; - counterval[1] = mips_rd_count(); + counter_freq = platform_counter_freq; - counter_freq = counterval[1] - counterval[0]; -#elif defined(CPU_SENTRY5) -# if 0 - /* - * Probe the Broadcom Sentry5's on-chip PLL clock registers - * and discover the CPU pipeline clock and bus clock - * multipliers from this. - * XXX: Wrong place. You have to ask the ChipCommon - * or External Interface cores on the SiBa. - */ - uint32_t busmult, cpumult, refclock, clkcfg1; -#define S5_CLKCFG1_REFCLOCK_MASK 0x0000001F -#define S5_CLKCFG1_BUSMULT_MASK 0x000003E0 -#define S5_CLKCFG1_BUSMULT_SHIFT 5 -#define S5_CLKCFG1_CPUMULT_MASK 0xFFFFFC00 -#define S5_CLKCFG1_CPUMULT_SHIFT 10 - - counter_freq = 100000000; /* XXX */ - - clkcfg1 = s5_rd_clkcfg1(); - printf("clkcfg1 = 0x%08x\n", clkcfg1); - - refclock = clkcfg1 & 0x1F; - busmult = ((clkcfg1 & 0x000003E0) >> 5) + 1; - cpumult = ((clkcfg1 & 0xFFFFFC00) >> 10) + 1; - - printf("refclock = %u\n", refclock); - printf("busmult = %u\n", busmult); - printf("cpumult = %u\n", cpumult); - - counter_freq = cpumult * refclock; -# else - counter_freq = 200 * 1000 * 1000; /* Sentry5 is 200MHz */ -# endif -#else - /* - * Use a completely fictional hardcoded default. - */ - counter_freq = MIPS_DEFAULT_HZ; -#endif - } while (0); - counts_per_hz = counter_freq / hz; counts_per_usec = counter_freq / (1 * 1000 * 1000); @@ -214,13 +92,12 @@ * XXX: Some MIPS32 cores update the Count register * only every two pipeline cycles. */ - if (MIPS_DOUBLE_COUNT != 0) { + if (double_count != 0) { counts_per_hz /= 2; counts_per_usec /= 2; } printf("MIPS32 clock: %ju Hz\n", (intmax_t)counter_freq); - set_cputicker(tick_ticker, counter_freq, 1); } @@ -266,7 +143,6 @@ void DELAY(int n) { -#ifndef CPU_SENTRY5 /* TODO: Fix clock calibration for this board */ uint32_t cur, last, delta, usecs; /* * This works by polling the timer and counting the @@ -291,7 +167,13 @@ delta %= counts_per_usec; } } -#endif +} + +int +sysbeep(int pitch, int period) +{ + + return (0); } /* ==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#4 (text+ko) ==== @@ -2,9 +2,10 @@ # ADM5120 on-board devices # mips/mips32/adm5120/console.c standard -mips/mips32/adm5120/obio.c standard +mips/mips32/adm5120/adm5120_machdep.c standard mips/mips32/adm5120/admpci.c optional admpci mips/mips32/adm5120/if_admsw.c optional admsw +mips/mips32/adm5120/obio.c standard mips/mips32/adm5120/uart_bus_adm5120.c optional uart mips/mips32/adm5120/uart_cpu_adm5120.c optional uart mips/mips32/adm5120/uart_dev_adm5120.c optional uart ==== //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#2 (text+ko) ==== @@ -29,11 +29,55 @@ __FBSDID("$FreeBSD$"); #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include #include +#include +#include +#include +#include + +#ifdef TICK_USE_YAMON_FREQ +#include +#endif + +#ifdef TICK_USE_MALTA_RTC +#include +#include +#include +#endif + #include -void lcd_init(void); -void lcd_puts(char *); +extern int *edata; +extern int *end; + +void lcd_init(void); +void lcd_puts(char *); void malta_reset(void); /* @@ -93,15 +137,157 @@ malta_lcd_print(s); } +#ifdef TICK_USE_MALTA_RTC +static __inline uint8_t +rtcin(uint8_t addr) +{ + + *((volatile uint8_t *) + MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCADR))) = addr; + return (*((volatile uint8_t *) + MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCDAT)))); +} + +static __inline void +writertc(uint8_t addr, uint8_t val) +{ + + *((volatile uint8_t *) + MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCADR))) = addr; + *((volatile uint8_t *) + MIPS_PHYS_TO_KSEG1(MALTA_PCI0_ADDR(MALTA_RTCDAT))) = val; +} +#endif + +void +mips_init(void) +{ + int i; + + printf("entry: mips_init()\n"); + + bootverbose = 1; + realmem = btoc(16 << 20); + + for (i = 0; i < 10; i++) { + phys_avail[i] = 0; + } + + /* phys_avail regions are in bytes */ + phys_avail[0] = MIPS_KSEG0_TO_PHYS((vm_offset_t)&end); + phys_avail[1] = ctob(realmem); + + physmem = realmem; + + init_param1(); + init_param2(physmem); + + mips_cpu_init(); + pmap_bootstrap(); + + proc_linkup(&proc0, &thread0); + thread0.td_kstack = kstack0; + pcpu_init(pcpup, 0, sizeof(struct pcpu)); + pcpup->pc_curthread = &thread0; + cpu_thread_setup(curthread); + pcpup->pc_curpcb = curthread->td_pcb; + + mutex_init(); + +#ifdef DDB + kdb_init(); +#endif +} + +void +platform_halt(void) +{ + +} + + +void +platform_identify(void) +{ + +} + /* * Perform a board-level soft-reset. * Note that this is not emulated by gxemul. */ void -malta_reset(void) +platform_reset(void) { char *c; c = (char *)MIPS_PHYS_TO_KSEG0(MALTA_SOFTRES); *c = MALTA_GORESET; } + +void +platform_trap_enter(void) +{ + +} + +void +platform_trap_exit(void) +{ + +} + +void +platform_start(int argc, char **argv) +{ + vm_offset_t kernend; + uint64_t platform_counter_freq; + + /* clear the BSS and SBSS segments */ + kernend = round_page((vm_offset_t)&end); + memset(&edata, 0, kernend - (vm_offset_t)(&edata)); + + cninit(); + + mips_init(); + do { +#if defined(TICK_USE_YAMON_FREQ) + /* + * If we are running on a board which uses YAMON firmware, + * then query CPU pipeline clock from the syscon object. + * If unsuccessful, use hard-coded default. + */ + platform_counter_freq = yamon_getcpufreq(); + if (platform_counter_freq == 0) + platform_counter_freq = MIPS_DEFAULT_HZ; + +#elif defined(TICK_USE_MALTA_RTC) + /* + * If we are running on a board with the MC146818 RTC, + * use it to determine CPU pipeline clock frequency. + */ + u_int64_t counterval[2]; + + /* Set RTC to binary mode. */ + writertc(RTC_STATUSB, (rtcin(RTC_STATUSB) | RTCSB_BCD)); + + /* Busy-wait for falling edge of RTC update. */ + while (((rtcin(RTC_STATUSA) & RTCSA_TUP) == 0)) + ; + while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0)) + ; + counterval[0] = mips_rd_count(); + + /* Busy-wait for falling edge of RTC update. */ + while (((rtcin(RTC_STATUSA) & RTCSA_TUP) == 0)) + ; + while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0)) + ; + counterval[1] = mips_rd_count(); + + platform_counter_freq = counterval[1] - counterval[0]; +#endif + } while(0); + + tick_init_params(platform_counter_freq, 0); +} ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#10 (text+ko) ==== @@ -5,10 +5,10 @@ # which are believed to be devices we have drivers for # which just need to be tweaked for attachment to an SSB system bus. +mips/mips32/sentry5/s5_machdep.c standard dev/siba/siba.c optional siba dev/siba/siba_pcib.c optional siba pci mips/mips32/sentry5/siba_cc.c optional siba -#mips/mips32/sentry5/s5_machdep.c standard # notyet #mips/mips32/sentry5/siba_mips.c optional siba ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#2 (text+ko) ==== @@ -30,13 +30,220 @@ #include #include -#include +#include + +#include "opt_ddb.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef CFE +#include +#endif + +#ifdef CFE +extern uint32_t cfe_handle; +extern uint32_t cfe_vector; +#endif + +extern int *edata; +extern int *end; + +void +mips_init(void) +{ + int i; + + printf("entry: mips_init()\n"); + +#ifdef CFE + /* + * Query DRAM memory map from CFE. + */ + physmem = 0; + for (i = 0; i < 10; i += 2) { + int result; + uint64_t addr, len, type; + + result = cfe_enummem(i, 0, &addr, &len, &type); + if (result < 0) { + phys_avail[i] = phys_avail[i + 1] = 0; + break; + } + if (type != CFE_MI_AVAILABLE) + continue; + + phys_avail[i] = addr; + if (i == 0 && addr == 0) { + /* + * If this is the first physical memory segment probed + * from CFE, omit the region at the start of physical + * memory where the kernel has been loaded. + */ + phys_avail[i] += MIPS_KSEG0_TO_PHYS((vm_offset_t)&end); + } + phys_avail[i + 1] = addr + len; + physmem += len; + } + + realmem = btoc(physmem); +#endif + + physmem = realmem; + + init_param1(); + init_param2(physmem); + + mips_cpu_init(); + pmap_bootstrap(); + + proc_linkup(&proc0, &thread0); + thread0.td_kstack = kstack0; + pcpu_init(pcpup, 0, sizeof(struct pcpu)); + pcpup->pc_curthread = &thread0; + cpu_thread_setup(curthread); + pcpup->pc_curpcb = curthread->td_pcb; + + mutex_init(); + +#ifdef DDB + kdb_init(); +#endif +} + +void +platform_halt(void) +{ + +} + + +void +platform_identify(void) +{ -void sentry5_reset(void); +} void -sentry5_reset(void) +platform_reset(void) { +#if defined(CFE) + cfe_exit(0, 0); +#else *((volatile uint8_t *)MIPS_PHYS_TO_KSEG1(SENTRY5_EXTIFADR)) = 0x80; +#endif +} + +void +platform_trap_enter(void) +{ + +} + +void +platform_trap_exit(void) +{ + +} + +void +platform_start(int argc, char **argv) +{ + vm_offset_t kernend; + uint64_t platform_counter_freq; + + /* clear the BSS and SBSS segments */ + kernend = round_page((vm_offset_t)&end); + memset(&edata, 0, kernend - (vm_offset_t)(&edata)); + +#ifdef CFE + /* + * Initialize CFE firmware trampolines before + * we initialize the low-level console. + */ + if (cfe_handle != 0) + cfe_init(cfe_handle, cfe_vector); +#endif + cninit(); + +#ifdef CFE + if (cfe_handle == 0) + panic("CFE was not detected by locore.\n"); +#endif + mips_init(); + +# if 0 + /* + * Probe the Broadcom Sentry5's on-chip PLL clock registers + * and discover the CPU pipeline clock and bus clock + * multipliers from this. + * XXX: Wrong place. You have to ask the ChipCommon + * or External Interface cores on the SiBa. + */ + uint32_t busmult, cpumult, refclock, clkcfg1; +#define S5_CLKCFG1_REFCLOCK_MASK 0x0000001F +#define S5_CLKCFG1_BUSMULT_MASK 0x000003E0 +#define S5_CLKCFG1_BUSMULT_SHIFT 5 +#define S5_CLKCFG1_CPUMULT_MASK 0xFFFFFC00 +#define S5_CLKCFG1_CPUMULT_SHIFT 10 + + counter_freq = 100000000; /* XXX */ + + clkcfg1 = s5_rd_clkcfg1(); + printf("clkcfg1 = 0x%08x\n", clkcfg1); + + refclock = clkcfg1 & 0x1F; + busmult = ((clkcfg1 & 0x000003E0) >> 5) + 1; + cpumult = ((clkcfg1 & 0xFFFFFC00) >> 10) + 1; + + printf("refclock = %u\n", refclock); + printf("busmult = %u\n", busmult); + printf("cpumult = %u\n", cpumult); + + counter_freq = cpumult * refclock; +# else + platform_counter_freq = 200 * 1000 * 1000; /* Sentry5 is 200MHz */ +# endif + + tick_init_params(platform_counter_freq, 0); } From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:06:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E3DD16A41B; Sat, 21 Jul 2007 19:06:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D888816A417 for ; Sat, 21 Jul 2007 19:06:57 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B06DD13C45B for ; Sat, 21 Jul 2007 19:06:57 +0000 (UTC) (envelope-from fli@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 l6LJ6vRo010019 for ; Sat, 21 Jul 2007 19:06:57 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJ6v21010016 for perforce@freebsd.org; Sat, 21 Jul 2007 19:06:57 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:06:57 GMT Message-Id: <200707211906.l6LJ6v21010016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123854 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, 21 Jul 2007 19:06:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123854 Change 123854 by fli@fli_nexus on 2007/07/21 19:06:05 Add an asynchronous query system. Its purpose in life is to perform queries on behalf of consumers. It aggregates identical queries from different consumers and makes sure that queries are re-transmitted when needed (continuous queries etc). Consumers are notified when new data is available or when a timeout fires. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:10:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C42FB16A41F; Sat, 21 Jul 2007 19:10:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A60F16A41A for ; Sat, 21 Jul 2007 19:10:02 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31F5013C45E for ; Sat, 21 Jul 2007 19:10:02 +0000 (UTC) (envelope-from fli@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 l6LJA2wD010126 for ; Sat, 21 Jul 2007 19:10:02 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJA1pR010123 for perforce@freebsd.org; Sat, 21 Jul 2007 19:10:01 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:10:01 GMT Message-Id: <200707211910.l6LJA1pR010123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123855 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, 21 Jul 2007 19:10:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=123855 Change 123855 by fli@fli_nexus on 2007/07/21 19:09:20 Add an initial UNIX pipe server, its purpose is to expose the responder to local applications. It acts as a consumer to the query system. Only the query functionality have been implemented this far (oneshot and continuous). Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:18:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 018A416A468; Sat, 21 Jul 2007 19:18:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE4FC16A420 for ; Sat, 21 Jul 2007 19:18:12 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5F1313C46A for ; Sat, 21 Jul 2007 19:18:12 +0000 (UTC) (envelope-from fli@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 l6LJIClq010730 for ; Sat, 21 Jul 2007 19:18:12 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJICUp010721 for perforce@freebsd.org; Sat, 21 Jul 2007 19:18:12 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:18:12 GMT Message-Id: <200707211918.l6LJICUp010721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123856 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, 21 Jul 2007 19:18:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=123856 Change 123856 by fli@fli_nexus on 2007/07/21 19:17:11 Add the initial client protocol used over the local UNIX pipe. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/shared/mdnsd_clipkg.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:19:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C58D216A46E; Sat, 21 Jul 2007 19:19:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AE1B16A41F for ; Sat, 21 Jul 2007 19:19:14 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7AA2D13C468 for ; Sat, 21 Jul 2007 19:19:14 +0000 (UTC) (envelope-from fli@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 l6LJJEUT010766 for ; Sat, 21 Jul 2007 19:19:14 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJJE5t010763 for perforce@freebsd.org; Sat, 21 Jul 2007 19:19:14 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:19:14 GMT Message-Id: <200707211919.l6LJJE5t010763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123857 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, 21 Jul 2007 19:19:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=123857 Change 123857 by fli@fli_nexus on 2007/07/21 19:19:03 Add several new object types used by the query system and by the unix pipe server. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#2 (text+ko) ==== @@ -31,10 +31,12 @@ #include "debug.h" #include "dbrec.h" +#include "clisrv.h" #include "log.h" #include "mdns.h" #include "objalloc.h" #include "output.h" +#include "queries.h" #include "threads.h" #include "stack_mdns.h" @@ -71,7 +73,15 @@ /* Probe/Announce context */ { .os_sz = sizeof(struct dbr_pac) }, /* Output queue entry */ - { .os_sz = sizeof(struct oq_entry) } + { .os_sz = sizeof(struct oq_entry) }, + /* UNIX pipe client */ + { .os_sz = sizeof(struct cs_client) }, + /* Query consumer */ + { .os_sz = sizeof(struct query_cons) }, + /* Query type */ + { .os_sz = sizeof(struct query_type) }, + /* Outstanding UNIX pipe client query */ + { .os_sz = sizeof(struct csc_query) } }; static int obj_table_size = sizeof(obj_table) / sizeof(struct objs); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#2 (text+ko) ==== @@ -31,8 +31,12 @@ #define OBJ_PKG 1 /* struct mdns_packet {} */ #define OBJ_PKGRES 2 /* struct mdns_pkg_res {} */ #define OBJ_PAC 3 /* struct dbr_pac {} */ -#define OBJ_OQE 4 /* stuct oq_entry {} */ -#define _OBJ_MAX OBJ_OQE +#define OBJ_OQE 4 /* struct oq_entry {} */ +#define OBJ_CSC 5 /* struct cs_client {} */ +#define OBJ_QCONS 6 /* struct query_cons {} */ +#define OBJ_QTYPE 7 /* struct query_type {} */ +#define OBJ_CSCQ 8 /* struct csc_query {} */ +#define _OBJ_MAX 8 void obj_init(void); void * obj_alloc(int); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:20:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD0F716A420; Sat, 21 Jul 2007 19:20:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69D7316A417 for ; Sat, 21 Jul 2007 19:20:16 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 418A913C474 for ; Sat, 21 Jul 2007 19:20:16 +0000 (UTC) (envelope-from fli@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 l6LJKGnR010888 for ; Sat, 21 Jul 2007 19:20:16 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJKFUV010885 for perforce@freebsd.org; Sat, 21 Jul 2007 19:20:15 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:20:15 GMT Message-Id: <200707211920.l6LJKFUV010885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123858 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, 21 Jul 2007 19:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=123858 Change 123858 by fli@fli_nexus on 2007/07/21 19:19:49 - Check if argument is NULL before trying to copy it. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#7 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#7 (text+ko) ==== @@ -416,7 +416,8 @@ * properly passed to remove_event() once the event * can be removed. */ - memcpy(&ev->ev_init_arg, arg, sizeof(ev_arg)); + if (arg != NULL) + memcpy(&ev->ev_init_arg, arg, sizeof(ev_arg)); RW_UNLOCK(ev, ev_lock); } From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:22:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B33FE16A41F; Sat, 21 Jul 2007 19:22:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7110D16A419 for ; Sat, 21 Jul 2007 19:22:19 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60BC413C459 for ; Sat, 21 Jul 2007 19:22:19 +0000 (UTC) (envelope-from fli@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 l6LJMJx9011149 for ; Sat, 21 Jul 2007 19:22:19 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJMJDc011146 for perforce@freebsd.org; Sat, 21 Jul 2007 19:22:19 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:22:19 GMT Message-Id: <200707211922.l6LJMJDc011146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123859 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, 21 Jul 2007 19:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=123859 Change 123859 by fli@fli_nexus on 2007/07/21 19:21:40 - Hook up the cache system with the query system, notifies consumers when a record expires. - Fix a resource leak. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#4 (text+ko) ==== @@ -81,11 +81,11 @@ } void -cache_init(struct cache *c) +cache_init(struct cache *c, struct queries *q) { - records_init(&c->c_recs, mdns_c_in); TAILQ_INIT(&c->c_list); + c->c_queries = q; } void @@ -129,9 +129,9 @@ * Adds a resource record to the cache * c - initialized cache structure * rrset - resource record to add + * * If the record is already in cache, its TTL will be reset to the * ttl value specified in the given `rrset'. - * Returns a pointer to the cached resource record. */ int cache_add(struct cache *c, struct mdns_rrset *rrset, struct record_res **new) @@ -194,11 +194,12 @@ cache_del(struct cache *c, struct record_res *rr) { struct cache_res *cr; -#ifdef DEBUG struct record *r = rr->rr_type->rt_record; struct record_type *rt = rr->rr_type; +#ifdef DEBUG time_t rtime = time(NULL); #endif + struct mdns_rrset rs; MDNS_INIT_ASSERT(rr, rr_magic); cr = record_res_getparent(rr); @@ -207,9 +208,20 @@ "attl=%d, rttl=%d, cached=%d", r->r_name, rt->rt_type, rr->rr_len, cr->cr_ttl_abs, cr->cr_ttl_rel, rtime - cr->cr_ctime); + if (c->c_queries != NULL) { + mdns_rrset_name(&rs, r->r_name); + rs.r_ttl = 0; + rs.r_class = mdns_c_in; + rs.r_type = rt->rt_type; + rs.r_data = rr->rr_data; + rs.r_datalen = rr->rr_len; + query_notify(c->c_queries, &rs, 0, 0, 0); + } + MDNS_INIT_ASSERT(cr, cr_magic); dequeue_ttl(c, cr); record_res_del(rr); + record_release(r); MDNS_INIT_UNSET(cr, cr_magic); free(cr); return (0); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:25:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6C0016A421; Sat, 21 Jul 2007 19:25:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08A516A417 for ; Sat, 21 Jul 2007 19:25:23 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A051613C48E for ; Sat, 21 Jul 2007 19:25:23 +0000 (UTC) (envelope-from fli@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 l6LJPNM2011294 for ; Sat, 21 Jul 2007 19:25:23 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJPNTQ011291 for perforce@freebsd.org; Sat, 21 Jul 2007 19:25:23 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:25:23 GMT Message-Id: <200707211925.l6LJPNTQ011291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123860 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, 21 Jul 2007 19:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123860 Change 123860 by fli@fli_nexus on 2007/07/21 19:24:22 - Follow cache system changes. - Add query system structure to interface. - Add an array with interface pointers (indexed by interface index). - Add unix pipe server to global software state structure. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#5 (text+ko) ==== @@ -32,11 +32,13 @@ #include "debug.h" #include "dbrec.h" +#include "clisrv.h" #include "event.h" #include "hash.h" #include "mdns.h" #include "output.h" #include "output_aggr.h" +#include "queries.h" #include "record.h" #include "threads.h" #include "var.h" @@ -54,7 +56,12 @@ struct eventlist *g_evl; /* Event list (own locking) */ struct mdns_bufpool *g_bp; /* Buffer pool */ DEF_MTX(g_bp_mtx); - TAILQ_HEAD(, md_if) g_ifs; /* Active interfaces */ + TAILQ_HEAD(, md_if) g_ifs_head; /* Active interfaces */ + struct md_if **g_ifs; /* Interfaces by index */ + int g_ifs_max; /* Maximum interface index */ + int g_flags; +#define GLOB_CSOPEN 0x01 /* unix client pipe open */ + struct clisrv g_cs; /* unix client pipe server */ }; /* @@ -74,6 +81,7 @@ */ struct cache { struct records c_recs; + struct queries *c_queries; TAILQ_HEAD(, cache_res) c_list; /* time delta list */ }; @@ -109,7 +117,8 @@ struct dbr mif_dbr; /* Self-claimed record database */ struct aqueue mif_aq4; /* INET4 multicast aggregation queue */ struct aqueue mif_aq6; /* INET6 multicast aggregation queue */ - struct oqueue mif_oq; /* Output queue */ + struct oqueue mif_oq; /* Output queue */ + struct queries mif_q; /* Outstanding queries */ char mif_ifnam[IFNAMSIZ]; }; @@ -119,7 +128,7 @@ wchar_t * _wcsdup(const wchar_t *); /* cache.c */ -void cache_init(struct cache *); +void cache_init(struct cache *, struct queries *); void cache_destroy(struct cache *); int cache_add(struct cache *, struct mdns_rrset *, struct record_res **); int cache_del(struct cache *, struct record_res *); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:28:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 648B616A41A; Sat, 21 Jul 2007 19:28:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0133B16A418 for ; Sat, 21 Jul 2007 19:28:28 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E481D13C45A for ; Sat, 21 Jul 2007 19:28:27 +0000 (UTC) (envelope-from fli@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 l6LJSRvv011399 for ; Sat, 21 Jul 2007 19:28:27 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJSRjw011392 for perforce@freebsd.org; Sat, 21 Jul 2007 19:28:27 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:28:27 GMT Message-Id: <200707211928.l6LJSRjw011392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123861 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, 21 Jul 2007 19:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=123861 Change 123861 by fli@fli_nexus on 2007/07/21 19:28:25 - Break out response processing to its own routine and hook up the query system to it. - Follow cache system changes. - Add initialization to the query system and to the unix pipe server. - Add bits needed to the interface array. - Add -u and -g flags that allow one to specify another user to run the daemon as. - Attempt to raise privileges during unix pipe setup, they are dropped before any other processing begins. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#5 (text+ko) ==== @@ -35,8 +35,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -141,7 +143,7 @@ struct md_if *mif; RW_RLOCK(g, g_lock); - TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { + TAILQ_FOREACH(mif, &g->g_ifs_head, mif_next) { if (if_aquire(mif, 1) != 0) continue; @@ -169,7 +171,7 @@ if (mif->mif_flags & MIF_LINKUP) { mif->mif_flags &= ~MIF_LINKUP; cache_destroy(&mif->mif_cache); - cache_init(&mif->mif_cache); + cache_init(&mif->mif_cache, &mif->mif_q); dprintf(DEBUG_MISC, "Link state change to DOWN on %s", mif->mif_ifnam); } @@ -340,7 +342,7 @@ * Process the answer section first */ if (hdr->h_canswer > 0) - cache_init(&ac); + cache_init(&ac, NULL); for (i = 0; i < hdr->h_canswer; i++) { error = mdns_pkg_getanswer(pkg, i, &rs); if (error != 0) @@ -518,6 +520,55 @@ } /* + * Process a response + */ +static void +process_resp(struct md_if *mif, struct mdns_packet *pkg, struct mdns_head *hdr, + struct sockaddr *from, socklen_t fromlen __unused) +{ + struct dbr_rec *dr; + int i, error; + struct mdns_rrset rs; + + for (i = 0; i < hdr->h_canswer; i++) { + error = mdns_pkg_getanswer(pkg, i, &rs); + if (error != 0) + break; + if (rs.r_class != mdns_c_in) { + free(rs.r_data); + continue; + } + + dprintf(DEBUG_RECV, "response to %s, class=%d, type=%d", + rs.r_name, rs.r_class, rs.r_type); + + dr = dbr_find(&mif->mif_dbr, rs.r_name); + if (dr != NULL && !(dr->dr_flags & DR_SHARED)) { + dprintf(DEBUG_SEND, "Conflicting name %s", rs.r_name); + dbr_defend(&mif->mif_dbr, dr, &rs, from->sa_family); + continue; + } + + /* Notify pending consumers */ + query_notify(&mif->mif_q, &rs, mif->mif_index, + from->sa_family, ((i + 1) < hdr->h_canswer)); + + /* TODO: check for pending questions matching this */ + /* TODO: check for pending answers matching this */ + + /* + * Purge records older than 1 second if this is + * supposed to be a unique rrset (cache flush bit set) + */ + if (rs.r_cflush) + cache_purge(&mif->mif_cache, 1, rs.r_name, rs.r_type); + error = cache_add(&mif->mif_cache, &rs, NULL); + if (error == 1) + free(rs.r_data); + } +} + +/* * Process a mdns packet and generate appropriate responses * mif - Interface handle * pc - Packet chain @@ -531,9 +582,7 @@ { struct mdns_packet *pkg; struct mdns_head hdr; - struct mdns_rrset rs; - struct dbr_rec *dr; - int i, error, sinaddr_len, legacy; + int sinaddr_len, legacy; in_port_t port; void *sinaddr = NULL; struct sockaddr_in *sin; @@ -588,41 +637,7 @@ * We are processing a response */ else if (hdr.h_flags & MDNS_HEAD_RESP) { - - for (i = 0; i < hdr.h_canswer; i++) { - error = mdns_pkg_getanswer(pkg, i, &rs); - if (error != 0) - break; - if (rs.r_class != mdns_c_in) { - free(rs.r_data); - continue; - } - - dr = dbr_find(&mif->mif_dbr, rs.r_name); - if (dr != NULL && !(dr->dr_flags & DR_SHARED)) { - dprintf(DEBUG_SEND, "Conflicting name %s " - "with peer %s", rs.r_name, addr); - dbr_defend(&mif->mif_dbr, dr, &rs, - from->sa_family); - continue; - } - - - /* TODO: check for waiting clients */ - /* TODO: check for pending questions matching this */ - /* TODO: check for pending answers matching this */ - - /* - * Purge records older than 1 second if this is - * supposed to be a unique rrset (cache flush bit set) - */ - if (rs.r_cflush) - cache_purge(&mif->mif_cache, 1, rs.r_name, - rs.r_type); - error = cache_add(&mif->mif_cache, &rs, NULL); - if (error == 1) - free(rs.r_data); - } + process_resp(mif, pkg, &hdr, from, fromlen); } return (0); } @@ -986,7 +1001,7 @@ if_new(struct md_glob *g, const char *ifnam) { struct md_if *mif; - int error; + int error, diff; struct aq_func aqf; mif = malloc(sizeof(struct md_if)); @@ -1012,8 +1027,11 @@ if (get_linkstatus(ifnam) != LINK_STATE_DOWN) mif->mif_flags |= MIF_LINKUP; + /* Client queries system */ + queries_init(&mif->mif_q, mif); + /* Initialize cache */ - cache_init(&mif->mif_cache); + cache_init(&mif->mif_cache, &mif->mif_q); /* Initialize output queue */ oq_init(&mif->mif_oq, mif); @@ -1040,7 +1058,15 @@ cfg_read(&mif->mif_dbr, ifnam, g->g_cfgfile); RW_WLOCK(g, g_lock); - TAILQ_INSERT_TAIL(&g->g_ifs, mif, mif_next); + TAILQ_INSERT_TAIL(&g->g_ifs_head, mif, mif_next); + if (mif->mif_index >= g->g_ifs_max) { + diff = mif->mif_index - g->g_ifs_max; + g->g_ifs = realloc(g->g_ifs, + sizeof(struct md_if *) * (mif->mif_index + 1)); + bzero(g->g_ifs + g->g_ifs_max, sizeof(struct md_if *) * diff); + g->g_ifs_max = mif->mif_index; + } + g->g_ifs[mif->mif_index] = mif; RW_UNLOCK(g, g_lock); RW_UNLOCK(mif, mif_lock); @@ -1069,7 +1095,8 @@ mif->mif_flags |= MIF_DYING; RW_WLOCK(g, g_lock); - TAILQ_REMOVE(&g->g_ifs, mif, mif_next); + TAILQ_REMOVE(&g->g_ifs_head, mif, mif_next); + g->g_ifs[mif->mif_index] = NULL; RW_UNLOCK(g, g_lock); TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { @@ -1086,6 +1113,7 @@ mdns_destroy(&mif->mif_stack); cache_destroy(&mif->mif_cache); dbr_destroy(&mif->mif_dbr); + queries_destroy(&mif->mif_q); logger(LOG_NOTICE, "Removed interface %s", mif->mif_ifnam); if_release(mif, 1); @@ -1097,7 +1125,7 @@ { struct md_if *mif; - TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { + TAILQ_FOREACH(mif, &g->g_ifs_head, mif_next) { if (idx == mif->mif_index) return (mif); } @@ -1231,20 +1259,26 @@ usage(char *exec) { - printf("usage %s [-h] [-d] [-f config]\n", exec); + printf("usage %s [-h] [-d] [-f config] " + "[-u username] [-g group]\n", exec); } int main(int argc, char *argv[]) { int error, ch, nodaemon = 0; - char *ifnam, *cfgfile = NULL; + char *ifnam, *cfgfile = NULL, *servpath = NULL; + char *username = NULL, *group = NULL; struct ifaddrs *ifap, *ifa; struct md_if *mif, *mif2; + struct passwd *pw; + struct group *grp; + ev_arg eva; + uid_t uid, euid; + gid_t gid, egid; struct md_glob glob; - ev_arg eva; - while ((ch = getopt(argc, argv, "h?df")) != -1) { + while ((ch = getopt(argc, argv, "h?df:u:g:")) != -1) { switch (ch) { case '?': case 'h': @@ -1255,6 +1289,12 @@ break; case 'f': cfgfile = argv[optind - 1]; + case 'u': + username = argv[optind - 1]; + break; + case 'g': + group = argv[optind - 1]; + break; default: usage(argv[0]); exit(EXIT_FAILURE); @@ -1264,7 +1304,7 @@ bzero(&glob, sizeof(struct md_glob)); RW_INIT(&glob, g_lock, NULL); MTX_INIT(&glob, g_bp_mtx, NULL); - TAILQ_INIT(&glob.g_ifs); + TAILQ_INIT(&glob.g_ifs_head); glob.g_cfgfile = cfgfile != NULL ? cfgfile : strdup(DEFAULT_CFGFILE); /* Initialize logging */ @@ -1332,13 +1372,46 @@ tmr_start(&glob, 1000, evh_cacheclean, &glob, 0); + uid = getuid(); + euid = geteuid(); + setuid(euid); + + gid = getgid(); + egid = getegid(); + setgid(egid); + + /* Open UNIX pipe to clients */ + error = csrv_open(&glob.g_cs, &glob, servpath != NULL ? + servpath : DEFAULT_CLISRV_PIPE); + if (error == 0) + glob.g_flags |= GLOB_CSOPEN; + + if (username != NULL) { + pw = getpwnam(username); + if (pw != NULL) + uid = pw->pw_uid; + } + if (group != NULL) { + grp = getgrnam(group); + if (grp != NULL) + gid = grp->gr_gid; + } + + /* Drop privileges */ + setuid(uid); + setgid(gid); + /* Launch the event dispatcher */ error = event_dispatch(glob.g_evl, glob.g_wq); - TAILQ_FOREACH_SAFE(mif, &glob.g_ifs, mif_next, mif2) { + + TAILQ_FOREACH_SAFE(mif, &glob.g_ifs_head, mif_next, mif2) { if_del(&glob, mif); } + if (glob.g_flags & GLOB_CSOPEN) + csrv_close(&glob.g_cs); + wq_destroy(glob.g_wq); event_destroy(glob.g_evl); mdns_bufpool_destroy(glob.g_bp); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:29:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1024716A420; Sat, 21 Jul 2007 19:29:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E217F16A41B for ; Sat, 21 Jul 2007 19:29:29 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9AD013C442 for ; Sat, 21 Jul 2007 19:29:29 +0000 (UTC) (envelope-from fli@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 l6LJTTHm011471 for ; Sat, 21 Jul 2007 19:29:29 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJTT8k011468 for perforce@freebsd.org; Sat, 21 Jul 2007 19:29:29 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:29:29 GMT Message-Id: <200707211929.l6LJTT8k011468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123862 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, 21 Jul 2007 19:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=123862 Change 123862 by fli@fli_nexus on 2007/07/21 19:29:25 Debugging printout control bits to the query system and to the unix pipe server. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#4 (text+ko) ==== @@ -45,6 +45,8 @@ #define DEBUG_VAR 0x0800 #define DEBUG_MISC 0x1000 #define DEBUG_OA 0x2000 +#define DEBUG_CS 0x4000 +#define DEBUG_QUERY 0x8000 /* * Structure initialization protection From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:30:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD97616A418; Sat, 21 Jul 2007 19:30:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A197416A41A for ; Sat, 21 Jul 2007 19:30:31 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9131C13C45B for ; Sat, 21 Jul 2007 19:30:31 +0000 (UTC) (envelope-from fli@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 l6LJUVi3011575 for ; Sat, 21 Jul 2007 19:30:31 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJUVqv011572 for perforce@freebsd.org; Sat, 21 Jul 2007 19:30:31 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:30:31 GMT Message-Id: <200707211930.l6LJUVqv011572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123863 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, 21 Jul 2007 19:30:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=123863 Change 123863 by fli@fli_nexus on 2007/07/21 19:30:09 - Hook up new files to be build - Sort SRCS Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#5 (text+ko) ==== @@ -1,10 +1,11 @@ -SRCS= stack_mdns.c stack_packet.c stack_buf.c stack_util.c hash.c \ - utf8.c event.c wqueue.c log.c mdnsd.c record.c cache.c dbrec.c var.c \ - output.c output_aggr.c objalloc.c token.l parse.y y.tab.h +SRCS= cache.c clisrv.c dbrec.c event.c hash.c log.c mdnsd.c objalloc.c \ + output.c output_aggr.c parse.y queries.c record.c stack_buf.c \ + stack_mdns.c stack_packet.c stack_util.c token.l utf8.c var.c \ + wqueue.c y.tab.h PROG= mdnsd WARNS?= 4 -CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0x1bd0 +CFLAGS+= -I../shared -Wall -g -DDEBUG -DDEBUG_MASK=0xdbf0 .if !defined(WITHOUT_INET6) CFLAGS+= -DINET6 .endif From owner-p4-projects@FreeBSD.ORG Sat Jul 21 22:19:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE80C16A46B; Sat, 21 Jul 2007 22:19:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9038616A41B for ; Sat, 21 Jul 2007 22:19:16 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BF3313C474 for ; Sat, 21 Jul 2007 22:19:16 +0000 (UTC) (envelope-from gonzo@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 l6LMJGhW036153 for ; Sat, 21 Jul 2007 22:19:16 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LMGC3g035922 for perforce@freebsd.org; Sat, 21 Jul 2007 22:16:12 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 21 Jul 2007 22:16:12 GMT Message-Id: <200707212216.l6LMGC3g035922@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 123868 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, 21 Jul 2007 22:19:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=123868 Change 123868 by gonzo@gonzo_jeeves on 2007/07/21 22:12:20 IFC Affected files ... .. //depot/projects/mips2/src/MAINTAINERS#6 integrate .. //depot/projects/mips2/src/Makefile#3 integrate .. //depot/projects/mips2/src/Makefile.inc1#5 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/mips2/src/UPDATING#6 integrate .. //depot/projects/mips2/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/mips2/src/bin/csh/config.h#3 integrate .. //depot/projects/mips2/src/bin/csh/config_p.h#3 integrate .. //depot/projects/mips2/src/bin/date/date.1#2 integrate .. //depot/projects/mips2/src/bin/df/df.c#4 integrate .. //depot/projects/mips2/src/bin/ed/Makefile#2 integrate .. //depot/projects/mips2/src/bin/mv/mv.1#2 integrate .. //depot/projects/mips2/src/bin/pax/ar_io.c#2 integrate .. //depot/projects/mips2/src/bin/pax/file_subs.c#2 integrate .. //depot/projects/mips2/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/mips2/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/mips2/src/bin/pax/tables.c#2 integrate .. //depot/projects/mips2/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/mips2/src/bin/sh/var.c#2 integrate .. //depot/projects/mips2/src/cddl/lib/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/mips2/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/mips2/src/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/mips2/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/mips2/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ#3 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/mips2/src/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/mips2/src/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/README#3 integrate .. //depot/projects/mips2/src/contrib/bind9/README.idnkit#1 branch .. //depot/projects/mips2/src/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/aclconf.c#3 delete .. //depot/projects/mips2/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/configure.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 21 22:33:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CA816A419; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B694216A46E for ; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2C2D13C45A for ; Sat, 21 Jul 2007 22:33:34 +0000 (UTC) (envelope-from fli@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 l6LMXYPZ037405 for ; Sat, 21 Jul 2007 22:33:34 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LMXYsT037402 for perforce@freebsd.org; Sat, 21 Jul 2007 22:33:34 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 22:33:34 GMT Message-Id: <200707212233.l6LMXYsT037402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 123869 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, 21 Jul 2007 22:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=123869 Change 123869 by fli@fli_nexus on 2007/07/21 22:32:48 Ops, the timeout struct member seems to have been misplaced in the query message. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/shared/mdnsd_clipkg.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/shared/mdnsd_clipkg.h#2 (text+ko) ==== @@ -103,19 +103,19 @@ * wide character encoded domain name. * Direction: Client -> Server * - * 0 7 15 23 24 47 63 79 95 - * +----+----+----+-+-----------+--------+--------+--------+----//----+ - * |cmd |len |fam |a| ifidx | tout | class | type | name | - * +----+----+----+-+-----------+--------+--------+--------+----//----+ + * 0 7 15 31 39 63 79 95 + * +----+----+--------+----+------------+--------+--------+---//---+ + * |cmd |len |timeout |fam | ifidx | class | type | name | + * +----+----+--------+----+------------+--------+--------+---//---+ * * `cmd' - is the query type which is defined as follows * 1 = oneshot query * 2 = register a continuous query * 3 = deregister a continuous query * `len' - The length of the domain name in characters, not bytes. + * `timeout' - Timeout in seconds before giving up (oneshot only) * `ifany' - If set, do the query on all active interfaces * `ifidx' - If `ifany' is zero, this specifies the inteface index - * `timeout' - Timeout in seconds before giving up (oneshot only) * `class' - Should contain the desired class, or mdns_c_any * `type' - Should contain the desired type or mdns_t_any * `name' - Wide character encoded (wchar_t) domain name @@ -142,9 +142,9 @@ struct cp_query { uint8_t cpq_cmd; /* query command */ uint8_t cpq_len; /* query name length in characters */ + uint16_t cpq_timeout; /* timeout in seconds (oneshot only) */ unsigned int cpq_fam:8; /* address family to query */ unsigned int cpq_ifidx:24; /* interface index, 0 = all ifs */ - uint16_t cpq_timeout; /* timeout in seconds (oneshot only) */ uint16_t cpq_class; /* query class */ uint16_t cpq_type; /* query type */ /* Query name follows */ From owner-p4-projects@FreeBSD.ORG Sat Jul 21 22:39:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE3816A41F; Sat, 21 Jul 2007 22:39:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2A4716A41B for ; Sat, 21 Jul 2007 22:39:42 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A047113C459 for ; Sat, 21 Jul 2007 22:39:42 +0000 (UTC) (envelope-from peter@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 l6LMdgih038019 for ; Sat, 21 Jul 2007 22:39:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LMdgHQ038016 for perforce@freebsd.org; Sat, 21 Jul 2007 22:39:42 GMT (envelope-from peter@freebsd.org) Date: Sat, 21 Jul 2007 22:39:42 GMT Message-Id: <200707212239.l6LMdgHQ038016@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 123870 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, 21 Jul 2007 22:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=123870 Change 123870 by peter@peter_overcee on 2007/07/21 22:39:35 Fix startup order bug that causes local apic startup to happen in an indeterminate order relative to cpu_startup/printcpuinfo. If it happens before printcpuinfo, then the CPUID_HTT turnoff won't have happened yet, and it can put both physical cores into a htt group. This is kind of a bandaid. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#73 edit .. //depot/projects/hammer/sys/i386/i386/local_apic.c#30 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#73 (text+ko) ==== @@ -1065,7 +1065,7 @@ mp_topology(); #endif } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/hammer/sys/i386/i386/local_apic.c#30 (text+ko) ==== @@ -1069,7 +1069,7 @@ mp_topology(); #endif } -SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) +SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL) /* * Setup the I/O APICs. From owner-p4-projects@FreeBSD.ORG Sat Jul 21 23:38:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2A4816A419; Sat, 21 Jul 2007 23:38:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CD5116A417 for ; Sat, 21 Jul 2007 23:38:57 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A44213C459 for ; Sat, 21 Jul 2007 23:38:57 +0000 (UTC) (envelope-from cnst@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 l6LNcv7h045394 for ; Sat, 21 Jul 2007 23:38:57 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LNcuQW045391 for perforce@freebsd.org; Sat, 21 Jul 2007 23:38:56 GMT (envelope-from cnst@FreeBSD.org) Date: Sat, 21 Jul 2007 23:38:56 GMT Message-Id: <200707212338.l6LNcuQW045391@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 123873 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, 21 Jul 2007 23:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123873 Change 123873 by cnst@dale on 2007/07/21 23:38:16 don't put '\n' at the end of desc when we don't know what exact chip we deal with (missed from my previous submit converting lm(4) to use device_set_desc) Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#5 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#4 $ */ +/* $P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78.c#5 $ */ /* $FreeBSD$ */ /* $OpenBSD: lm78.c,v 1.18 2007/05/26 22:47:39 cnst Exp $ */ @@ -491,7 +491,7 @@ chipid = sc->lm_readreg(sc, LM_CHIPID) & LM_CHIPID_MASK; snprintf(fulldesc, sizeof(fulldesc), - "unknown Hardware Monitor (ID 0x%x)\n", chipid); + "unknown Hardware Monitor (ID 0x%x)", chipid); device_set_desc_copy(sc->sc_dev, fulldesc); lm_setup_sensors(sc, lm78_sensors); @@ -594,7 +594,8 @@ break; default: snprintf(fulldesc, sizeof(fulldesc), - "unknown Winbond Hardware Monitor (Chip ID 0x%x)\n", sc->chipid); + "unknown Winbond Hardware Monitor (Chip ID 0x%x)", + sc->chipid); device_set_desc_copy(sc->sc_dev, fulldesc); /* Handle as a standard LM78. */ lm_setup_sensors(sc, lm78_sensors); From owner-p4-projects@FreeBSD.ORG Sat Jul 21 23:42:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C2AB16A41B; Sat, 21 Jul 2007 23:42:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1689516A418 for ; Sat, 21 Jul 2007 23:42:02 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 045DA13C428 for ; Sat, 21 Jul 2007 23:42:02 +0000 (UTC) (envelope-from cnst@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 l6LNg1bQ045784 for ; Sat, 21 Jul 2007 23:42:01 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LNg1w9045779 for perforce@freebsd.org; Sat, 21 Jul 2007 23:42:01 GMT (envelope-from cnst@FreeBSD.org) Date: Sat, 21 Jul 2007 23:42:01 GMT Message-Id: <200707212342.l6LNg1w9045779@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 123874 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, 21 Jul 2007 23:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=123874 Change 123874 by cnst@dale on 2007/07/21 23:41:40 KNF Affected files ... .. //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sysctl.c#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sysctl.c#3 (text+ko) ==== @@ -156,18 +156,16 @@ int error; error = ENOENT; - if (oidp->oid_number == OID_AUTO) { + if (oidp->oid_number == OID_AUTO) error = EINVAL; - } else { - SLIST_FOREACH(p, oidp->oid_parent, oid_link) { + else + SLIST_FOREACH(p, oidp->oid_parent, oid_link) if (p == oidp) { SLIST_REMOVE(oidp->oid_parent, oidp, sysctl_oid, oid_link); error = 0; break; } - } - } /* * This can happen when a module fails to register and is