d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style fixes, mostly trailing whitespace elimination. No functional change.

Browse Source 
Reported by:	pho
MFC after:	3 weeks
This commit is contained in:
Alan Somers 2014-04-25 14:35:30 +00:00
parent d42ea5731e
commit 70e42e1dd7
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/sys/netinet/fibs_test.sh
View File

@ -1,7 +1,7 @@
# #
# Copyright (c) 2014 Spectra Logic Corporation # Copyright (c) 2014 Spectra Logic Corporation
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
# are met: # are met:
@ -13,7 +13,7 @@
# ("Disclaimer") and any redistribution must be conditioned upon # ("Disclaimer") and any redistribution must be conditioned upon
# including a substantially similar Disclaimer requirement for further # including a substantially similar Disclaimer requirement for further
# binary redistribution. # binary redistribution.
# #
# NO WARRANTY # NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -26,7 +26,7 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGES. # POSSIBILITY OF SUCH DAMAGES.
# #
# Authors: Alan Somers (Spectra Logic Corporation) # Authors: Alan Somers (Spectra Logic Corporation)
# #
# $FreeBSD$ # $FreeBSD$
@ -43,7 +43,7 @@
# Simulate a crossover cable between them by using net/socat # Simulate a crossover cable between them by using net/socat
# Use nping (from security/nmap) to send an ICMP echo request from one # 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 # 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 # Check whether an arp entry exists for the spoofed IP
atf_test_case arpresolve_checks_interface_fib cleanup atf_test_case arpresolve_checks_interface_fib cleanup
arpresolve_checks_interface_fib_head() arpresolve_checks_interface_fib_head()
@ -84,7 +84,7 @@ arpresolve_checks_interface_fib_body()
socat /dev/${TAP0} /dev/${TAP1} & socat /dev/${TAP0} /dev/${TAP1} &
SOCAT_PID=$! SOCAT_PID=$!
echo ${SOCAT_PID} >> "processes_to_kill" echo ${SOCAT_PID} >> "processes_to_kill"
# Send an ICMP echo request with a spoofed source IP # Send an ICMP echo request with a spoofed source IP
setfib 2 nping -c 1 -e ${TAP0} -S ${SPOOF_ADDR} \ setfib 2 nping -c 1 -e ${TAP0} -S ${SPOOF_ADDR} \
--source-mac ${SPOOF_MAC} --icmp --icmp-type "echo-request" \ --source-mac ${SPOOF_MAC} --icmp --icmp-type "echo-request" \
@ -307,9 +307,9 @@ udp_dontroute_cleanup()
atf_init_test_cases() atf_init_test_cases()
{ {
atf_add_test_case arpresolve_checks_interface_fib atf_add_test_case arpresolve_checks_interface_fib
atf_add_test_case loopback_and_network_routes_on_nondefault_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 default_route_with_multiple_fibs_on_same_subnet
atf_add_test_case subnet_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 atf_add_test_case udp_dontroute
} }

13
tests/sys/netinet/udp_dontroute.c
View File

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2014 Spectra Logic Corporation * Copyright (c) 2014 Spectra Logic Corporation
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -13,7 +13,7 @@
* ("Disclaimer") and any redistribution must be conditioned upon * ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further * including a substantially similar Disclaimer requirement for further
* binary redistribution. * binary redistribution.
* *
* NO WARRANTY * NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -26,7 +26,7 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* Authors: Alan Somers (Spectra Logic Corporation) * Authors: Alan Somers (Spectra Logic Corporation)
* *
* $FreeBSD$ * $FreeBSD$
@ -43,11 +43,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/* /*
* Sends a single UDP packet to the provided address, with SO_DONTROUTE set * 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) * 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; struct sockaddr_in dst;
int s; int s;
@ -80,6 +81,6 @@ int main(int argc, char **argv)
dst.sin_len); dst.sin_len);
if (ret == -1) if (ret == -1)
err(errno, "sendto"); err(errno, "sendto");
return (0); return (0);
} }