From owner-svn-src-all@FreeBSD.ORG Fri Apr 25 14:35:31 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CDE1CAD; Fri, 25 Apr 2014 14:35:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 78AB91B6A; Fri, 25 Apr 2014 14:35:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PEZVAV074193; Fri, 25 Apr 2014 14:35:31 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PEZVTJ074191; Fri, 25 Apr 2014 14:35:31 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201404251435.s3PEZVTJ074191@svn.freebsd.org> From: Alan Somers Date: Fri, 25 Apr 2014 14:35:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264917 - head/tests/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 14:35:31 -0000 Author: asomers Date: Fri Apr 25 14:35:30 2014 New Revision: 264917 URL: http://svnweb.freebsd.org/changeset/base/264917 Log: Style fixes, mostly trailing whitespace elimination. No functional change. Reported by: pho MFC after: 3 weeks Modified: head/tests/sys/netinet/fibs_test.sh head/tests/sys/netinet/udp_dontroute.c Modified: head/tests/sys/netinet/fibs_test.sh ============================================================================== --- head/tests/sys/netinet/fibs_test.sh Fri Apr 25 13:38:18 2014 (r264916) +++ head/tests/sys/netinet/fibs_test.sh Fri Apr 25 14:35:30 2014 (r264917) @@ -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() @@ -84,7 +84,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" \ @@ -307,9 +307,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: head/tests/sys/netinet/udp_dontroute.c ============================================================================== --- head/tests/sys/netinet/udp_dontroute.c Fri Apr 25 13:38:18 2014 (r264916) +++ head/tests/sys/netinet/udp_dontroute.c Fri Apr 25 14:35:30 2014 (r264917) @@ -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 #include -/* +/* * 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); }