diff options
| author | Francois-Xavier Le Bail <fx.lebail@yahoo.com> | 2015-06-10 21:12:38 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <fx.lebail@yahoo.com> | 2015-06-10 21:12:38 +0200 |
| commit | 1e560c81645bb3d1438ed37b320b6341d7c3eb97 (patch) | |
| tree | d7614217a60e8fa1e10af63f32d4efb1203e9bf7 | |
| parent | 8aca26be94f1857b182ee835d48564d2c17bbf4c (diff) | |
| download | tcpdump-1e560c81645bb3d1438ed37b320b6341d7c3eb97.tar.gz | |
Move more prototypes in netdissect.h
| -rw-r--r-- | interface.h | 8 | ||||
| -rw-r--r-- | netdissect.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/interface.h b/interface.h index 2c157844..92343788 100644 --- a/interface.h +++ b/interface.h @@ -80,10 +80,6 @@ extern char *program_name; /* used to generate self-identifying messages */ extern int32_t thiszone; /* seconds offset from gmt to local time */ -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 void error(const char *, ...) __attribute__((noreturn)) #ifdef __ATTRIBUTE___FORMAT_OK @@ -103,10 +99,6 @@ extern char *copy_argv(char **); #include <pcap.h> -#ifdef INET6 -extern int mask62plen(const u_char *); -#endif /*INET6*/ - #ifndef HAVE_BPF_DUMP struct bpf_program; diff --git a/netdissect.h b/netdissect.h index 8f98c31b..d7a027e4 100644 --- a/netdissect.h +++ b/netdissect.h @@ -347,6 +347,14 @@ extern int unaligned_memcmp(const void *, const void *, size_t); extern const char *dnname_string(u_short); extern const char *dnnum_string(u_short); +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) + +#ifdef INET6 +extern int mask62plen(const u_char *); +#endif /*INET6*/ + /* The printer routines. */ #include <pcap.h> |