From a21709eabb83f4944babdd55034e8b15a13a41b3 Mon Sep 17 00:00:00 2001 From: Jo Rueschel Date: Mon, 16 Nov 2015 16:59:53 +0100 Subject: Export the value_string array ip_proto_val_ext for usage in plugins Until now, it is not possible to use the IANA-assigned protocol values in a Wireshark plugin. This commit exports them for use on Windows machines. As discussed on http://seclists.org/wireshark/2015/Nov/88 Change-Id: I22adc33accf5d776bd3e5cc0899d3c5b9e9d531c Reviewed-on: https://code.wireshark.org/review/11874 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 92bb13a4d22a48c43aa5fa6910c68829edebfdd0) Reviewed-on: https://code.wireshark.org/review/11933 --- debian/libwireshark0.symbols | 1 + epan/ipproto.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 749889592b..c2e2a51058 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -787,6 +787,7 @@ libwireshark.so.0 libwireshark0 #MINVER# ip_checksum_tvb@Base 1.99.0 ipopt_type_class_vals@Base 1.9.1 ipopt_type_number_vals@Base 1.9.1 + ipproto_val_ext@Base 2.0.0 ipprotostr@Base 1.9.1 ipv4_get_net_order_addr@Base 1.9.1 is_big_endian@Base 1.9.1 diff --git a/epan/ipproto.h b/epan/ipproto.h index 3477507ebb..ba15f9336d 100644 --- a/epan/ipproto.h +++ b/epan/ipproto.h @@ -191,7 +191,7 @@ #define IP_PROTO_AX4000 173 /* AX/4000 Testblock - non IANA */ #define IP_PROTO_NCS_HEARTBEAT 224 /* Novell NCS Heartbeat - http://support.novell.com/cgi-bin/search/searchtid.cgi?/10071158.htm */ -extern value_string_ext ipproto_val_ext; +WS_DLL_PUBLIC value_string_ext ipproto_val_ext; WS_DLL_PUBLIC const char *ipprotostr(const int proto); #endif /* ipproto.h */ -- cgit v1.2.1