CHANGES file for 4.7.2/4.7.3

[tcpdump] / interface.h

diff --git a/interface.h b/interface.h
index 27563683b5a48ed587ac738d4e013c33ff2a6cb9..2389c2e1e1ab9f1d26f39fac65789e76b3305b35 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -97,30 +97,7 @@ extern char *program_name;   /* used to generate self-identifying messages */
 
 extern int32_t thiszone;       /* seconds offset from gmt to local time */
 
 
 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.
- */
-#define TTEST2(var, l) (snapend - (l) <= snapend && \
-                       (const u_char *)&(var) <= 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 fn_print(const u_char *, const u_char *);
-extern int fn_printn(const u_char *, u_int, const u_char *);
-extern int fn_printzp(const u_char *, u_int, const u_char *);
-extern int mask2plen(u_int32_t);
+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)
 
 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)
 


@@ -144,27 +121,26 @@ extern const char *dnnum_string(u_short);
 
 /* checksum routines */
 extern void init_checksum(void);
 
 /* checksum routines */
 extern void init_checksum(void);

-extern u_int16_t verify_crc10_cksum(u_int16_t, const u_char *, int);
-extern u_int16_t create_osi_cksum(const u_int8_t *, int, int);
+extern uint16_t verify_crc10_cksum(uint16_t, const u_char *, int);
+extern uint16_t create_osi_cksum(const uint8_t *, int, int);

 
 /* The printer routines. */
 
 #include <pcap.h>
 
 
 /* The printer routines. */
 
 #include <pcap.h>
 

-extern char *q922_string(const u_char *);

 extern char *smb_errstr(int, int);
 extern char *smb_errstr(int, int);

-extern const char *nt_errstr(u_int32_t);
+extern const char *nt_errstr(uint32_t);

 
 #ifdef INET6
 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 
 struct cksum_vec {
 
 #ifdef INET6
 extern int mask62plen(const u_char *);
 #endif /*INET6*/
 
 struct cksum_vec {

-       const u_int8_t  *ptr;
+       const uint8_t   *ptr;

        int             len;
 };
        int             len;
 };

-extern u_int16_t in_cksum(const struct cksum_vec *, int);
-extern u_int16_t in_cksum_shouldbe(u_int16_t, u_int16_t);
+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;