X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bc183f0882ee2080e5888a428e5b0823380fc18a..335b9ed314acb8417679d51ab7f22f225cf1512c:/interface.h diff --git a/interface.h b/interface.h index 59c1eefd..2389c2e1 100644 --- a/interface.h +++ b/interface.h @@ -97,38 +97,6 @@ extern char *program_name; /* used to generate self-identifying messages */ extern int32_t thiszone; /* seconds offset from gmt to local time */ -/* - * True if "l" bytes of "var" were captured. - * - * The "snapend - (l) <= snapend" checks to make sure "l" isn't so large - * that "snapend - (l)" underflows. - * - * The check is for <= rather than < because "l" might be 0. - * - * We cast the pointers to uintptr_t to make sure that the compiler - * doesn't optimize away any of these tests (which it is allowed to - * do, as adding an integer to, or subtracting an integer from, a - * pointer assumes that the pointer is a pointer to an element of an - * array and that the result of the addition or subtraction yields a - * pointer to another member of the array, so that, for example, if - * you subtract a positive integer from a pointer, the result is - * guaranteed to be less than the original pointer value). See - * - * http://www.kb.cert.org/vuls/id/162289 - */ -#define TTEST2(var, l) \ - ((uintptr_t)snapend - (l) <= (uintptr_t)snapend && \ - (uintptr_t)&(var) <= (uintptr_t)snapend - (l)) - -/* True if "var" was captured */ -#define TTEST(var) TTEST2(var, sizeof(var)) - -/* Bail if "l" bytes of "var" were not captured */ -#define TCHECK2(var, l) if (!TTEST2(var, l)) goto trunc - -/* Bail if "var" was not captured */ -#define TCHECK(var) TCHECK2(var, sizeof(var)) - extern int mask2plen(uint32_t); extern const char *tok2strary_internal(const char **, int, const char *, int); #define tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)