This commit is contained in:
@@ -0,0 +1,75 @@
|
||||
From 020e25b660250c97c8085e64cf85074ccfcdd06b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 5 Mar 2019 20:59:49 +0100
|
||||
Subject: [PATCH] packet-gtp.c: remove unneeded named structures
|
||||
|
||||
In uclibc, _header is already in sigcontext.h:
|
||||
|
||||
packet-gtp.c:2361:16: error: redefinition of 'struct _header'
|
||||
typedef struct _header {
|
||||
^~~~~~~
|
||||
In file included from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/bits/sigcontext.h:30:0,
|
||||
from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/signal.h:311,
|
||||
from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36,
|
||||
from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:34,
|
||||
from ../../epan/proto.h:28,
|
||||
from ../../epan/packet.h:14,
|
||||
from packet-gtp.c:43:
|
||||
/home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/asm/sigcontext.h:173:8: note: originally defined here
|
||||
struct _header {
|
||||
|
||||
To fix this issue, transform _header and other named structures (with
|
||||
the exception of gtp_conv_info_t) into unnamed structures
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2
|
||||
|
||||
Change-Id: I78116233c2a8dd7c54723b7cb558254bd5143bd2
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Reviewed-on: https://code.wireshark.org/review/32335
|
||||
Petri-Dish: Guy Harris <guy@alum.mit.edu>
|
||||
Tested-by: Petri Dish Buildbot
|
||||
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
||||
[Retrieved from:
|
||||
https://github.com/wireshark/wireshark/commit/020e25b660250c97c8085e64cf85074ccfcdd06b]
|
||||
---
|
||||
epan/dissectors/packet-gtp.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
|
||||
index 4c40e7aa54..971197e4ae 100644
|
||||
--- a/epan/dissectors/packet-gtp.c
|
||||
+++ b/epan/dissectors/packet-gtp.c
|
||||
@@ -2170,7 +2170,7 @@ GHashTable* session_table;
|
||||
/* Relation between <teid,ip> -> frame */
|
||||
wmem_tree_t* frame_tree;
|
||||
|
||||
-typedef struct gtp_info {
|
||||
+typedef struct {
|
||||
guint32 teid;
|
||||
guint32 frame;
|
||||
} gtp_info_t;
|
||||
@@ -2482,7 +2482,7 @@ static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo,
|
||||
static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_);
|
||||
static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_);
|
||||
|
||||
-typedef struct _gtp_opt {
|
||||
+typedef struct {
|
||||
int optcode;
|
||||
int (*decode) (tvbuff_t *, int, packet_info *, proto_tree *, session_args_t *);
|
||||
} gtp_opt_t;
|
||||
@@ -2661,12 +2661,12 @@ id_to_str(tvbuff_t *tvb, gint offset)
|
||||
/* Next definitions and function check_field_presence checks if given field
|
||||
* in GTP packet is compliant with ETSI
|
||||
*/
|
||||
-typedef struct _header {
|
||||
+typedef struct {
|
||||
guint8 code;
|
||||
guint8 presence;
|
||||
} ext_header;
|
||||
|
||||
-typedef struct _message {
|
||||
+typedef struct {
|
||||
guint8 code;
|
||||
ext_header fields[32];
|
||||
} _gtp_mess_items;
|
||||
@@ -1,4 +1,4 @@
|
||||
# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.6.txt
|
||||
sha256 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863 wireshark-2.6.6.tar.xz
|
||||
# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.7.txt
|
||||
sha256 747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71 wireshark-2.6.7.tar.xz
|
||||
# Locally calculated
|
||||
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WIRESHARK_VERSION = 2.6.6
|
||||
WIRESHARK_VERSION = 2.6.7
|
||||
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
|
||||
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
|
||||
WIRESHARK_LICENSE = wireshark license
|
||||
@@ -145,6 +145,13 @@ else
|
||||
WIRESHARK_CONF_OPTS += --without-snappy
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SPANDSP),y)
|
||||
WIRESHARK_CONF_OPTS += --with-spandsp
|
||||
WIRESHARK_DEPENDENCIES += spandsp
|
||||
else
|
||||
WIRESHARK_CONF_OPTS += --without-spandsp
|
||||
endif
|
||||
|
||||
define WIRESHARK_REMOVE_DOCS
|
||||
find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \
|
||||
-o -name '*.html' -print0 | xargs -0 rm -f
|
||||
|
||||
Reference in New Issue
Block a user