summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo Rueschel <wireshark@rueschel.de>2015-11-16 16:59:53 +0100
committerMichael Mann <mmann78@netscape.net>2015-11-18 04:19:00 +0000
commita21709eabb83f4944babdd55034e8b15a13a41b3 (patch)
treefc468b7ab8dadc21e076a20449209c6803f78ade
parentd92a5fa7b3404723cc23b9a83988c5e5bdd5456b (diff)
downloadwireshark-a21709eabb83f4944babdd55034e8b15a13a41b3.tar.gz
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 <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 92bb13a4d22a48c43aa5fa6910c68829edebfdd0) Reviewed-on: https://code.wireshark.org/review/11933
-rw-r--r--debian/libwireshark0.symbols1
-rw-r--r--epan/ipproto.h2
2 files changed, 2 insertions, 1 deletions
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 */