Merge git://github.com/the-tcpdump-group/tcpdump

diff --combined netdissect.h
index 7d7bfa1c2035dad624cacb679ece90dbc048dc31,e0a0205d94dbc08560c138cbad2c2963b6cb7421..bef3c0e5d42cd3ad30d5b3aa4e8a9fca7ba922b3
--- 1/netdissect.h
--- 2/netdissect.h
+++ b/netdissect.h
@@@ -478,7 -478,7 +478,7 @@@ extern u_int atm_if_print(netdissect_op
  extern void vtp_print(netdissect_options *, const u_char *, u_int);
  extern int mptcp_print(netdissect_options *, const u_char *, u_int, u_char);
  extern void ntp_print(netdissect_options *, const u_char *, u_int);
 -extern void cnfp_print(netdissect_options *, const u_char *, const u_char *);
 +extern void cnfp_print(netdissect_options *, const u_char *);
  extern void dvmrp_print(netdissect_options *, const u_char *, u_int);
  extern void egp_print(netdissect_options *, const u_char *, u_int);
  extern u_int enc_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
@@@ -556,6 -556,7 +556,7 @@@ extern void ftp_print(netdissect_option
  extern void http_print(netdissect_options *, const u_char *, u_int);
  extern void rtsp_print(netdissect_options *, const u_char *, u_int);
  extern void smtp_print(netdissect_options *, const u_char *, u_int);
+ extern void geneve_print(netdissect_options *, const u_char *, u_int);
  
  /* stuff that has not yet been rototiled */
  

diff --combined print-udp.c
index 52be99c38880ed4c3e5e3fc31a21903b51e74d66,49097daa391967506a110436d054af082fa00a44..c3edf6ef5de19b855731cd0c30bf07ab6a2d0275
--- 1/print-udp.c
--- 2/print-udp.c
+++ b/print-udp.c
@@@ -444,7 -444,7 +444,7 @@@ udp_print(netdissect_options *ndo, regi
  
                case PT_CNFP:
                        udpipaddr_print(ndo, ip, sport, dport);
 -                      cnfp_print(ndo, cp, (const u_char *)ip);
 +                      cnfp_print(ndo, cp);
                        break;
  
                case PT_TFTP:
@@@ -679,6 -679,8 +679,8 @@@
                        otv_print(ndo, (const u_char *)(up + 1), length);
                  else if (ISPORT(VXLAN_PORT))
                        vxlan_print(ndo, (const u_char *)(up + 1), length);
+                 else if (ISPORT(GENEVE_PORT))
+                       geneve_print(ndo, (const u_char *)(up + 1), length);
                else {
                        if (ulen > length)
                                ND_PRINT((ndo, "UDP, bad length %u > %u",