DNS: Use ND_TCHECK_LEN() instead of a custom bounds check

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 35b06df07c9c7d16f43332338cc5e82860b421d7..05b319b757a9c011bf2b8839f6455da64aacfe31 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1399,6 +1399,11 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
                } else if (status == PCAP_ERROR_PERM_DENIED && *cp != '\0')
                        error("%s: %s\n(%s)", device,
                            pcap_statustostr(status), cp);
+#ifdef PCAP_ERROR_CAPTURE_NOTSUP
+               else if (status == PCAP_ERROR_CAPTURE_NOTSUP && *cp != '\0')
+                       error("%s: %s\n(%s)", device,
+                           pcap_statustostr(status), cp);
+#endif
 #ifdef __FreeBSD__
                else if (status == PCAP_ERROR_RFMON_NOTSUP &&
                    strncmp(device, "wlan", 4) == 0) {
@@ -2125,6 +2130,13 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
+       if (ndo->ndo_Aflag && ndo->ndo_xflag)
+               warning("-A and -x[x] are mutually exclusive. -A ignored.");
+       if (ndo->ndo_Aflag && ndo->ndo_Xflag)
+               warning("-A and -X[X] are mutually exclusive. -A ignored.");
+       if (ndo->ndo_xflag && ndo->ndo_Xflag)
+               warning("-x[x] and -X[X] are mutually exclusive. -x[x] ignored.");
+
 #ifdef HAVE_PCAP_FINDALLDEVS
        if (Dflag)
                show_devices_and_exit();