7ca8bf0f2c
ifa_ifwithnet() and ifa_ifwithdstaddr() The legacy functions will call the _fib() versions with RT_ALL_FIBS, preserving legacy behavior. sys/net/if_var.h sys/net/if.c Add legacy-compatible functions as described above. Ensure legacy behavior when RT_ALL_FIBS is passed as fibnum. sys/netinet/in_pcb.c sys/netinet/ip_output.c sys/netinet/ip_options.c sys/net/route.c sys/net/rtsock.c sys/netinet6/nd6.c Call with _fib() functions if we must use a specific fib, or the legacy functions otherwise. tests/sys/netinet/fibs_test.sh tests/sys/netinet/udp_dontroute.c Improve the udp_dontroute test. The bug that this test exercises is that ifa_ifwithnet() will return the wrong address, if multiple interfaces have addresses on the same subnet but with different fibs. The previous version of the test only considered one possible failure mode: that ifa_ifwithnet_fib() might fail to find any suitable address at all. The new version also checks whether ifa_ifwithnet_fib() finds the correct address by checking where the ARP request goes. Reported by: bz, hrs Reviewed by: hrs MFC after: 1 week X-MFC-with: 264905 Sponsored by: Spectra Logic
112 lines
3.4 KiB
C
112 lines
3.4 KiB
C
/*
|
|
* 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:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions, and the following disclaimer,
|
|
* without modification.
|
|
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
|
* substantially similar to the "NO WARRANTY" disclaimer below
|
|
* ("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
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
|
|
*
|
|
* Authors: Alan Somers (Spectra Logic Corporation)
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <arpa/inet.h>
|
|
#include <netinet/in.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.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)
|
|
{
|
|
struct sockaddr_in dst;
|
|
int s, t;
|
|
int opt;
|
|
int ret;
|
|
ssize_t len;
|
|
const char* sendbuf = "Hello, World!";
|
|
const size_t buflen = 80;
|
|
char recvbuf[buflen];
|
|
|
|
if (argc != 3) {
|
|
fprintf(stderr, "Usage: %s ip_address tapdev\n", argv[0]);
|
|
exit(2);
|
|
}
|
|
|
|
t = open(argv[2], O_RDWR | O_NONBLOCK);
|
|
if (t < 0)
|
|
err(EXIT_FAILURE, "open");
|
|
|
|
s = socket(PF_INET, SOCK_DGRAM, 0);
|
|
if (s < 0)
|
|
err(EXIT_FAILURE, "socket");
|
|
opt = 1;
|
|
|
|
ret = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, &opt, sizeof(opt));
|
|
if (ret == -1)
|
|
err(EXIT_FAILURE, "setsockopt(SO_DONTROUTE)");
|
|
|
|
dst.sin_len = sizeof(dst);
|
|
dst.sin_family = AF_INET;
|
|
dst.sin_port = htons(46120);
|
|
dst.sin_addr.s_addr = inet_addr(argv[1]);
|
|
if (dst.sin_addr.s_addr == htonl(INADDR_NONE)) {
|
|
fprintf(stderr, "Invalid address: %s\n", argv[1]);
|
|
exit(2);
|
|
}
|
|
ret = sendto(s, sendbuf, strlen(sendbuf), 0, (struct sockaddr*)&dst,
|
|
dst.sin_len);
|
|
if (ret == -1)
|
|
err(EXIT_FAILURE, "sendto");
|
|
|
|
/* Verify that the packet went to the desired tap device */
|
|
|
|
len = read(t, recvbuf, buflen);
|
|
if (len == 0)
|
|
errx(EXIT_FAILURE, "read returned EOF");
|
|
else if (len < 0 && errno == EAGAIN)
|
|
errx(EXIT_FAILURE, "Did not receive any packets");
|
|
else if (len < 0)
|
|
err(EXIT_FAILURE, "read");
|
|
|
|
/*
|
|
* If read returned anything at all, consider it a success. The packet
|
|
* should be an Ethernet frame containing an ARP request for
|
|
* ip_address. We won't bother to decode it
|
|
*/
|
|
return (0);
|
|
}
|