diff --git a/src/dns-protocol.h b/src/dns-protocol.h index 3aa4fec..77bcd58 100644 --- a/src/dns-protocol.h +++ b/src/dns-protocol.h @@ -117,3 +117,20 @@ struct dns_header { (cp) += 4; \ } +#define CHECKED_GETCHAR(var, ptr, len) do { \ + if ((len) < 1) return 0; \ + var = *ptr++; \ + (len) -= 1; \ + } while (0) + +#define CHECKED_GETSHORT(var, ptr, len) do { \ + if ((len) < 2) return 0; \ + GETSHORT(var, ptr); \ + (len) -= 2; \ + } while (0) + +#define CHECKED_GETLONG(var, ptr, len) do { \ + if ((len) < 4) return 0; \ + GETLONG(var, ptr); \ + (len) -= 4; \ + } while (0) diff --git a/src/dnssec.c b/src/dnssec.c index 87bfa7c..ff556fe 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -3,25 +3,6 @@ #include "dnssec-crypto.h" #include -#define CHECKED_GETCHAR(var, ptr, len) do { \ - if ((len) < 1) return 0; \ - var = *ptr++; \ - (len) -= 1; \ - } while (0) - -#define CHECKED_GETSHORT(var, ptr, len) do { \ - if ((len) < 2) return 0; \ - GETSHORT(var, ptr); \ - (len) -= 2; \ - } while (0) - -#define CHECKED_GETLONG(var, ptr, len) do { \ - if ((len) < 4) return 0; \ - GETLONG(var, ptr); \ - (len) -= 4; \ - } while (0) - - #define SERIAL_UNDEF -100 #define SERIAL_EQ 0 #define SERIAL_LT -1