Import tcpdump 4.99.4 - src - FreeBSD source tree

diff options


context:
space:
mode:

author	Joseph Mingrone <jrm@FreeBSD.org>	2023-05-10 15:02:34 +0000
committer	Joseph Mingrone <jrm@FreeBSD.org>	2023-05-10 15:04:46 +0000
commit	51a183021fce3928d24b11c319d2787f5a15ae87 (patch)
tree	03e681bfda053978ba896745828e09cb056ad156 /missing
parent	f91036a44a189fa5d0b5f1c6dea0a396a0f928c0 (diff)

Import tcpdump 4.99.4vendor/tcpdump/4.99.4

Reviewed by: emaste Sponsored by: The FreeBSD Foundation

Diffstat (limited to 'missing')

-rw-r--r--

missing/datalinks.c

-rw-r--r--

missing/dlnames.c

-rw-r--r--

missing/getopt_long.c

-rw-r--r--

missing/getopt_long.h

-rw-r--r--

missing/getservent.c

143

-rw-r--r--

missing/pcap_dump_ftell.c

-rw-r--r--

missing/snprintf.c

119

-rw-r--r--

missing/strlcat.c

-rw-r--r--

missing/strlcpy.c

-rw-r--r--

missing/strsep.c

10 files changed, 297 insertions, 136 deletions

diff --git a/missing/datalinks.c b/missing/datalinks.c
index 4a7d6fe961d7..17f60bec5b54 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c

@@ -32,7 +32,7 @@

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

#include <netdissect-stdinc.h>

diff --git a/missing/dlnames.c b/missing/dlnames.c
index 16bfcf7940c2..03c2b38c1b7f 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c

@@ -32,7 +32,7 @@

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

#include <netdissect-stdinc.h>

@@ -119,9 +119,6 @@ static struct dlt_choice dlt_choices[] = {

#ifdef DLT_LINUX_IRDA

DLT_CHOICE(DLT_LINUX_IRDA, "Linux IrDA"),

#endif

-#ifdef DLT_LANE8023

- DLT_CHOICE(DLT_LANE8023, "Linux 802.3 LANE"),

-#endif

#ifdef DLT_CIP

DLT_CHOICE(DLT_CIP, "Linux Classical IP-over-ATM"),

#endif

diff --git a/missing/getopt_long.c b/missing/getopt_long.c
index 80857369804d..ece000623534 100644
--- a/missing/getopt_long.c
+++ b/missing/getopt_long.c

@@ -57,6 +57,8 @@

#include <string.h>

#include <stdarg.h>

+#include "diag-control.h"

#define GNU_COMPATIBLE /* Be more compatible, configure's use us! */

#define PRINT_ERROR ((opterr) && (*options != ':'))

@@ -68,7 +70,7 @@

/* return values */

#define BADCH (int)'?'

#define BADARG ((*options == ':') ? (int)':' : (int)'?')

-#define INORDER (int)1

+#define INORDER (int)1

#define EMSG ""

@@ -158,11 +160,29 @@ permute_args(int panonopt_start, int panonopt_end, int opt_end,

pos -= nnonopts;

else

pos += nopts;

+ /*

+ * This is annoying - I guess the

+ * "char * const argv[]" in the declaration

+ * of getopt() - and thus getopt_long() -

+ * means that it makes a promise not to

+ * shuffle the arguments, but here we are,

+ * shuffling the arguments.

+ *

+ * (No, it's not a promise that it won't

+ * modify any of the argument strings.

+ * It's a promise that it won't modify

+ * the array of pointers to the argument

+ * strings.)

+ *

+ * So squelch the cast warnings.

+ */

swap = nargv[pos];

+DIAG_OFF_CAST_QUAL

/* LINTED const cast */

((char **) nargv)[pos] = nargv[cstart];

/* LINTED const cast */

((char **)nargv)[cstart] = swap;

+DIAG_ON_CAST_QUAL

}

@@ -291,6 +311,7 @@ parse_long_options(char * const *nargv, const char *options,

}

if (long_options[match].has_arg == required_argument ||

long_options[match].has_arg == optional_argument) {

+DIAG_OFF_CAST_QUAL

if (has_equal)

optarg = (char *)has_equal;

else if (long_options[match].has_arg ==

@@ -300,6 +321,7 @@ parse_long_options(char * const *nargv, const char *options,

optarg = nargv[optind++];

}

+DIAG_ON_CAST_QUAL

}

if ((long_options[match].has_arg == required_argument)

&& (optarg == NULL)) {

@@ -543,9 +565,11 @@ start:

++optind;

} else { /* takes (optional) argument */

optarg = NULL;

- if (*place) /* no white space */

+ if (*place) { /* no white space */

+DIAG_OFF_CAST_QUAL

optarg = (char *)place;

- else if (oli[1] != ':') { /* arg not optional */

+DIAG_ON_CAST_QUAL

+ } else if (oli[1] != ':') { /* arg not optional */

if (++optind >= nargc) { /* no arg */

place = EMSG;

if (PRINT_ERROR)

diff --git a/missing/getopt_long.h b/missing/getopt_long.h
new file mode 100644
index 000000000000..af97965e4f73
--- /dev/null
+++ b/missing/getopt_long.h

@@ -0,0 +1,66 @@

+/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */

+/* $FreeBSD$ */

+/*-

+ *

+ * This code is derived from software contributed to The NetBSD Foundation

+ * by Dieter Baron and Thomas Klausner.

+ *

+ * 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.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.

+ */

+#ifndef ND_GETOPT_LONG_H_

+#define ND_GETOPT_LONG_H_

+/*

+ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.

+ * getopt() is declared here too for GNU programs.

+ */

+#define no_argument 0

+#define required_argument 1

+#define optional_argument 2

+struct option {

+ /* name of long option */

+ const char *name;

+ /*

+ * one of no_argument, required_argument, and optional_argument:

+ * whether option takes an argument

+ */

+ int has_arg;

+ /* if not NULL, set *flag to val when option found */

+ int *flag;

+ /* if flag not NULL, value to set *flag to; else return value */

+ int val;

+};

+int getopt_long(int, char * const *, const char *,

+ const struct option *, int *);

+int getopt_long_only(int, char * const *, const char *,

+ const struct option *, int *);

+extern char *optarg; /* getopt(3) external variables */

+extern int optind, opterr, optopt;

+#endif /* ! ND_GETOPT_LONG_H_ */

diff --git a/missing/getservent.c b/missing/getservent.c
new file mode 100644
index 000000000000..39cee068a69b
--- /dev/null
+++ b/missing/getservent.c

@@ -0,0 +1,143 @@

+/*

+ *

+ * 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.

+ */

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <netdissect-stdinc.h>

+#include <getservent.h>

+static FILE *servf = NULL;

+static char line[BUFSIZ+1];

+static struct servent serv;

+static char *serv_aliases[MAXALIASES];

+int _serv_stayopen;

+const char *etc_path(const char *file);

+/*

+* Check if <file> exists in the current directory and, if so, return it.

+* Else return either "%SYSTEMROOT%\System32\drivers\etc\<file>"

+* or $PREFIX/etc/<file>.

+* "<file>" is aka __PATH_SERVICES (aka "services" on Windows and

+* "/etc/services" on other platforms that would need this).

+*/

+const char *etc_path(const char *file)

+ const char *env = getenv(__PATH_SYSROOT);

+ static char path[_MAX_PATH];

+ /* see if "<file>" exists locally or whether __PATH_SYSROOT is valid */

+ if (fopen(file, "r") || !env)

+ return (file);

+ else

+#ifdef _WIN32

+ snprintf(path, sizeof(path), "%s%s%s", env, __PATH_ETC_INET, file);

+#else

+ snprintf(path, sizeof(path), "%s%s", env, file);

+#endif

+ return (path);

+void

+setservent(int f)

+ if (servf == NULL)

+ servf = fopen(etc_path(__PATH_SERVICES), "r");

+ else

+ rewind(servf);

+ _serv_stayopen |= f;

+void

+endservent(void)

+ if (servf) {

+ fclose(servf);

+ servf = NULL;

+ }

+ _serv_stayopen = 0;

+struct servent *

+getservent(void)

+ char *p;

+ char *cp, **q;

+ if (servf == NULL && (servf = fopen(etc_path(__PATH_SERVICES), "r")) == NULL)

+ return (NULL);

+again:

+ if ((p = fgets(line, BUFSIZ, servf)) == NULL)

+ return (NULL);

+ if (*p == '#')

+ goto again;

+ cp = strpbrk(p, "#\n");

+ if (cp == NULL)

+ goto again;

+ *cp = '\0';

+ serv.s_name = p;

+ p = strpbrk(p, " \t");

+ if (p == NULL)

+ goto again;

+ *p++ = '\0';

+ while (*p == ' ' || *p == '\t')

+ p++;

+ cp = strpbrk(p, ",/");

+ if (cp == NULL)

+ goto again;

+ *cp++ = '\0';

+ serv.s_port = htons((u_short)atoi(p));

+ serv.s_proto = cp;

+ q = serv.s_aliases = serv_aliases;

+ cp = strpbrk(cp, " \t");

+ if (cp != NULL)

+ *cp++ = '\0';

+ while (cp && *cp) {

+ if (*cp == ' ' || *cp == '\t') {

+ cp++;

+ continue;

+ }

+ if (q < &serv_aliases[MAXALIASES - 1])

+ *q++ = cp;

+ cp = strpbrk(cp, " \t");

+ if (cp != NULL)

+ *cp++ = '\0';

+ }

+ *q = NULL;

+ return (&serv);

diff --git a/missing/pcap_dump_ftell.c b/missing/pcap_dump_ftell.c
new file mode 100644
index 000000000000..ddc516672e85
--- /dev/null
+++ b/missing/pcap_dump_ftell.c

@@ -0,0 +1,46 @@

+/*

+ *

+ * 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 Computer Systems

+ * Engineering Group at Lawrence Berkeley Laboratory.

+ * 4. Neither the name of the University nor of the Laboratory may be used

+ * to endorse or promote products derived from this software without

+ * specific prior written permission.