wireshark: Fix the patches and rebase against a recent wireshark version
My previous attempt to only add the hunks I changed broke the format of the patch and this time I am just dumping my current patch on top of these patches.
This commit is contained in:
parent
38e9c82114
commit
2fb7ccf95f
|
@ -1,8 +1,21 @@
|
|||
Index: wireshark/epan/dissectors/Makefile.common
|
||||
===================================================================
|
||||
--- wireshark.orig/epan/dissectors/Makefile.common
|
||||
+++ wireshark/epan/dissectors/Makefile.common
|
||||
@@ -474,6 +474,7 @@
|
||||
From 5857518be87641fdab45e593bc9fd5ef5595e619 Mon Sep 17 00:00:00 2001
|
||||
From: Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
Date: Mon, 19 Apr 2010 13:23:51 +0800
|
||||
Subject: [PATCH 1/2] Add the Abis OML patch.
|
||||
|
||||
---
|
||||
epan/dissectors/Makefile.common | 1 +
|
||||
epan/dissectors/packet-gsm_abis_oml.c | 1382 +++++++++++++++++++++++++++++++++
|
||||
epan/dissectors/packet-gsm_abis_oml.h | 787 +++++++++++++++++++
|
||||
3 files changed, 2170 insertions(+), 0 deletions(-)
|
||||
create mode 100644 epan/dissectors/packet-gsm_abis_oml.c
|
||||
create mode 100644 epan/dissectors/packet-gsm_abis_oml.h
|
||||
|
||||
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
|
||||
index dbc3726..98dcdc3 100644
|
||||
--- a/epan/dissectors/Makefile.common
|
||||
+++ b/epan/dissectors/Makefile.common
|
||||
@@ -481,6 +481,7 @@ DISSECTOR_SRC = \
|
||||
packet-gsm_a_gm.c \
|
||||
packet-gsm_a_rp.c \
|
||||
packet-gsm_a_rr.c \
|
||||
|
@ -12,7 +25,7 @@ Index: wireshark/epan/dissectors/Makefile.common
|
|||
packet-gsm_bssmap_le.c \
|
||||
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c
|
||||
new file mode 100644
|
||||
index 0000000..2de9dca
|
||||
index 0000000..fa46ab5
|
||||
--- /dev/null
|
||||
+++ b/epan/dissectors/packet-gsm_abis_oml.c
|
||||
@@ -0,0 +1,1382 @@
|
||||
|
@ -1398,11 +1411,12 @@ index 0000000..2de9dca
|
|||
+ abis_oml_handle = create_dissector_handle(dissect_abis_oml, proto_abis_oml);
|
||||
+ dissector_add("lapd.gsm.sapi", LAPD_GSM_SAPI_OM_PROC, abis_oml_handle);
|
||||
+}
|
||||
Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
|
||||
===================================================================
|
||||
diff --git a/epan/dissectors/packet-gsm_abis_oml.h b/epan/dissectors/packet-gsm_abis_oml.h
|
||||
new file mode 100644
|
||||
index 0000000..d523e96
|
||||
--- /dev/null
|
||||
+++ wireshark/epan/dissectors/packet-gsm_abis_oml.h
|
||||
@@ -0,0 +1,786 @@
|
||||
+++ b/epan/dissectors/packet-gsm_abis_oml.h
|
||||
@@ -0,0 +1,787 @@
|
||||
+/* GSM Network Management messages on the A-bis interface
|
||||
+ * 3GPP TS 12.21 version 8.0.0 Release 1999 / ETSI TS 100 623 V8.0.0 */
|
||||
+
|
||||
|
@ -2190,3 +2204,6 @@ Index: wireshark/epan/dissectors/packet-gsm_abis_oml.h
|
|||
+};
|
||||
+
|
||||
+#endif /* _NM_H */
|
||||
--
|
||||
1.7.0.1
|
||||
|
||||
|
|
|
@ -1,16 +1,25 @@
|
|||
Index: wireshark/epan/dissectors/packet-rsl.c
|
||||
===================================================================
|
||||
--- wireshark.orig/epan/dissectors/packet-rsl.c 2009-10-21 23:03:41.000000000 +0200
|
||||
+++ wireshark/epan/dissectors/packet-rsl.c 2009-10-22 10:02:51.000000000 +0200
|
||||
From 8f35d623641dbba90e6186604c11e892bf515ecc Mon Sep 17 00:00:00 2001
|
||||
From: Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
Date: Mon, 19 Apr 2010 13:32:58 +0800
|
||||
Subject: [PATCH 2/2] RSL patch
|
||||
|
||||
---
|
||||
epan/dissectors/packet-rsl.c | 522 +++++++++++++++++++++++++++++++++++++++++-
|
||||
1 files changed, 515 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
|
||||
index b10a671..a455cf3 100644
|
||||
--- a/epan/dissectors/packet-rsl.c
|
||||
+++ b/epan/dissectors/packet-rsl.c
|
||||
@@ -2,6 +2,7 @@
|
||||
* Routines for Radio Signalling Link (RSL) dissection.
|
||||
*
|
||||
* Copyright 2007, Anders Broman <anders.broman@ericsson.com>
|
||||
+ * Copyright 2009, Harald Welte <laforge@gnumonks.org>
|
||||
*
|
||||
* $Id: packet-rsl.c 29944 2009-09-16 13:39:37Z morriss $
|
||||
* $Id$
|
||||
*
|
||||
@@ -44,6 +45,8 @@
|
||||
@@ -42,6 +43,8 @@
|
||||
#include <epan/lapd_sapi.h>
|
||||
|
||||
#include "packet-gsm_a_common.h"
|
||||
|
@ -19,7 +28,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
/* Initialize the protocol and registered fields */
|
||||
static int proto_rsl = -1;
|
||||
@@ -117,6 +120,24 @@
|
||||
@@ -115,6 +118,24 @@ static int hf_rsl_emlpp_prio = -1;
|
||||
static int hf_rsl_rtd = -1;
|
||||
static int hf_rsl_delay_ind = -1;
|
||||
static int hf_rsl_tfo = -1;
|
||||
|
@ -44,7 +53,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
/* Initialize the subtree pointers */
|
||||
static int ett_rsl = -1;
|
||||
@@ -174,6 +195,15 @@
|
||||
@@ -172,6 +193,15 @@ static int ett_ie_cause = -1;
|
||||
static int ett_ie_meas_res_no = -1;
|
||||
static int ett_ie_message_id = -1;
|
||||
static int ett_ie_sys_info_type = -1;
|
||||
|
@ -60,7 +69,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
proto_tree *top_tree;
|
||||
dissector_handle_t gsm_a_ccch_handle;
|
||||
@@ -209,8 +239,11 @@
|
||||
@@ -207,8 +237,11 @@ static const value_string rsl_msg_disc_vals[] = {
|
||||
{ 0x06, "Common Channel Management messages" },
|
||||
{ 0x08, "TRX Management messages" },
|
||||
{ 0x16, "Location Services messages" },
|
||||
|
@ -72,7 +81,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
/*
|
||||
* 9.2 MESSAGE TYPE
|
||||
*/
|
||||
@@ -277,6 +310,49 @@
|
||||
@@ -275,6 +308,49 @@ static const value_string rsl_msg_disc_vals[] = {
|
||||
/* 0 1 - - - - - - Location Services messages: */
|
||||
#define RSL_MSG_LOC_INF 65 /* 8.7.1 */
|
||||
|
||||
|
@ -90,16 +99,16 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
+#define RSL_MSG_TYPE_IPAC_PDCH_DEACT_ACK 0x4c
|
||||
+#define RSL_MSG_TYPE_IPAC_PDCH_DEACT_NACK 0x4d
|
||||
+
|
||||
+#define RSL_MSG_TYPE_IPAC_BIND 0x70
|
||||
+#define RSL_MSG_TYPE_IPAC_BIND_ACK 0x71
|
||||
+#define RSL_MSG_TYPE_IPAC_BIND_NACK 0x72
|
||||
+#define RSL_MSG_TYPE_IPAC_CONNECT 0x73
|
||||
+#define RSL_MSG_TYPE_IPAC_CONNECT_ACK 0x74
|
||||
+#define RSL_MSG_TYPE_IPAC_CONNECT_NACK 0x75
|
||||
+#define RSL_MSG_TYPE_IPAC_DISC_IND 0x76
|
||||
+#define RSL_MSG_TYPE_IPAC_DISC 0x77
|
||||
+#define RSL_MSG_TYPE_IPAC_DISC_ACK 0x78
|
||||
+#define RSL_MSG_TYPE_IPAC_DISC_NACK 0x79
|
||||
+#define RSL_MSG_TYPE_IPAC_CRCX 0x70
|
||||
+#define RSL_MSG_TYPE_IPAC_CRCX_ACK 0x71
|
||||
+#define RSL_MSG_TYPE_IPAC_CRCX_NACK 0x72
|
||||
+#define RSL_MSG_TYPE_IPAC_MDCX 0x73
|
||||
+#define RSL_MSG_TYPE_IPAC_MDCX_ACK 0x74
|
||||
+#define RSL_MSG_TYPE_IPAC_MDCX_NACK 0x75
|
||||
+#define RSL_MSG_TYPE_IPAC_DLCX_IND 0x76
|
||||
+#define RSL_MSG_TYPE_IPAC_DLCX 0x77
|
||||
+#define RSL_MSG_TYPE_IPAC_DLCX_ACK 0x78
|
||||
+#define RSL_MSG_TYPE_IPAC_DLCX_NACK 0x79
|
||||
+
|
||||
+#define RSL_IE_IPAC_SRTP_CONFIG 0xe0
|
||||
+#define RSL_IE_IPAC_PROXY_UDP 0xe1
|
||||
|
@ -122,7 +131,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
static const value_string rsl_msg_type_vals[] = {
|
||||
/* 0 0 0 0 - - - - Radio Link Layer Management messages: */
|
||||
@@ -339,6 +415,26 @@
|
||||
@@ -337,6 +413,26 @@ static const value_string rsl_msg_type_vals[] = {
|
||||
{ 0x3f, "TFO MODification REQuest" }, /* 8.4.31 */
|
||||
/* 0 1 - - - - - - Location Services messages: */
|
||||
{ 0x41, "Location Information" }, /* 8.7.1 */
|
||||
|
@ -149,7 +158,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@@ -372,10 +468,10 @@ static const value_string rsl_msg_type_vals[] = {
|
||||
@@ -370,10 +466,10 @@ static const value_string rsl_msg_type_vals[] = {
|
||||
#define RSL_IE_MESSAGE_ID 28
|
||||
|
||||
#define RSL_IE_SYS_INFO_TYPE 30
|
||||
|
@ -164,7 +173,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
#define RSL_IE_FULL_IMM_ASS_INF 35
|
||||
#define RSL_IE_SMSCB_INF 36
|
||||
#define RSL_IE_FULL_MS_TIMING_OFFSET 37
|
||||
@@ -478,6 +574,24 @@
|
||||
@@ -476,6 +572,24 @@ static const value_string rsl_ie_type_vals[] = {
|
||||
Not used
|
||||
|
||||
*/
|
||||
|
@ -189,7 +198,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
{ 0, NULL }
|
||||
};
|
||||
|
||||
@@ -514,6 +628,96 @@
|
||||
@@ -512,6 +626,96 @@ static const value_string rsl_ch_no_Cbits_vals[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
@ -286,7 +295,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
/* 9.3.1 Channel number 9.3.1 M TV 2 */
|
||||
static int
|
||||
dissect_rsl_ie_ch_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean is_mandatory)
|
||||
@@ -2044,7 +2248,6 @@
|
||||
@@ -2042,7 +2246,6 @@ dissect_rsl_ie_err_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
|
||||
proto_item_set_len(ti, length+2);
|
||||
|
||||
proto_tree_add_item(ie_tree, hf_rsl_ie_length, tvb, offset, 1, FALSE);
|
||||
|
@ -294,7 +303,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
/* Received Message */
|
||||
offset = dissct_rsl_msg(tvb, pinfo, ie_tree, offset);
|
||||
@@ -2909,12 +3112,183 @@
|
||||
@@ -2907,12 +3110,184 @@ dissect_rsl_ie_tfo_transp_cont(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -310,16 +319,16 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
+
|
||||
+#if 0
|
||||
+ switch (msg_type) {
|
||||
+ case RSL_MSG_TYPE_IPAC_BIND:
|
||||
+ case RSL_MSG_TYPE_IPAC_BIND_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_BIND_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_CONNECT:
|
||||
+ case RSL_MSG_TYPE_IPAC_CONNECT_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_CONNECT_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_DISC_IND:
|
||||
+ case RSL_MSG_TYPE_IPAC_DISC:
|
||||
+ case RSL_MSG_TYPE_IPAC_DISC_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_DISC_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_CRCX:
|
||||
+ case RSL_MSG_TYPE_IPAC_CRCX_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_CRCX_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_MDCX:
|
||||
+ case RSL_MSG_TYPE_IPAC_MDCX_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_MDCX_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_DLCX_IND:
|
||||
+ case RSL_MSG_TYPE_IPAC_DLCX:
|
||||
+ case RSL_MSG_TYPE_IPAC_DLCX_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_DLCX_NACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_PDCH_ACT:
|
||||
+ case RSL_MSG_TYPE_IPAC_PDCH_ACT_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_PDCH_ACT_NACK:
|
||||
|
@ -449,7 +458,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
+ }
|
||||
+
|
||||
+ switch (msg_type) {
|
||||
+ case RSL_MSG_TYPE_IPAC_BIND_ACK:
|
||||
+ case RSL_MSG_TYPE_IPAC_CRCX_ACK:
|
||||
+ /* Notify the RTP and RTCP dissectors about a new RTP stream */
|
||||
+ src_addr.type = AT_IPv4;
|
||||
+ src_addr.len = 4;
|
||||
|
@ -480,7 +489,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
offset++;
|
||||
|
||||
switch (msg_type){
|
||||
@@ -3482,6 +3856,18 @@
|
||||
@@ -3480,6 +3855,18 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
|
||||
/* LLP APDU 9.3.58 M LV 2-N */
|
||||
offset = dissect_rsl_ie_llp_apdu(tvb, pinfo, tree, offset, TRUE);
|
||||
break;
|
||||
|
@ -499,7 +508,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
default:
|
||||
break;
|
||||
}
|
||||
@@ -3489,6 +3875,40 @@
|
||||
@@ -3487,6 +3874,40 @@ dissct_rsl_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
|
||||
return offset;
|
||||
|
||||
}
|
||||
|
@ -540,7 +549,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
static void
|
||||
dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
@@ -3516,7 +3936,6 @@
|
||||
@@ -3514,7 +3935,6 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
/* 9.1 Message discriminator */
|
||||
proto_tree_add_item(rsl_tree, hf_rsl_msg_dsc, tvb, offset, 1, FALSE);
|
||||
proto_tree_add_item(rsl_tree, hf_rsl_T_bit, tvb, offset, 1, FALSE);
|
||||
|
@ -548,7 +557,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
|
||||
offset = dissct_rsl_msg(tvb, pinfo, rsl_tree, offset);
|
||||
|
||||
@@ -3886,6 +4305,86 @@
|
||||
@@ -3884,6 +4304,86 @@ void proto_register_rsl(void)
|
||||
FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
|
||||
NULL, HFILL }
|
||||
},
|
||||
|
@ -635,7 +644,7 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
};
|
||||
static gint *ett[] = {
|
||||
&ett_rsl,
|
||||
@@ -3943,6 +4442,14 @@
|
||||
@@ -3941,6 +4441,14 @@ void proto_register_rsl(void)
|
||||
&ett_ie_meas_res_no,
|
||||
&ett_ie_message_id,
|
||||
&ett_ie_sys_info_type,
|
||||
|
@ -650,3 +659,6 @@ Index: wireshark/epan/dissectors/packet-rsl.c
|
|||
};
|
||||
|
||||
/* Register the protocol name and description */
|
||||
--
|
||||
1.7.0.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue