Factored ICMP structs and defs into icmpdefs.h.

[icmp-dn.git] / src / idnlookup.c

diff --git a/src/idnlookup.c b/src/idnlookup.c
index 1727c4d..b120c52 100644 (file)
--- a/src/idnlookup.c
+++ b/src/idnlookup.c
@@ -35,32 +35,7 @@
 #include "config.h"
 #endif
 
-struct icmphdr {
-    u_int8_t type;
-    u_int8_t code;
-    u_int16_t checksum;
-};
-
-struct reqhdr {
-    u_int8_t type;
-    u_int8_t code;
-    u_int16_t checksum;
-    u_int16_t id;
-    u_int16_t seq;
-};
-
-struct rephdr {
-    u_int8_t type;
-    u_int8_t code;
-    u_int16_t checksum;
-    u_int16_t id;
-    u_int16_t seq;
-    int32_t ttl;
-    
-};
-
-#define ICMP_NAMEREQ 37
-#define ICMP_NAMEREP 38
+#include "icmpdefs.h"
 
 unsigned char buf[65536];
 
@@ -78,6 +53,10 @@ void printdn(FILE *f, unsigned char *dnbuf, size_t size, int onlyfirst)
                fprintf(stderr, "domain name decompression not implemented, aborting\n");
                exit(1);
            }
+           if((int)*p + (p - dnbuf) >= size) {
+               fprintf(stderr, "malformed domain name\n");
+               return;
+           }
            fprintf(f, "%.*s", (int)*p, p + 1);
            p += 1 + (int)*p;
            if(*p != 0)
@@ -279,6 +258,6 @@ int main(int argc, char **argv)
 
 /*
  * Local Variables:
- * compile-command: "gcc -Wall -g -o idnlookup idnlookup.c"
+ * compile-command: "make CFLAGS='-Wall -g'"
  * End:
  */