summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2016-03-22 17:23:40 +0100
committerFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2016-03-22 17:23:40 +0100
commitf0b959c53eae8e655e26ef7faf202c9bf8967b0f (patch)
treeee6b3ed9aa8c57be88197db2d0d65e9015e19b91
parentba8a8cd5a385e86a857b90d2d087dd6f2cd5b083 (diff)
downloadtcpdump-f0b959c53eae8e655e26ef7faf202c9bf8967b0f.tar.gz
Restore alphabetical order in Makefile.in and netdissect.h
-rw-r--r--Makefile.in2
-rw-r--r--netdissect.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 0bd20667..cc774cca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,6 +173,7 @@ LIBNETDISSECT_SRC=\
print-msnlb.c \
print-nflog.c \
print-nfs.c \
+ print-nsh.c \
print-ntp.c \
print-null.c \
print-olsr.c \
@@ -226,7 +227,6 @@ LIBNETDISSECT_SRC=\
print-vtp.c \
print-vxlan.c \
print-vxlan-gpe.c \
- print-nsh.c \
print-wb.c \
print-zephyr.c \
print-zeromq.c \
diff --git a/netdissect.h b/netdissect.h
index 87f5e3ec..345bffca 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -533,6 +533,7 @@ extern void nfsreply_print_noaddr(netdissect_options *, const u_char *, u_int, c
extern void nfsreq_print_noaddr(netdissect_options *, const u_char *, u_int, const u_char *);
extern const u_char * ns_nprint (netdissect_options *, register const u_char *, register const u_char *);
extern void ns_print(netdissect_options *, const u_char *, u_int, int);
+extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len);
extern void ntp_print(netdissect_options *, const u_char *, u_int);
extern int oam_print(netdissect_options *, const u_char *, u_int, u_int);
extern void olsr_print(netdissect_options *, const u_char *, u_int, int);
@@ -584,13 +585,12 @@ extern int vjc_print(netdissect_options *, register const char *, u_short);
extern void vqp_print(netdissect_options *, register const u_char *, register u_int);
extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
extern void vtp_print(netdissect_options *, const u_char *, u_int);
-extern void vxlan_print(netdissect_options *, const u_char *, u_int);
extern void vxlan_gpe_print(netdissect_options *ndo, const u_char *bp, u_int len);
+extern void vxlan_print(netdissect_options *, const u_char *, u_int);
extern void wb_print(netdissect_options *, const void *, u_int);
extern void zephyr_print(netdissect_options *, const u_char *, int);
extern void zmtp1_print(netdissect_options *, const u_char *, u_int);
extern void zmtp1_print_datagram(netdissect_options *, const u_char *, const u_int);
-extern void nsh_print(netdissect_options *ndo, const u_char *bp, u_int len);
/* checksum routines */
extern void init_checksum(void);