svn commit: r265586 - in stable/10: etc/mtree tests/sys tests/sys/netinet
Alan Somers
asomers at FreeBSD.org
Wed May 7 18:49:27 UTC 2014
Author: asomers
Date: Wed May 7 18:49:25 2014
New Revision: 265586
URL: http://svnweb.freebsd.org/changeset/base/265586
Log:
MFC r263445 and r265385. Note that the change to ObsoleteFiles.inc in
r265385 does not need to be MFCed, because the obsolete files in question
were never MFCed to any stable branch.
r265385
Remove the ifconfig test added in rev 263445. After discussion with
melifaro, we agreed that ifconfig's behavior was not a bug. The main
motivation for bin/187551 was to partially resolve kern/187549, but we
resolved kern/187549 in a different way instead.
ObsoleteFiles.inc
etc/mtree/BSD.tests.dist
sbin/ifconfig/tests/fibs_test.sh
sbin/ifconfig/tests/Makefile
sbin/ifconfig/Makefile
Remove /usr/tests/sbin/ifconfig
r263445
Add several ATF tests that deal with multiple fibs. They're described in
several different PRs, but the tests share some common code, so I'm
committing them together.
sbin/ifconfig/tests
sbin/ifconfig/tests/fibs_test.sh
sbin/ifconfig/tests/Makefile
sbin/ifconfig/Makefile
Add fibs_test.sh, which regresses bin/187551
tests/sys/netinet
tests/sys/netinet/fibs_test.sh
tests/sys/netinet/udp_dontroute.c
tests/sys/netinet/Makefile
tests/sys/Makefile
Add fibs_test.sh, which regresses kern/167947, kern/187552
kern/187549, kern/187550, and kern/187553
etc/mtree/BSD.tests.dist
Add newly created directories
Added:
stable/10/tests/sys/netinet/
- copied from r263445, head/tests/sys/netinet/
Modified:
stable/10/etc/mtree/BSD.tests.dist
stable/10/tests/sys/Makefile
stable/10/tests/sys/netinet/fibs_test.sh
stable/10/tests/sys/netinet/udp_dontroute.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist Wed May 7 18:27:12 2014 (r265585)
+++ stable/10/etc/mtree/BSD.tests.dist Wed May 7 18:49:25 2014 (r265586)
@@ -123,6 +123,8 @@
sys
kern
..
+ netinet
+ ..
..
usr.bin
apply
Modified: stable/10/tests/sys/Makefile
==============================================================================
--- stable/10/tests/sys/Makefile Wed May 7 18:27:12 2014 (r265585)
+++ stable/10/tests/sys/Makefile Wed May 7 18:49:25 2014 (r265586)
@@ -5,6 +5,7 @@
.PATH: ${.CURDIR}/..
TESTS_SUBDIRS+= kern
+TESTS_SUBDIRS+= netinet
TESTSDIR= ${TESTSBASE}/sys
KYUAFILE= yes
Modified: stable/10/tests/sys/netinet/fibs_test.sh
==============================================================================
--- head/tests/sys/netinet/fibs_test.sh Thu Mar 20 20:39:41 2014 (r263445)
+++ stable/10/tests/sys/netinet/fibs_test.sh Wed May 7 18:49:25 2014 (r265586)
@@ -1,7 +1,7 @@
#
# Copyright (c) 2014 Spectra Logic Corporation
# All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
@@ -13,7 +13,7 @@
# ("Disclaimer") and any redistribution must be conditioned upon
# including a substantially similar Disclaimer requirement for further
# binary redistribution.
-#
+#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -26,7 +26,7 @@
# 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 DAMAGES.
-#
+#
# Authors: Alan Somers (Spectra Logic Corporation)
#
# $FreeBSD$
@@ -43,7 +43,7 @@
# Simulate a crossover cable between them by using net/socat
# Use nping (from security/nmap) to send an ICMP echo request from one
# interface to the other, spoofing the source IP. The source IP must be
-# spoofed, or else it will already have an entry in the arp table.
+# spoofed, or else it will already have an entry in the arp table.
# Check whether an arp entry exists for the spoofed IP
atf_test_case arpresolve_checks_interface_fib cleanup
arpresolve_checks_interface_fib_head()
@@ -85,7 +85,7 @@ arpresolve_checks_interface_fib_body()
socat /dev/${TAP0} /dev/${TAP1} &
SOCAT_PID=$!
echo ${SOCAT_PID} >> "processes_to_kill"
-
+
# Send an ICMP echo request with a spoofed source IP
setfib 2 nping -c 1 -e ${TAP0} -S ${SPOOF_ADDR} \
--source-mac ${SPOOF_MAC} --icmp --icmp-type "echo-request" \
@@ -302,9 +302,9 @@ udp_dontroute_cleanup()
atf_init_test_cases()
{
atf_add_test_case arpresolve_checks_interface_fib
- atf_add_test_case loopback_and_network_routes_on_nondefault_fib
- atf_add_test_case default_route_with_multiple_fibs_on_same_subnet
- atf_add_test_case subnet_route_with_multiple_fibs_on_same_subnet
+ atf_add_test_case loopback_and_network_routes_on_nondefault_fib
+ atf_add_test_case default_route_with_multiple_fibs_on_same_subnet
+ atf_add_test_case subnet_route_with_multiple_fibs_on_same_subnet
atf_add_test_case udp_dontroute
}
Modified: stable/10/tests/sys/netinet/udp_dontroute.c
==============================================================================
--- head/tests/sys/netinet/udp_dontroute.c Thu Mar 20 20:39:41 2014 (r263445)
+++ stable/10/tests/sys/netinet/udp_dontroute.c Wed May 7 18:49:25 2014 (r265586)
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2014 Spectra Logic Corporation
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,7 +13,7 @@
* ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further
* binary redistribution.
- *
+ *
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -26,7 +26,7 @@
* 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 DAMAGES.
- *
+ *
* Authors: Alan Somers (Spectra Logic Corporation)
*
* $FreeBSD$
@@ -43,11 +43,12 @@
#include <stdlib.h>
#include <string.h>
-/*
+/*
* Sends a single UDP packet to the provided address, with SO_DONTROUTE set
* I couldn't find a way to do this with builtin utilities like nc(1)
*/
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
{
struct sockaddr_in dst;
int s;
@@ -80,6 +81,6 @@ int main(int argc, char **argv)
dst.sin_len);
if (ret == -1)
err(errno, "sendto");
-
+
return (0);
}
More information about the svn-src-stable
mailing list