*** src/vwarnx.c.ORIG Wed Feb 1 09:37:53 2012 --- src/vwarnx.c Wed Feb 1 09:37:31 2012 *************** *** 0 **** --- 1,54 ---- + /* $NetBSD: vwarnx.c,v 1.3 1997/07/17 21:33:27 thorpej Exp $ */ + + /*- + * Copyright (c) 1993 + * The Regents of the University of California. 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. + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. + */ + + #include + + #ifdef __STDC__ + #include + #else + #include + #endif + + + void + vwarnx(fmt, ap) + const char *fmt; + va_list ap; + { + if (fmt != NULL) + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, "\n"); + } + *** src/warnx.c.ORIG Wed Feb 1 09:38:04 2012 --- src/warnx.c Wed Feb 1 09:37:31 2012 *************** *** 0 **** --- 1,44 ---- + /* $NetBSD: warnx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $ */ + + /*- + * Copyright (c) 1993 + * The Regents of the University of California. 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. + * 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 University 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 REGENTS 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 REGENTS 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. + */ + + + #include + + void + warnx(const char *fmt, ...) + { + va_list ap; + + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); + } + *** ./src/Makefile.in.ORIG Fri Oct 5 17:46:03 2018 --- ./src/Makefile.in Fri Oct 5 17:46:11 2018 *************** *** 263,269 **** top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! AM_CFLAGS = -Wall -Wextra -Wno-sign-compare fping_SOURCES = fping.c seqmap.c socket4.c fping.h options.h seqmap.h \ optparse.c optparse.h $(am__append_1) fping_DEPENDENCIES = ../config.h --- 263,269 ---- top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ! AM_CFLAGS = fping_SOURCES = fping.c seqmap.c socket4.c fping.h options.h seqmap.h \ optparse.c optparse.h $(am__append_1) fping_DEPENDENCIES = ../config.h *** ./src/fping.c.ORIG Fri Oct 5 18:02:32 2018 --- ./src/fping.c Fri Oct 5 18:01:48 2018 *************** *** 329,334 **** --- 329,346 ---- /*** function definitions ***/ + #ifdef _AIX + #define IP_PMTUDISC_DO 2 + #define IP_MTU_DISCOVER 10 + + #define IPV6_PMTUDISC_DO 2 + #define IPV6_MTU_DISCOVER 23 + + #if (defined(_AIX51) || defined(_AIX52) || defined(_AIX53)) && !(defined(_AIX61)) + #define ss_family __ss_family + #endif + #endif + /************************************************************ Function: main *************** *** 687,695 **** /* validate various option settings */ ! if (socket4 < 0 && socket6 < 0) { crash_and_burn("can't create socket (must run as root?)"); } if (ttl > 255) { fprintf(stderr, "%s: ttl %u out of range\n", prog, ttl); --- 699,712 ---- /* validate various option settings */ ! if (socket4 < 0) { crash_and_burn("can't create socket (must run as root?)"); } + #ifdef IPV6 + if (socket6 < 0) { + crash_and_burn("can't create socket (must run as root?)"); + } + #endif if (ttl > 255) { fprintf(stderr, "%s: ttl %u out of range\n", prog, ttl);