Checksum stuff must go in netdissect.h

diff --git a/interface.h b/interface.h
index f033fc71808b5d0ed3c43fb64c952f29d22f2962..55cecf656ee33f80beae6a10c9c565e543591762 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -135,13 +135,6 @@ extern const char *nt_errstr(uint32_t);
 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 
 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 

-struct cksum_vec {
-       const uint8_t   *ptr;
-       int             len;
-};
-extern uint16_t in_cksum(const struct cksum_vec *, int);
-extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);
-

 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
 
 #ifndef HAVE_BPF_DUMP
 struct bpf_program;
 

diff --git a/netdissect.h b/netdissect.h
index 7c140f1d11577489c23cd70ea44d16cb72a574e6..24a9ed7270dc56656e9dc176019301ad34e7c80e 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -600,14 +600,13 @@ extern void ospf6_print(netdissect_options *, const u_char *, u_int);
 extern void babel_print(netdissect_options *, const u_char *, u_int);
 #endif /*INET6*/
 
 extern void babel_print(netdissect_options *, const u_char *, u_int);
 #endif /*INET6*/
 

-#if 0

 struct cksum_vec {
        const uint8_t   *ptr;
        int             len;
 };
 extern uint16_t in_cksum(const struct cksum_vec *, int);
 extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);
 struct cksum_vec {
        const uint8_t   *ptr;
        int             len;
 };
 extern uint16_t in_cksum(const struct cksum_vec *, int);
 extern uint16_t in_cksum_shouldbe(uint16_t, uint16_t);

-#endif
+

 extern int nextproto4_cksum(netdissect_options *ndo, const struct ip *, const uint8_t *, u_int, u_int, u_int);
 extern int decode_prefix4(netdissect_options *ndo, const u_char *, u_int, char *, u_int);
 #ifdef INET6
 extern int nextproto4_cksum(netdissect_options *ndo, const struct ip *, const uint8_t *, u_int, u_int, u_int);
 extern int decode_prefix4(netdissect_options *ndo, const u_char *, u_int, char *, u_int);
 #ifdef INET6