use macros for VAT and WB port numbers

diff --git a/print-udp.c b/print-udp.c
index 6e0c99bb192852ff0d6b20bbea2c96faa996eb41..fb56be58aab688881f81004ebbb9d1b7bf08283b 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -608,7 +608,7 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(NETBIOS_DGRAM_PORT))
                        nbt_udp138_print((const u_char *)(up + 1), length);
 #endif
                else if (ISPORT(NETBIOS_DGRAM_PORT))
                        nbt_udp138_print((const u_char *)(up + 1), length);
 #endif

-               else if (dport == 3456)
+               else if (dport == VAT_PORT)

                        vat_print((const void *)(up + 1), up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);
                        vat_print((const void *)(up + 1), up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                        zephyr_print((const void *)(up + 1), length);


@@ -631,7 +631,7 @@ udp_print(register const u_char *bp, u_int length,
                /*
                 * Kludge in test for whiteboard packets.
                 */
                /*
                 * Kludge in test for whiteboard packets.
                 */

-               else if (dport == 4567)
+               else if (dport == WB_PORT)

                        wb_print((const void *)(up + 1), length);
                else if (ISPORT(CISCO_AUTORP_PORT))
                        cisco_autorp_print((const void *)(up + 1), length);
                        wb_print((const void *)(up + 1), length);
                else if (ISPORT(CISCO_AUTORP_PORT))
                        cisco_autorp_print((const void *)(up + 1), length);

diff --git a/udp.h b/udp.h
index b07cdd4331f6698408f4cf298556a93a4b179f27..4705dc9e9bde86e92e929094c3d058785df8ca87 100644 (file)
--- a/udp.h
+++ b/udp.h
@@ -79,9 +79,11 @@ struct udphdr {
 #define VQP_PORT               1589
 #define ZEPHYR_SRV_PORT                2103
 #define ZEPHYR_CLT_PORT                2104
 #define VQP_PORT               1589
 #define ZEPHYR_SRV_PORT                2103
 #define ZEPHYR_CLT_PORT                2104

+#define VAT_PORT               3456

 #define MPLS_LSP_PING_PORT      3503 /* draft-ietf-mpls-lsp-ping-02.txt */
 #define BFD_CONTROL_PORT        3784 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
 #define BFD_ECHO_PORT           3785 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
 #define MPLS_LSP_PING_PORT      3503 /* draft-ietf-mpls-lsp-ping-02.txt */
 #define BFD_CONTROL_PORT        3784 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
 #define BFD_ECHO_PORT           3785 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */

+#define WB_PORT                        4567

 #define SFLOW_PORT              6343 /* http://www.sflow.org/developers/specifications.php */
 #define LWAPP_DATA_PORT         12222 /* draft-ohara-capwap-lwapp-04.txt */
 #define LWAPP_CONTROL_PORT      12223 /* draft-ohara-capwap-lwapp-04.txt */
 #define SFLOW_PORT              6343 /* http://www.sflow.org/developers/specifications.php */
 #define LWAPP_DATA_PORT         12222 /* draft-ohara-capwap-lwapp-04.txt */
 #define LWAPP_CONTROL_PORT      12223 /* draft-ohara-capwap-lwapp-04.txt */