svn commit: r249362 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/lib/libzfs/common contrib/ldns contrib/ldns/ldns contrib/mtree gnu/usr.bin/groff/tmac include/protocols lib/libc/net l...

Attilio Rao attilio at FreeBSD.org
Thu Apr 11 14:02:19 UTC 2013


Author: attilio
Date: Thu Apr 11 14:02:14 2013
New Revision: 249362
URL: http://svnweb.freebsd.org/changeset/base/249362

Log:
  MFC

Added:
  user/attilio/vmcontention/contrib/mtree/only.c
     - copied unchanged from r249361, head/contrib/mtree/only.c
Modified:
  user/attilio/vmcontention/Makefile
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/attilio/vmcontention/contrib/ldns/README
  user/attilio/vmcontention/contrib/ldns/README.svn
  user/attilio/vmcontention/contrib/ldns/dnssec_sign.c
  user/attilio/vmcontention/contrib/ldns/dnssec_verify.c
  user/attilio/vmcontention/contrib/ldns/dnssec_zone.c
  user/attilio/vmcontention/contrib/ldns/ldns/dname.h
  user/attilio/vmcontention/contrib/ldns/parse.c
  user/attilio/vmcontention/contrib/ldns/rr.c
  user/attilio/vmcontention/contrib/ldns/util.c
  user/attilio/vmcontention/contrib/ldns/zone.c
  user/attilio/vmcontention/contrib/mtree/Makefile
  user/attilio/vmcontention/contrib/mtree/create.c
  user/attilio/vmcontention/contrib/mtree/extern.h
  user/attilio/vmcontention/contrib/mtree/mtree.8
  user/attilio/vmcontention/contrib/mtree/mtree.c
  user/attilio/vmcontention/contrib/mtree/verify.c
  user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local
  user/attilio/vmcontention/include/protocols/timed.h
  user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c
  user/attilio/vmcontention/lib/libc/stdio/fwalk.c
  user/attilio/vmcontention/lib/libkvm/Makefile
  user/attilio/vmcontention/lib/libkvm/kvm.h
  user/attilio/vmcontention/lib/libkvm/kvm_getpcpu.3
  user/attilio/vmcontention/lib/libkvm/kvm_pcpu.c
  user/attilio/vmcontention/lib/libthr/thread/thr_sig.c
  user/attilio/vmcontention/share/man/man4/ciss.4
  user/attilio/vmcontention/sys/amd64/include/clock.h
  user/attilio/vmcontention/sys/amd64/vmm/intel/vmx.c
  user/attilio/vmcontention/sys/amd64/vmm/x86.c
  user/attilio/vmcontention/sys/cam/ata/ata_da.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_all.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/options
  user/attilio/vmcontention/sys/dev/ahci/ahci.c
  user/attilio/vmcontention/sys/dev/ahci/ahci.h
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx_edma.c
  user/attilio/vmcontention/sys/dev/ciss/ciss.c
  user/attilio/vmcontention/sys/dev/dpt/dpt.h
  user/attilio/vmcontention/sys/dev/dpt/dpt_scsi.c
  user/attilio/vmcontention/sys/dev/e1000/if_igb.c
  user/attilio/vmcontention/sys/dev/firewire/firewire.c
  user/attilio/vmcontention/sys/dev/pci/vga_pci.c
  user/attilio/vmcontention/sys/dev/usb/controller/xhci_pci.c
  user/attilio/vmcontention/sys/i386/include/counter.h
  user/attilio/vmcontention/sys/kern/uipc_socket.c
  user/attilio/vmcontention/sys/net/if.c
  user/attilio/vmcontention/sys/net/if_bridge.c
  user/attilio/vmcontention/sys/net/if_llatbl.c
  user/attilio/vmcontention/sys/net/if_llatbl.h
  user/attilio/vmcontention/sys/net/if_var.h
  user/attilio/vmcontention/sys/netinet/in_pcb.h
  user/attilio/vmcontention/sys/netinet/in_var.h
  user/attilio/vmcontention/sys/netinet/ip6.h
  user/attilio/vmcontention/sys/netinet/ip_id.c
  user/attilio/vmcontention/sys/netinet/ip_input.c
  user/attilio/vmcontention/sys/netinet/tcp_input.c
  user/attilio/vmcontention/sys/netinet/tcp_subr.c
  user/attilio/vmcontention/sys/netinet6/dest6.c
  user/attilio/vmcontention/sys/netinet6/frag6.c
  user/attilio/vmcontention/sys/netinet6/in6_gif.c
  user/attilio/vmcontention/sys/netinet6/in6_src.c
  user/attilio/vmcontention/sys/netinet6/ip6_forward.c
  user/attilio/vmcontention/sys/netinet6/ip6_input.c
  user/attilio/vmcontention/sys/netinet6/ip6_ipsec.c
  user/attilio/vmcontention/sys/netinet6/ip6_mroute.c
  user/attilio/vmcontention/sys/netinet6/ip6_output.c
  user/attilio/vmcontention/sys/netinet6/raw_ip6.c
  user/attilio/vmcontention/sys/netinet6/route6.c
  user/attilio/vmcontention/sys/netipsec/ipsec_input.c
  user/attilio/vmcontention/sys/netipsec/ipsec_output.c
  user/attilio/vmcontention/sys/powerpc/include/counter.h
  user/attilio/vmcontention/sys/powerpc/include/pcpu.h
  user/attilio/vmcontention/sys/sys/socketvar.h
  user/attilio/vmcontention/sys/sys/syslog.h
  user/attilio/vmcontention/sys/sys/ttydefaults.h
  user/attilio/vmcontention/sys/vm/uma.h
  user/attilio/vmcontention/sys/vm/uma_core.c
  user/attilio/vmcontention/sys/vm/uma_dbg.c
  user/attilio/vmcontention/sys/vm/uma_int.h
  user/attilio/vmcontention/sys/vm/vm_map.c
  user/attilio/vmcontention/sys/x86/include/specialreg.h
  user/attilio/vmcontention/sys/x86/x86/tsc.c
  user/attilio/vmcontention/usr.bin/ctlstat/ctlstat.c
  user/attilio/vmcontention/usr.bin/fstat/fuser.1
  user/attilio/vmcontention/usr.bin/netstat/inet.c
  user/attilio/vmcontention/usr.bin/netstat/main.c
  user/attilio/vmcontention/usr.bin/netstat/netstat.h
  user/attilio/vmcontention/usr.sbin/bhyve/bhyverun.c
  user/attilio/vmcontention/usr.sbin/bhyve/consport.c
  user/attilio/vmcontention/usr.sbin/bhyve/dbgport.c
  user/attilio/vmcontention/usr.sbin/bhyve/inout.c
  user/attilio/vmcontention/usr.sbin/bhyve/inout.h
  user/attilio/vmcontention/usr.sbin/bhyve/mem.c
  user/attilio/vmcontention/usr.sbin/bhyve/mem.h
  user/attilio/vmcontention/usr.sbin/bhyve/pci_emul.c
  user/attilio/vmcontention/usr.sbin/bhyve/pmtmr.c
  user/attilio/vmcontention/usr.sbin/ctladm/ctladm.c
  user/attilio/vmcontention/usr.sbin/nmtree/Makefile
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/attilio/vmcontention/contrib/ldns/   (props changed)
  user/attilio/vmcontention/contrib/mtree/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/share/man/man4/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/amd64/vmm/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/usr.sbin/bhyve/   (props changed)

Modified: user/attilio/vmcontention/Makefile
==============================================================================
--- user/attilio/vmcontention/Makefile	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/Makefile	Thu Apr 11 14:02:14 2013	(r249362)
@@ -361,7 +361,7 @@ MAKEFAIL=tee -a ${FAILFILE}
 MAKEFAIL=cat
 .endif
 
-universe: universe_prologue
+universe: universe_prologue upgrade_checks
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
@@ -371,7 +371,7 @@ universe_prologue:
 .endif
 .for target in ${TARGETS}
 universe: universe_${target}
-.ORDER: universe_prologue universe_${target} universe_epilogue
+.ORDER: universe_prologue upgrade_checks universe_${target}_prologue universe_${target} universe_epilogue
 universe_${target}: universe_${target}_prologue
 universe_${target}_prologue:
 	@echo ">> ${target} started on `LC_ALL=C date`"

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -72,7 +72,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_
 	if (zfs_ioctl_version == ZFS_IOCVER_UNDEF)
 		zfs_ioctl_version = get_zfs_ioctl_version();
 
-	if (zfs_ioctl_version == ZFS_IOCVER_DEADMAN)
+	if (zfs_ioctl_version == ZFS_IOCVER_LZC)
+		cflag = ZFS_CMD_COMPAT_LZC;
+	else if (zfs_ioctl_version == ZFS_IOCVER_DEADMAN)
 		cflag = ZFS_CMD_COMPAT_DEADMAN;
 
 	/*

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -4203,6 +4203,17 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	ha.tag = tag;
 	ha.recursive = recursive;
 	(void) zfs_hold_one(zfs_handle_dup(zhp), &ha);
+
+	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+		fnvlist_free(ha.nvl);
+		ret = ENOENT;
+		(void) snprintf(errbuf, sizeof (errbuf),
+		    dgettext(TEXT_DOMAIN, "cannot hold snapshot '%s@%s'"),
+		    zhp->zfs_name, snapname);
+		(void) zfs_standard_error(hdl, ret, errbuf);
+		return (ret);
+	}
+
 	ret = lzc_hold(ha.nvl, cleanup_fd, &errors);
 	fnvlist_free(ha.nvl);
 
@@ -4304,12 +4315,25 @@ zfs_release(zfs_handle_t *zhp, const cha
 	nvlist_t *errors;
 	nvpair_t *elem;
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
+	char errbuf[1024];
 
 	ha.nvl = fnvlist_alloc();
 	ha.snapname = snapname;
 	ha.tag = tag;
 	ha.recursive = recursive;
 	(void) zfs_release_one(zfs_handle_dup(zhp), &ha);
+
+	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
+		fnvlist_free(ha.nvl);
+		ret = ENOENT;
+		(void) snprintf(errbuf, sizeof (errbuf),
+		    dgettext(TEXT_DOMAIN,
+		    "cannot release hold from snapshot '%s@%s'"),
+		    zhp->zfs_name, snapname);
+		(void) zfs_standard_error(hdl, ret, errbuf);
+		return (ret);
+	}
+
 	ret = lzc_release(ha.nvl, &errors);
 	fnvlist_free(ha.nvl);
 
@@ -4318,8 +4342,6 @@ zfs_release(zfs_handle_t *zhp, const cha
 
 	if (nvlist_next_nvpair(errors, NULL) == NULL) {
 		/* no hold-specific errors */
-		char errbuf[1024];
-
 		(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
 		    "cannot release"));
 		switch (errno) {
@@ -4336,8 +4358,6 @@ zfs_release(zfs_handle_t *zhp, const cha
 	for (elem = nvlist_next_nvpair(errors, NULL);
 	    elem != NULL;
 	    elem = nvlist_next_nvpair(errors, elem)) {
-		char errbuf[1024];
-
 		(void) snprintf(errbuf, sizeof (errbuf),
 		    dgettext(TEXT_DOMAIN,
 		    "cannot release hold from snapshot '%s'"),

Modified: user/attilio/vmcontention/contrib/ldns/README
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/README	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/README	Thu Apr 11 14:02:14 2013	(r249362)
@@ -22,6 +22,8 @@ compile on other systems like Solaris an
 
 REQUIREMENTS
 - OpenSSL (Optional, but needed for features like DNSSEC)
+  - OpenSSL >= 0.9.7f for DANE support
+  - OpenSSL >= 1.0.0  for ECDSA and GOST support
 - libpcap (Optional, but needed for examples/ldns-dpa)
 - (GNU) libtool (in OSX, that's glibtool, not libtool)
 - GNU make
@@ -29,32 +31,10 @@ REQUIREMENTS
 INSTALLATION
 1. Unpack the tarball
 2. cd ldns-<VERSION>
-3. ./configure
-4. gmake (it needs gnu make to compile, on systems where GNU make is the
-   default you can just use 'make')
-5. sudo gmake install
-6. Optional. (cd examples; ./configure; gmake), make example programs included.
-7. Optional. (cd drill; ./configure; gmake; gmake install), to build drill.
-
-You can configure and compile it in a separate build directory.
-
-* Examples
-There are some examples and dns related tools in the examples/ directory.
-These can be built with:
-1. cd examples/
-2. ./configure [--with-ldns=<path to ldns installation or build>]
-3. gmake
-
-* Drill
-Drill can be built with:
-1. cd drill/
-2. ./configure [--with-ldns=<path to ldns installation or build>]
-3. gmake
-
-Note that you need to set LD_LIBRARY_PATH if you want to run the binaries
-and you have not installed the library to a system directory. You can use
-the make target all-static for the examples to run them if you don't want to
-install the library.
+3. ./configure --with-examples --with-drill
+   (optionally compile python bindings too with: --with-pyldns)
+4. make
+5. make install
 
 
 * Building from subversion repository
@@ -84,6 +64,10 @@ We have received patches from the follow
   o Paul Wouters
   o Simon Vallet
   o Ondřej Surý
+  o Karel Slany
+  o Havard Eidnes
+  o Leo Baltus
+  o Dag-Erling Smørgrav
 
 
 INFORMATION FOR SPECIFIC OPERATING SYSTEMS

Modified: user/attilio/vmcontention/contrib/ldns/README.svn
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/README.svn	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/README.svn	Thu Apr 11 14:02:14 2013	(r249362)
@@ -10,17 +10,14 @@
 # the correct versions may need to be set. On those
 # systems, the 'autoreconf' line should be changed to:
 # AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 autoreconf
-# (and these systems probably need gmake instead of make)
 
 # older versions of libtoolize do not support --install
 # so you might need to remove that (with newer versions
 # it is needed)
 libtoolize -c --install
 autoreconf --install
-./configure
+./configure --with-examples --with-drill # --with-pyldns
 make
 make doc  # needs doxygen for the html pages
-(cd examples && autoreconf && ./configure && make)
-(cd drill && autoreconf && ./configure && make)
 (cd pcat && autoreconf && ./configure && make)
 (cd examples/nsd-test && autoreconf && ./configure && make)

Modified: user/attilio/vmcontention/contrib/ldns/dnssec_sign.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/dnssec_sign.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/dnssec_sign.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -771,9 +771,6 @@ ldns_dnssec_zone_create_nsecs(ldns_dnsse
 }
 
 #ifdef HAVE_SSL
-/* in dnssec_zone.c */
-extern int ldns_dname_compare_v(const void *a, const void *b);
-
 static ldns_status
 ldns_dnssec_zone_create_nsec3s_mkmap(ldns_dnssec_zone *zone,
 		ldns_rr_list *new_rrs,

Modified: user/attilio/vmcontention/contrib/ldns/dnssec_verify.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/dnssec_verify.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/dnssec_verify.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -628,20 +628,6 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
 	}
 }
 
-#if 0
-static void
-ldns_dnssec_trust_tree_print_sm(FILE *out, 
-		ldns_dnssec_trust_tree *tree,
-		size_t tabs,
-		bool extended,
-		uint8_t *sibmap,
-		size_t treedepth)
-{
-	ldns_dnssec_trust_tree_print_sm_fmt(out, ldns_output_format_default, 
-			tree, tabs, extended, sibmap, treedepth);
-}
-#endif
-
 void
 ldns_dnssec_trust_tree_print_fmt(FILE *out, const ldns_output_format *fmt,
 		ldns_dnssec_trust_tree *tree,

Modified: user/attilio/vmcontention/contrib/ldns/dnssec_zone.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/dnssec_zone.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/dnssec_zone.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -298,17 +298,6 @@ ldns_dnssec_rrsets_print_soa_fmt(FILE *o
 	}
 }
 
-#if 0
-static void
-ldns_dnssec_rrsets_print_soa(FILE *out,
-		ldns_dnssec_rrsets *rrsets,
-		bool follow,
-		bool show_soa)
-{
-	ldns_dnssec_rrsets_print_soa_fmt(out, ldns_output_format_default,
-		       	rrsets, follow, show_soa);
-}
-#endif
 
 void
 ldns_dnssec_rrsets_print_fmt(FILE *out, const ldns_output_format *fmt,
@@ -429,16 +418,6 @@ ldns_dnssec_name_set_name(ldns_dnssec_na
 	}
 }
 
-#if 0
-static ldns_rr *
-ldns_dnssec_name_nsec(ldns_dnssec_name *rrset)
-{
-	if (rrset) {
-		return rrset->nsec;
-	}
-	return NULL;
-}
-#endif
 
 void
 ldns_dnssec_name_set_nsec(ldns_dnssec_name *rrset, ldns_rr *nsec)
@@ -592,14 +571,6 @@ ldns_dnssec_name_print_soa_fmt(FILE *out
 	}
 }
 
-#if 0
-static void
-ldns_dnssec_name_print_soa(FILE *out, ldns_dnssec_name *name, bool show_soa)
-{
-	ldns_dnssec_name_print_soa_fmt(out, ldns_output_format_default,
-		       name, show_soa);
-}
-#endif
 
 void
 ldns_dnssec_name_print_fmt(FILE *out, const ldns_output_format *fmt,
@@ -827,7 +798,7 @@ ldns_dnssec_zone_deep_free(ldns_dnssec_z
 }
 
 /* use for dname comparison in tree */
-static int
+int
 ldns_dname_compare_v(const void *a, const void *b) {
 	return ldns_dname_compare((ldns_rdf *)a, (ldns_rdf *)b);
 }

Modified: user/attilio/vmcontention/contrib/ldns/ldns/dname.h
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/ldns/dname.h	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/ldns/dname.h	Thu Apr 11 14:02:14 2013	(r249362)
@@ -150,6 +150,7 @@ bool ldns_dname_is_subdomain(const ldns_
  * \return -1 if dname1 comes before dname2, 1 if dname1 comes after dname2, and 0 if they are equal.
  */
 int ldns_dname_compare(const ldns_rdf *dname1, const ldns_rdf *dname2);
+int ldns_dname_compare_v(const void *, const void *);
 
 /**
  * Checks whether the dname matches the given wildcard

Modified: user/attilio/vmcontention/contrib/ldns/parse.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/parse.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/parse.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -340,20 +340,6 @@ tokenread:
 	return (ssize_t)i;
 }
 
-#if 0
-static void
-ldns_bskipc(ldns_buffer *buffer, char c)
-{
-        while (c == (char) ldns_buffer_read_u8_at(buffer, ldns_buffer_position(buffer))) {
-                if (ldns_buffer_available_at(buffer,
-					buffer->_position + sizeof(char), sizeof(char))) {
-                        buffer->_position += sizeof(char);
-                } else {
-                        return;
-                }
-        }
-}
-#endif
 
 void
 ldns_bskipcs(ldns_buffer *buffer, const char *s)
@@ -378,13 +364,6 @@ ldns_bskipcs(ldns_buffer *buffer, const 
         }
 }
 
-#if 0
-static void
-ldns_fskipc(ATTR_UNUSED(FILE *fp), ATTR_UNUSED(char c))
-{
-}
-#endif
-
 void
 ldns_fskipcs(FILE *fp, const char *s)
 {

Modified: user/attilio/vmcontention/contrib/ldns/rr.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/rr.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/rr.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1394,25 +1394,6 @@ ldns_rr_list_clone(const ldns_rr_list *r
 	return new_list;
 }
 
-#if 0
-static int
-qsort_rr_compare(const void *a, const void *b)
-{
-	const ldns_rr *rr1 = * (const ldns_rr **) a;
-	const ldns_rr *rr2 = * (const ldns_rr **) b;
-
-	if (rr1 == NULL && rr2 == NULL) {
-		return 0;
-	}
-	if (rr1 == NULL) {
-		return -1;
-	}
-	if (rr2 == NULL) {
-		return 1;
-	}
-	return ldns_rr_compare(rr1, rr2);
-}
-#endif
 
 static int
 qsort_schwartz_rr_compare(const void *a, const void *b)

Modified: user/attilio/vmcontention/contrib/ldns/util.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/util.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/util.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -25,46 +25,6 @@
 #include <openssl/rand.h>
 #endif
 
-#if 0
-/* put this here tmp. for debugging */
-static void
-xprintf_rdf(ldns_rdf *rd)
-{
-	/* assume printable string */
-	fprintf(stderr, "size\t:%u\n", (unsigned int)ldns_rdf_size(rd));
-	fprintf(stderr, "type\t:%u\n", (unsigned int)ldns_rdf_get_type(rd));
-	fprintf(stderr, "data\t:[%.*s]\n", (int)ldns_rdf_size(rd),
-			(char*)ldns_rdf_data(rd));
-}
-
-static void
-xprintf_rr(ldns_rr *rr)
-{
-	/* assume printable string */
-	uint16_t count, i;
-
-	count = ldns_rr_rd_count(rr);
-
-	for(i = 0; i < count; i++) {
-		fprintf(stderr, "print rd %u\n", (unsigned int) i);
-		xprintf_rdf(rr->_rdata_fields[i]);
-	}
-}
-
-static void
-xprintf_hex(uint8_t *data, size_t len)
-{
-	size_t i;
-	for (i = 0; i < len; i++) {
-		if (i > 0 && i % 20 == 0) {
-			printf("\t; %u - %u\n", (unsigned int) i - 19, (unsigned int) i);
-		}
-		printf("%02x ", (unsigned int) data[i]);
-	}
-	printf("\n");
-}
-#endif
-
 ldns_lookup_table *
 ldns_lookup_by_name(ldns_lookup_table *table, const char *name)
 {

Modified: user/attilio/vmcontention/contrib/ldns/zone.c
==============================================================================
--- user/attilio/vmcontention/contrib/ldns/zone.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/ldns/zone.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -56,105 +56,6 @@ ldns_zone_push_rr(ldns_zone *z, ldns_rr 
 	return ldns_rr_list_push_rr( ldns_zone_rrs(z), rr);
 }
 
-#if 0
-/* return a clone of the given rr list, without the glue records
- * rr list should be the complete zone
- * if present, stripped records are added to the list *glue_records
- */
-static ldns_rr_list *
-ldns_zone_strip_glue_rrs(const ldns_rdf *zone_name, const ldns_rr_list *rrs, ldns_rr_list *glue_rrs)
-{
-	ldns_rr_list *new_list;
-
-	/* when do we find glue? It means we find an IP address
-	 * (AAAA/A) for a nameserver listed in the zone
-	 *
-	 * Alg used here:
-	 * first find all the zonecuts (NS records)
-	 * find all the AAAA or A records (can be done it the 
-	 * above loop).
-	 *
-	 * Check if the aaaa/a list are subdomains under the
-	 * NS domains.
-	 * If yes -> glue, if no -> not glue
-	 */
-
-	ldns_rr_list *zone_cuts;
-	ldns_rr_list *addr;
-	ldns_rr *r, *ns, *a;
-	ldns_rdf *dname_a, *ns_owner;
-	uint16_t i,j;
-
-	new_list = NULL;
-	zone_cuts = NULL;
-	addr = NULL;
-
-	new_list = ldns_rr_list_new();
-	if (!new_list) goto memory_error;
-	zone_cuts = ldns_rr_list_new();
-	if (!zone_cuts) goto memory_error;
-	addr = ldns_rr_list_new();
-	if (!addr) goto memory_error;
-
-	for(i = 0; i < ldns_rr_list_rr_count(rrs); i++) {
-		r = ldns_rr_list_rr(rrs, i);
-		if (ldns_rr_get_type(r) == LDNS_RR_TYPE_A ||
-				ldns_rr_get_type(r) == LDNS_RR_TYPE_AAAA) {
-			/* possibly glue */
-			if (!ldns_rr_list_push_rr(addr, r)) goto memory_error;
-			continue;
-		}
-		if (ldns_rr_get_type(r) == LDNS_RR_TYPE_NS) {
-			/* multiple zones will end up here -
-			 * for now; not a problem
-			 */
-			/* don't add NS records for the current zone itself */
-			if (ldns_rdf_compare(ldns_rr_owner(r), 
-						zone_name) != 0) {
-				if (!ldns_rr_list_push_rr(zone_cuts, r)) goto memory_error;
-			}
-			continue;
-		}
-	}
-
-	/* will sorting make it quicker ?? */
-	for(i = 0; i < ldns_rr_list_rr_count(zone_cuts); i++) {
-		ns = ldns_rr_list_rr(zone_cuts, i);
-		ns_owner = ldns_rr_owner(ns);
-		for(j = 0; j < ldns_rr_list_rr_count(addr); j++) {
-			a = ldns_rr_list_rr(addr, j);
-			dname_a = ldns_rr_owner(a);
-			
-			if (ldns_dname_is_subdomain(dname_a, ns_owner)) {
-				/* GLUE! */
-				if (glue_rrs) {
-					if (!ldns_rr_list_push_rr(glue_rrs, a)) goto memory_error;
-				}
-				break;
-			} else {
-				if (!ldns_rr_list_push_rr(new_list, a)) goto memory_error;
-			}
-		}
-	}
-	
-	ldns_rr_list_free(addr);
-	ldns_rr_list_free(zone_cuts);
-
-	return new_list;
-
-memory_error:
-	if (new_list) {
-		ldns_rr_list_free(new_list);
-	}
-	if (zone_cuts) {
-		ldns_rr_list_free(zone_cuts);
-	}
-	if (addr) {
-		ldns_rr_list_free(addr);
-	}
-	return NULL;
-}
-#endif
 
 /*
  * Get the list of glue records in a zone
@@ -401,22 +302,6 @@ ldns_zone_sort(ldns_zone *zone)
 	ldns_rr_list_sort(zrr);
 }
 
-#if 0
-/**
- * ixfr function. Work on a ldns_zone and remove and add
- * the rrs from the rrlist
- * \param[in] z the zone to work on
- * \param[in] del rr_list to remove from the zone
- * \param[in] add rr_list to add to the zone
- * \return Tja, wat zouden we eens returnen TODO
- */
-void
-ldns_zone_ixfr_del_add(ldns_zone *z, ldns_rr_list *del, ldns_rr_list *add)
-{
-	
-}
-#endif
-
 void
 ldns_zone_free(ldns_zone *zone) 
 {

Modified: user/attilio/vmcontention/contrib/mtree/Makefile
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/Makefile	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/Makefile	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2012/10/05 01:26:56 christos Exp $
+#	$NetBSD: Makefile,v 1.34 2013/02/03 19:15:16 christos Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/27/95
 
 .include <bsd.own.mk>
@@ -8,7 +8,7 @@ PROG=	mtree
 CPPFLAGS+= -DMTREE
 MAN=	mtree.8
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \
-	verify.c getid.c pack_dev.c
+	verify.c getid.c pack_dev.c only.c
 .if (${HOSTPROG:U} == "")
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil

Modified: user/attilio/vmcontention/contrib/mtree/create.c
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/create.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/create.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $	*/
+/*	$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -134,6 +134,10 @@ cwalk(void)
 			fts_set(t, p, FTS_SKIP);
 			continue;
 		}
+		if (!find_only(p->fts_path)) {
+			fts_set(t, p, FTS_SKIP);
+			continue;
+		}
 		switch(p->fts_info) {
 		case FTS_D:
 			if (!bflag)

Modified: user/attilio/vmcontention/contrib/mtree/extern.h
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/extern.h	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/extern.h	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.37 2012/12/20 16:43:16 christos Exp $	*/
+/*	$NetBSD: extern.h,v 1.38 2013/02/03 19:15:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -42,6 +42,7 @@
 #include <err.h> 
 #include <fts.h>
 #include <util.h>
+#include <stdbool.h>
 
 #if HAVE_NETDB_H
 /* For MAXHOSTNAMELEN on some platforms. */
@@ -74,6 +75,8 @@ u_int	 parsetype(const char *);
 void	 read_excludes_file(const char *);
 const char *rlink(const char *);
 int	 verify(FILE *);
+void	 load_only(const char *fname);
+bool	 find_only(const char *path);
 
 extern int	bflag, dflag, eflag, iflag, jflag, lflag, mflag,
 		nflag, qflag, rflag, sflag, tflag, uflag;

Modified: user/attilio/vmcontention/contrib/mtree/mtree.8
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/mtree.8	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/mtree.8	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mtree.8,v 1.67 2012/12/20 20:31:01 wiz Exp $
+.\"	$NetBSD: mtree.8,v 1.69 2013/02/03 19:16:06 christos Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,7 +56,7 @@
 .\"
 .\"     @(#)mtree.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd December 20, 2012
+.Dd February 3, 2013
 .Dt MTREE 8
 .Os
 .Sh NAME
@@ -73,6 +73,7 @@
 .Op Fl K Ar keywords
 .Op Fl k Ar keywords
 .Op Fl N Ar dbdir
+.Op Fl O Ar onlyfile
 .Op Fl p Ar path
 .Op Fl R Ar keywords
 .Op Fl s Ar seed
@@ -273,6 +274,8 @@ rather than using the results from the s
 and
 .Xr getgrnam 3
 (and related) library calls.
+.It Fl O Ar onlypaths
+Only include files included in this list of pathnames.
 .It Fl P
 Don't follow symbolic links in the file hierarchy, instead consider
 the symbolic link itself in any comparisons.

Modified: user/attilio/vmcontention/contrib/mtree/mtree.c
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/mtree.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/mtree.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-/*	$NetBSD: mtree.c,v 1.46 2012/12/20 19:09:25 christos Exp $	*/
+/*	$NetBSD: mtree.c,v 1.48 2013/04/08 17:39:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1990, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: mtree.c,v 1.46 2012/12/20 19:09:25 christos Exp $");
+__RCSID("$NetBSD: mtree.c,v 1.48 2013/04/08 17:39:11 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,8 +59,8 @@ __RCSID("$NetBSD: mtree.c,v 1.46 2012/12
 #include "extern.h"
 
 int	ftsoptions = FTS_PHYSICAL;
-int	bflag, cflag, Cflag, dflag, Dflag, eflag, iflag, jflag, lflag, mflag,
-    	nflag, qflag, rflag, sflag, tflag, uflag, Uflag, wflag;
+int	bflag, dflag, eflag, iflag, jflag, lflag, mflag, nflag, qflag, rflag,
+	sflag, tflag, uflag;
 char	fullpath[MAXPATHLEN];
 
 static struct {
@@ -79,18 +79,20 @@ main(int argc, char **argv)
 {
 	int	ch, status;
 	unsigned int	i;
+	int	cflag, Cflag, Dflag, Uflag, wflag;
 	char	*dir, *p;
 	FILE	*spec1, *spec2;
 
 	setprogname(argv[0]);
 
+	cflag = Cflag = Dflag = Uflag = wflag = 0;
 	dir = NULL;
 	init_excludes();
 	spec1 = stdin;
 	spec2 = NULL;
 
 	while ((ch = getopt(argc, argv,
-	    "bcCdDeE:f:F:I:ijk:K:lLmMnN:p:PqrR:s:StuUwWxX:"))
+	    "bcCdDeE:f:F:I:ijk:K:lLmMnN:O:p:PqrR:s:StuUwWxX:"))
 	    != -1) {
 		switch((char)ch) {
 		case 'b':
@@ -179,6 +181,9 @@ main(int argc, char **argv)
 			    "Unable to use user and group databases in `%s'",
 				    optarg);
 			break;
+		case 'O':
+			load_only(optarg);
+			break;
 		case 'p':
 			dir = optarg;
 			break;

Copied: user/attilio/vmcontention/contrib/mtree/only.c (from r249361, head/contrib/mtree/only.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/vmcontention/contrib/mtree/only.c	Thu Apr 11 14:02:14 2013	(r249362, copy of r249361, head/contrib/mtree/only.c)
@@ -0,0 +1,152 @@
+/*	$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#include <sys/cdefs.h>
+
+#if defined(__RCSID) && !defined(lint)
+__RCSID("$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $");
+#endif
+
+#include <sys/param.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <time.h>
+#include <err.h>
+#include <util.h>
+
+#include "extern.h"
+
+struct hentry {
+	char *str;
+	uint32_t hash;
+	struct hentry *next;
+};
+
+static struct hentry *table[1024];
+static bool loaded;
+
+static uint32_t
+hash_str(const char *str)
+{
+	const uint8_t *s = (const uint8_t *)str;
+	uint8_t c;
+	uint32_t hash = 0;
+	while ((c = *s++) != '\0') 
+		hash = hash * 33 + c;           /* "perl": k=33, r=r+r/32 */
+	return hash + (hash >> 5);
+}
+
+static bool
+hash_find(const char *str, uint32_t *h)
+{
+	struct hentry *e;
+	*h = hash_str(str) % __arraycount(table);
+
+	for (e = table[*h]; e; e = e->next)
+		if (e->hash == *h && strcmp(e->str, str) == 0)
+			return true;
+	return false;
+}
+
+static void
+hash_insert(char *str, uint32_t h)
+{
+	struct hentry *e;
+
+	if ((e = malloc(sizeof(*e))) == NULL)
+		mtree_err("memory allocation error");
+
+	e->str = str;
+	e->hash = h;
+	e->next = table[h];
+	table[h] = e;
+}
+
+static void
+fill(char *str)
+{
+	uint32_t h;
+	char *ptr = strrchr(str, '/');
+
+	if (ptr == NULL)
+		return;
+
+	*ptr = '\0';
+	if (!hash_find(str, &h)) {
+		char *x = strdup(str);
+		if (x == NULL)
+			mtree_err("memory allocation error");
+		hash_insert(x, h);
+		fill(str);
+	}
+	*ptr = '/';
+}
+
+void
+load_only(const char *fname)
+{
+	FILE *fp;
+	char *line;
+	size_t len, lineno;
+
+	if ((fp = fopen(fname, "r")) == NULL)
+		err(1, "Cannot open `%s'", fname);
+
+	while ((line = fparseln(fp, &len, &lineno, NULL, FPARSELN_UNESCALL))) {
+		uint32_t h;
+		if (hash_find(line, &h))
+			err(1, "Duplicate entry %s", line);
+		hash_insert(line, h);
+		fill(line);
+	}
+
+	fclose(fp);
+	loaded = true;
+}
+
+bool
+find_only(const char *path)
+{
+	uint32_t h;
+
+	if (!loaded)
+		return true;
+	return hash_find(path, &h);
+}

Modified: user/attilio/vmcontention/contrib/mtree/verify.c
==============================================================================
--- user/attilio/vmcontention/contrib/mtree/verify.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/contrib/mtree/verify.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -1,4 +1,4 @@
-/*	$NetBSD: verify.c,v 1.43 2012/10/05 01:31:05 christos Exp $	*/
+/*	$NetBSD: verify.c,v 1.44 2013/02/03 19:15:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: verify.c,v 1.43 2012/10/05 01:31:05 christos Exp $");
+__RCSID("$NetBSD: verify.c,v 1.44 2013/02/03 19:15:17 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,6 +95,10 @@ vwalk(void)
 			fts_set(t, p, FTS_SKIP);
 			continue;
 		}
+		if (!find_only(p->fts_path)) {
+			fts_set(t, p, FTS_SKIP);
+			continue;
+		}
 		switch(p->fts_info) {
 		case FTS_D:
 		case FTS_SL:

Modified: user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local	Thu Apr 11 14:02:14 2013	(r249362)
@@ -50,6 +50,7 @@
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
 .ds doc-operating-system-FreeBSD-8.3    8.3
+.ds doc-operating-system-FreeBSD-8.4    8.4
 .ds doc-operating-system-FreeBSD-9.1    9.1
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .

Modified: user/attilio/vmcontention/include/protocols/timed.h
==============================================================================
--- user/attilio/vmcontention/include/protocols/timed.h	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/include/protocols/timed.h	Thu Apr 11 14:02:14 2013	(r249362)
@@ -90,11 +90,13 @@ struct tsp {
 #define	TSPTYPENUMBER		25
 
 #ifdef TSPTYPES
-const char *tsptype[TSPTYPENUMBER] =
+static char const * const tsptype[] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
   "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
   "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
+_Static_assert(sizeof(tsptype) / sizeof(const char *) == TSPTYPENUMBER,
+    "Size of tsptype does not match TSPTYPENUMBER");
 #endif
 
 #endif /* !_TIMED_H_ */

Modified: user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c
==============================================================================
--- user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c	Thu Apr 11 13:05:38 2013	(r249361)
+++ user/attilio/vmcontention/lib/libc/net/sctp_sys_calls.c	Thu Apr 11 14:02:14 2013	(r249362)
@@ -48,8 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_uio.h>
 #include <netinet/sctp.h>
 
-#include <net/if_dl.h>
-
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define IN6_IS_ADDR_V4MAPPED(a)		      \
 	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
@@ -57,77 +55,8 @@ __FBSDID("$FreeBSD$");
 	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
-
-#define SCTP_CONTROL_VEC_SIZE_SND   8192
 #define SCTP_CONTROL_VEC_SIZE_RCV  16384
-#define SCTP_STACK_BUF_SIZE         2048
-
-#ifdef SCTP_DEBUG_PRINT_ADDRESS
-
-#define SCTP_STRING_BUF_SZ 256
-
-static void
-SCTPPrintAnAddress(struct sockaddr *a)
-{
-	char stringToPrint[SCTP_STRING_BUF_SZ];
-	u_short prt;
-	char *srcaddr, *txt;
-
-	if (a == NULL) {
-		printf("NULL\n");
-		return;
-	}
-	if (a->sa_family == AF_INET) {
-		srcaddr = (char *)&((struct sockaddr_in *)a)->sin_addr;
-		txt = "IPv4 Address: ";
-		prt = ntohs(((struct sockaddr_in *)a)->sin_port);
-	} else if (a->sa_family == AF_INET6) {
-		srcaddr = (char *)&((struct sockaddr_in6 *)a)->sin6_addr;
-		prt = ntohs(((struct sockaddr_in6 *)a)->sin6_port);
-		txt = "IPv6 Address: ";
-	} else if (a->sa_family == AF_LINK) {
-		int i;
-		char tbuf[SCTP_STRING_BUF_SZ];
-		u_char adbuf[SCTP_STRING_BUF_SZ];
-		struct sockaddr_dl *dl;
-
-		dl = (struct sockaddr_dl *)a;
-		strncpy(tbuf, dl->sdl_data, dl->sdl_nlen);
-		tbuf[dl->sdl_nlen] = 0;
-		printf("Intf:%s (len:%d)Interface index:%d type:%x(%d) ll-len:%d ",
-		    tbuf,
-		    dl->sdl_nlen,
-		    dl->sdl_index,
-		    dl->sdl_type,
-		    dl->sdl_type,
-		    dl->sdl_alen
-		    );
-		memcpy(adbuf, LLADDR(dl), dl->sdl_alen);
-		for (i = 0; i < dl->sdl_alen; i++) {
-			printf("%2.2x", adbuf[i]);
-			if (i < (dl->sdl_alen - 1))
-				printf(":");
-		}
-		printf("\n");
-		return;
-	} else {
-		return;
-	}
-	if (inet_ntop(a->sa_family, srcaddr, stringToPrint, sizeof(stringToPrint))) {
-		if (a->sa_family == AF_INET6) {
-			printf("%s%s:%d scope:%d\n",
-			    txt, stringToPrint, prt,
-			    ((struct sockaddr_in6 *)a)->sin6_scope_id);
-		} else {
-			printf("%s%s:%d\n", txt, stringToPrint, prt);
-		}
-
-	} else {
-		printf("%s unprintable?\n", txt);
-	}
-}
 
-#endif				/* SCTP_DEBUG_PRINT_ADDRESS */
 
 static void
 in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
@@ -171,11 +100,10 @@ int
 sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
     sctp_assoc_t * id)
 {
-	char buf[SCTP_STACK_BUF_SIZE];
+	char *buf;
 	int i, ret, cnt, *aa;
 	char *cpto;
 	const struct sockaddr *at;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list