# include "config.h"
#endif
+#include <string.h>
+
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
#include <epan/addr_resolv.h>
+#include <epan/emem.h>
#include "packet-pdcp-lte.h"
/* TODO:
- - Update to latest version of 36.323
- Complete ROHC support for RTP and extend to other profiles (including ROHCv2)
- - Support for decryption
+ - Support for deciphering
- Verify MAC authentication bytes
- - Call LTE RRC dissector for uncompressed, signalling payloads
*/
/* Initialize the protocol and registered fields. */
int proto_pdcp_lte = -1;
+extern int proto_rlc_lte;
+
/* Configuration (info known outside of PDU) */
static int hf_pdcp_lte_configuration = -1;
static int hf_pdcp_lte_direction = -1;
+static int hf_pdcp_lte_ueid = -1;
+static int hf_pdcp_lte_channel_type = -1;
+static int hf_pdcp_lte_channel_id = -1;
static int hf_pdcp_lte_rohc = -1;
static int hf_pdcp_lte_rohc_compression = -1;
static int hf_pdcp_lte_rohc_mode = -1;
static int hf_pdcp_lte_rohc_udp_checksum = -1;
static int hf_pdcp_lte_rohc_payload = -1;
+/* Sequence Analysis */
+static int hf_pdcp_lte_sequence_analysis = -1;
+static int hf_pdcp_lte_sequence_analysis_ok = -1;
+static int hf_pdcp_lte_sequence_analysis_previous_frame = -1;
+static int hf_pdcp_lte_sequence_analysis_expected_sn = -1;
+
+static int hf_pdcp_lte_sequence_analysis_repeated = -1;
+static int hf_pdcp_lte_sequence_analysis_skipped = -1;
+
+
+
/* Protocol subtree. */
static int ett_pdcp = -1;
static int ett_pdcp_configuration = -1;
static int ett_pdcp_packet = -1;
+static int ett_pdcp_lte_sequence_analysis = -1;
static int ett_pdcp_rohc = -1;
static int ett_pdcp_rohc_static_ipv4 = -1;
static int ett_pdcp_rohc_static_udp = -1;
{ 0, NULL }
};
+static const value_string logical_channel_vals[] = {
+ { Channel_DCCH, "DCCH"},
+ { Channel_BCCH, "BCCH"},
+ { Channel_CCCH, "CCCH"},
+ { Channel_PCCH, "PCCH"},
+ { 0, NULL}
+};
static const value_string rohc_mode_vals[] = {
{ UNIDIRECTIONAL, "Unidirectional" },
};
-/* TODO: add more */
+/* Values taken from:
+ http://www.iana.org/assignments/rohc-pro-ids/rohc-pro-ids.txt */
static const value_string rohc_profile_vals[] = {
- { 0, "Uncompressed" },
- { 1, "RTP" },
- { 2, "UDP" },
- { 3, "ESP/IP" },
- { 0, NULL }
+ { 0x0000, "ROHC uncompressed" }, /* [RFC5795] */
+ { 0x0001, "ROHC RTP" }, /* [RFC3095] */
+ { 0x0101, "ROHCv2 RTP" }, /* [RFC5225] */
+ { 0x0002, "ROHC UDP" }, /* [RFC3095] */
+ { 0x0102, "ROHCv2 UDP" }, /* [RFC5225] */
+ { 0x0003, "ROHC ESP" }, /* [RFC3095] */
+ { 0x0103, "ROHCv2 ESP" }, /* [RFC5225] */
+ { 0x0004, "ROHC IP" }, /* [RFC3843] */
+ { 0x0104, "ROHCv2 IP" }, /* [RFC5225] */
+ { 0x0005, "ROHC LLA" }, /* [RFC4362] */
+ { 0x0105, "ROHC LLA with R-mode" }, /* [RFC3408] */
+ { 0x0006, "ROHC TCP" }, /* [RFC4996] */
+ { 0x0007, "ROHC RTP/UDP-Lite" }, /* [RFC4019] */
+ { 0x0107, "ROHCv2 RTP/UDP-Lite" }, /* [RFC5225] */
+ { 0x0008, "ROHC UDP-Lite" }, /* [RFC4019] */
+ { 0x0108, "ROHCv2 UDP-Lite" }, /* [RFC5225] */
+ { 0, NULL }
};
static const value_string pdu_type_vals[] = {
};
-dissector_handle_t ip_handle = 0;
-
+static dissector_handle_t ip_handle;
+static dissector_handle_t ipv6_handle;
+static dissector_handle_t data_handle;
/* Preference variables */
static gboolean global_pdcp_show_feedback_option_tag_length = FALSE;
static gboolean global_pdcp_dissect_user_plane_as_ip = FALSE;
static gboolean global_pdcp_dissect_signalling_plane_as_rrc = FALSE;
+static gboolean global_pdcp_check_sequence_numbers = FALSE;
static gboolean global_pdcp_dissect_rohc = FALSE;
+
+/**************************************************/
+/* Sequence number analysis */
+
+/* Channel key */
+typedef struct
+{
+ guint16 ueId;
+ LogicalChannelType channelType;
+ guint16 channelId;
+ guint8 direction;
+} pdcp_channel_hash_key;
+
+/* Channel state */
+typedef struct
+{
+ guint16 previousSequenceNumber;
+ guint32 previousFrameNum;
+} pdcp_channel_status;
+
+/* The sequence analysis channel hash table.
+ Maps key -> status */
+static GHashTable *pdcp_sequence_analysis_channel_hash = NULL;
+
+/* Equal keys */
+static gint pdcp_channel_equal(gconstpointer v, gconstpointer v2)
+{
+ const pdcp_channel_hash_key* val1 = v;
+ const pdcp_channel_hash_key* val2 = v2;
+
+ /* All fields must match */
+ return (memcmp(val1, val2, sizeof(pdcp_channel_hash_key)) == 0);
+}
+
+/* Compute a hash value for a given key. */
+static guint pdcp_channel_hash_func(gconstpointer v)
+{
+ const pdcp_channel_hash_key* val1 = v;
+
+ /* TODO: use multipliers */
+ return val1->ueId + val1->channelType + val1->channelId + val1->direction;
+}
+
+/* Hash table functions for frame reports */
+
+/* TODO: copied from packet-rlc-lte.c. extern, or add to lib? */
+/* Equal keys */
+static gint pdcp_frame_equal(gconstpointer v, gconstpointer v2)
+{
+ return (v == v2);
+}
+
+/* Compute a hash value for a given key. */
+static guint pdcp_frame_hash_func(gconstpointer v)
+{
+ return GPOINTER_TO_UINT(v);
+}
+
+
+/* Info to attach to frame when first read, recording what to show about sequence */
+typedef struct
+{
+ gboolean sequenceExpectedCorrect;
+ guint16 sequenceExpected;
+ guint32 previousFrameNum;
+
+ guint16 firstSN;
+ guint16 lastSN;
+
+ enum { SN_OK, SN_Repeated, SN_MAC_Retx, SN_Retx, SN_Missing} state;
+} pdcp_sequence_report_in_frame;
+
+/* The sequence analysis frame report hash table instance itself */
+static GHashTable *pdcp_lte_frame_sequence_analysis_report_hash = NULL;
+
+
+/* Add to the tree values associated with sequence analysis for this frame */
+static void addChannelSequenceInfo(pdcp_sequence_report_in_frame *p,
+ pdcp_lte_info *p_pdcp_lte_info,
+ guint16 sequenceNumber,
+ packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb)
+{
+ proto_tree *seqnum_tree;
+ proto_item *seqnum_ti;
+ proto_item *ti;
+
+ /* Create subtree */
+ seqnum_ti = proto_tree_add_string_format(tree,
+ hf_pdcp_lte_sequence_analysis,
+ tvb, 0, 0,
+ "", "Sequence Analysis");
+ seqnum_tree = proto_item_add_subtree(seqnum_ti,
+ ett_pdcp_lte_sequence_analysis);
+ PROTO_ITEM_SET_GENERATED(seqnum_ti);
+
+
+ /* Previous channel frame */
+ if (p->previousFrameNum != 0) {
+ proto_tree_add_uint(seqnum_tree, hf_pdcp_lte_sequence_analysis_previous_frame,
+ tvb, 0, 0, p->previousFrameNum);
+ }
+
+ /* Expected sequence number */
+ ti = proto_tree_add_uint(seqnum_tree, hf_pdcp_lte_sequence_analysis_expected_sn,
+ tvb, 0, 0, p->sequenceExpected);
+ PROTO_ITEM_SET_GENERATED(ti);
+
+ /* Make sure we have recognised SN length */
+ switch (p_pdcp_lte_info->seqnum_length) {
+ case PDCP_SN_LENGTH_5_BITS:
+ case PDCP_SN_LENGTH_7_BITS:
+ case PDCP_SN_LENGTH_12_BITS:
+ break;
+ default:
+ DISSECTOR_ASSERT_NOT_REACHED();
+ break;
+ }
+
+ switch (p->state) {
+ case SN_OK:
+ ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_sequence_analysis_ok,
+ tvb, 0, 0, TRUE);
+ PROTO_ITEM_SET_GENERATED(ti);
+ proto_item_append_text(seqnum_ti, " - OK");
+ break;
+
+ case SN_Missing:
+ ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_sequence_analysis_ok,
+ tvb, 0, 0, FALSE);
+ PROTO_ITEM_SET_GENERATED(ti);
+ ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_sequence_analysis_skipped,
+ tvb, 0, 0, TRUE);
+ PROTO_ITEM_SET_GENERATED(ti);
+ if (p->lastSN != p->firstSN) {
+ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN,
+ "PDCP SNs (%u to %u) missing for %s on UE %u",
+ p->firstSN, p->lastSN,
+ val_to_str_const(p_pdcp_lte_info->direction, direction_vals, "Unknown"),
+ p_pdcp_lte_info->ueid);
+ proto_item_append_text(seqnum_ti, " - SNs missing (%u to %u)",
+ p->firstSN, p->lastSN);
+ }
+ else {
+ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN,
+ "PDCP SN (%u) missing for %s on UE %u",
+ p->firstSN,
+ val_to_str_const(p_pdcp_lte_info->direction, direction_vals, "Unknown"),
+ p_pdcp_lte_info->ueid);
+ proto_item_append_text(seqnum_ti, " - SN missing (%u)",
+ p->firstSN);
+ }
+ break;
+
+ case SN_Repeated:
+ ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_sequence_analysis_ok,
+ tvb, 0, 0, FALSE);
+ PROTO_ITEM_SET_GENERATED(ti);
+ ti = proto_tree_add_boolean(seqnum_tree, hf_pdcp_lte_sequence_analysis_repeated,
+ tvb, 0, 0, TRUE);
+ PROTO_ITEM_SET_GENERATED(ti);
+ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN,
+ "PDCP SN (%u) repeated for %s for UE %u",
+ p->firstSN,
+ val_to_str_const(p_pdcp_lte_info->direction, direction_vals, "Unknown"),
+ p_pdcp_lte_info->ueid);
+ proto_item_append_text(seqnum_ti, "- SN %u Repeated",
+ p->firstSN);
+ break;
+
+ default:
+ /* Incorrect sequence number */
+ expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN,
+ "Wrong Sequence Number for %s on UE %u - got %u, expected %u",
+ val_to_str_const(p_pdcp_lte_info->direction, direction_vals, "Unknown"),
+ p_pdcp_lte_info->ueid, sequenceNumber, p->sequenceExpected);
+ break;
+ }
+}
+
+
+/* Update the channel status and set report for this frame */
+static void checkChannelSequenceInfo(packet_info *pinfo, tvbuff_t *tvb,
+ pdcp_lte_info *p_pdcp_lte_info,
+ guint16 sequenceNumber,
+ proto_tree *tree)
+{
+ pdcp_channel_hash_key channel_key;
+ pdcp_channel_hash_key *p_channel_key;
+ pdcp_channel_status *p_channel_status;
+ pdcp_sequence_report_in_frame *p_report_in_frame = NULL;
+ gboolean createdChannel = FALSE;
+ guint16 expectedSequenceNumber = 0;
+ guint16 snLimit = 0;
+
+ /* If find stat_report_in_frame already, use that and get out */
+ if (pinfo->fd->flags.visited) {
+ p_report_in_frame = (pdcp_sequence_report_in_frame*)g_hash_table_lookup(pdcp_lte_frame_sequence_analysis_report_hash,
+ &pinfo->fd->num);
+ if (p_report_in_frame != NULL) {
+ addChannelSequenceInfo(p_report_in_frame, p_pdcp_lte_info,
+ sequenceNumber,
+ pinfo, tree, tvb);
+ return;
+ }
+ else {
+ /* Give up - we must have tried already... */
+ return;
+ }
+ }
+
+
+ /**************************************************/
+ /* Create or find an entry for this channel state */
+ memset(&channel_key, 0, sizeof(channel_key));
+ channel_key.ueId = p_pdcp_lte_info->ueid;
+ channel_key.channelType = p_pdcp_lte_info->channelType;
+ channel_key.channelId = p_pdcp_lte_info->channelId;
+ channel_key.direction = p_pdcp_lte_info->direction;
+
+ /* Do the table lookup */
+ p_channel_status = (pdcp_channel_status*)g_hash_table_lookup(pdcp_sequence_analysis_channel_hash, &channel_key);
+
+ /* Create table entry if necessary */
+ if (p_channel_status == NULL) {
+ createdChannel = TRUE;
+
+ /* Allocate a new value and duplicate key contents */
+ p_channel_status = se_alloc0(sizeof(pdcp_channel_status));
+ p_channel_key = se_memdup(&channel_key, sizeof(pdcp_channel_hash_key));
+
+ /* Add entry */
+ g_hash_table_insert(pdcp_sequence_analysis_channel_hash, p_channel_key, p_channel_status);
+ }
+
+ /* Create space for frame state_report */
+ p_report_in_frame = se_alloc(sizeof(pdcp_sequence_report_in_frame));
+
+ switch (p_pdcp_lte_info->seqnum_length) {
+ case PDCP_SN_LENGTH_5_BITS:
+ snLimit = 32;
+ break;
+ case PDCP_SN_LENGTH_7_BITS:
+ snLimit = 128;
+ break;
+ case PDCP_SN_LENGTH_12_BITS:
+ snLimit = 4096;
+ break;
+ default:
+ DISSECTOR_ASSERT_NOT_REACHED();
+ break;
+ }
+
+ /* Work out expected sequence number */
+ if (!createdChannel) {
+ expectedSequenceNumber = (p_channel_status->previousSequenceNumber + 1) % snLimit;
+ }
+
+ /* Set report for this frame */
+ /* For PDCP, sequence number is always expectedSequence number */
+ p_report_in_frame->sequenceExpectedCorrect = (sequenceNumber == expectedSequenceNumber);
+
+ /* For wrong sequence number... */
+ if (!p_report_in_frame->sequenceExpectedCorrect) {
+
+ /* Frames are not missing if we get an earlier sequence number again */
+ if (((snLimit + expectedSequenceNumber - sequenceNumber) % snLimit) > 15) {
+ p_report_in_frame->state = SN_Missing;
+ p_report_in_frame->firstSN = expectedSequenceNumber;
+ p_report_in_frame->lastSN = (snLimit + sequenceNumber - 1) % snLimit;
+
+ p_report_in_frame->sequenceExpected = expectedSequenceNumber;
+ p_report_in_frame->previousFrameNum = p_channel_status->previousFrameNum;
+
+ /* Update channel status to remember *this* frame */
+ p_channel_status->previousFrameNum = pinfo->fd->num;
+ p_channel_status->previousSequenceNumber = sequenceNumber;
+ }
+ else {
+ /* An SN has been repeated */
+ p_report_in_frame->state = SN_Repeated;
+ p_report_in_frame->firstSN = sequenceNumber;
+
+ p_report_in_frame->sequenceExpected = expectedSequenceNumber;
+ p_report_in_frame->previousFrameNum = p_channel_status->previousFrameNum;
+ }
+ }
+ else {
+ /* SN was OK */
+ p_report_in_frame->state = SN_OK;
+ p_report_in_frame->sequenceExpected = expectedSequenceNumber;
+ p_report_in_frame->previousFrameNum = p_channel_status->previousFrameNum;
+
+ /* Update channel status to remember *this* frame */
+ p_channel_status->previousFrameNum = pinfo->fd->num;
+ p_channel_status->previousSequenceNumber = sequenceNumber;
+ }
+
+ /* Associate with this frame number */
+ g_hash_table_insert(pdcp_lte_frame_sequence_analysis_report_hash, &pinfo->fd->num, p_report_in_frame);
+
+ /* Add state report for this frame into tree */
+ addChannelSequenceInfo(p_report_in_frame, p_pdcp_lte_info, sequenceNumber,
+ pinfo, tree, tvb);
+}
+
+
+/* Write the given formatted text to:
+ - the info column
+ - the top-level RLC PDU item */
+static void write_pdu_label_and_info(proto_item *pdu_ti,
+ packet_info *pinfo, const char *format, ...)
+{
+ #define MAX_INFO_BUFFER 256
+ static char info_buffer[MAX_INFO_BUFFER];
+
+ va_list ap;
+
+ va_start(ap, format);
+ g_vsnprintf(info_buffer, MAX_INFO_BUFFER, format, ap);
+ va_end(ap);
+
+ /* Add to indicated places */
+ col_append_str(pinfo->cinfo, COL_INFO, info_buffer);
+ proto_item_append_text(pdu_ti, "%s", info_buffer);
+}
+
+
+
+/***************************************************************/
+
+
/* Dissect a Large-CID field.
Return following offset */
static int dissect_large_cid(proto_tree *tree,
}
}
-
+#if 0
static int dissect_pdcp_dynamic_chain(proto_tree *tree,
proto_item *root_item _U_,
tvbuff_t *tvb,
proto_tree *dynamic_ipv4_tree;
proto_item *root_ti;
int tree_start_offset = offset;
- guint8 tos, ttl, id, rnd, nbo;
+ guint8 tos, ttl, rnd, nbo;
+ guint16 id;
/* Create dynamic IPv4 subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_ipv4, tvb, offset, -1, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_ipv4, tvb, offset, -1, ENC_NA);
dynamic_ipv4_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_ipv4);
/* ToS */
tos = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_tos, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_tos, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* TTL */
ttl = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_ttl, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_ttl, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* IP-ID */
- id = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 1, FALSE);
- offset++;
+ id = tvb_get_ntohs(tvb, offset);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+ offset += 2;
/* IP flags */
rnd = (tvb_get_guint8(tvb, offset) & 0x40) >> 6;
nbo = (tvb_get_guint8(tvb, offset) & 0x20) >> 5;
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_df, tvb, offset, 1, FALSE);
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_rnd, tvb, offset, 1, FALSE);
- proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_nbo, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_df, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_rnd, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(dynamic_ipv4_tree, hf_pdcp_lte_rohc_dynamic_ipv4_nbo, tvb, offset, 1, ENC_BIG_ENDIAN);
/* TODO: general extension header list... */
- offset += 3;
+ offset++;
/* Set proper length for subtree */
proto_item_set_len(root_ti, offset-tree_start_offset);
unsigned short checksum;
/* Create dynamic UDP subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_udp, tvb, offset, 2, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_udp, tvb, offset, 2, ENC_NA);
dynamic_udp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_udp);
/* 16-bit checksum */
checksum = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_checksum, tvb, offset, 2, FALSE);
+ proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset +=2;
if (p_pdcp_info->profile == 2) {
guint16 seqnum;
seqnum = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_seqnum, tvb, offset, 2, FALSE);
+ proto_tree_add_item(dynamic_udp_tree, hf_pdcp_lte_rohc_dynamic_udp_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset +=2;
/* Add summary to root item */
proto_item *root_ti;
int tree_start_offset = offset;
guint8 rx;
- guint8 contributing_csrcs;
+ /*guint8 contributing_csrcs;*/
guint16 sequence_number;
guint32 timestamp;
guint8 tis=0, tss=0;
guint64 ts_stride=0;
/* Create dynamic RTP subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_rtp, tvb, offset, -1, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_dynamic_rtp, tvb, offset, -1, ENC_NA);
dynamic_rtp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_dynamic_rtp);
/* TODO: */
/* V | P | RX | CC */
rx = tvb_get_guint8(tvb, offset) & 0x10;
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_rx, tvb, offset, 1, FALSE);
- contributing_csrcs = tvb_get_guint8(tvb, offset) & 0x0f;
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_cc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_rx, tvb, offset, 1, ENC_BIG_ENDIAN);
+ /*contributing_csrcs = tvb_get_guint8(tvb, offset) & 0x0f;*/
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_cc, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* TODO: */
/* Sequence number */
sequence_number = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_seqnum, tvb, offset, 2, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_seqnum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Timestamp (4 octets) */
timestamp = tvb_get_ntohl(tvb, offset);
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_timestamp, tvb, offset, 4, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* TODO: CSRC list */
if (rx) {
guint8 this_byte = tvb_get_guint8(tvb, offset);
proto_item *reserved_ti = proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_reserved3,
- tvb, offset, 1, FALSE);
+ tvb, offset, 1, ENC_BIG_ENDIAN);
/* Check reserved bits are 0 */
if ((this_byte & 0xe0) != 0) {
"Reserved bits have value 0x%x - should be 0x0",
(this_byte & 0xe0));
}
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_x, tvb, offset, 1, FALSE);
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_mode, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_x, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_mode, tvb, offset, 1, ENC_BIG_ENDIAN);
tss = (this_byte & 0x02);
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tss, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tss, tvb, offset, 1, ENC_BIG_ENDIAN);
tis = (this_byte & 0x01);
- proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tis, tvb, offset, 1, FALSE);
+ proto_tree_add_item(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_tis, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
}
if (tis) {
/* Assume encoded in two bytes for now... */
proto_tree_add_bits_ret_val(dynamic_rtp_tree, hf_pdcp_lte_rohc_dynamic_rtp_ts_stride,
- tvb, offset*8 + 2, 14, &ts_stride, FALSE);
+ tvb, offset*8 + 2, 14, &ts_stride, ENC_BIG_ENDIAN);
offset += 2;
}
return offset;
}
+#endif
-
-static int dissect_pdcp_irdyn_packet(proto_tree *tree _U_,
+static int dissect_pdcp_irdyn_packet(proto_tree *tree,
proto_item *root_item,
- tvbuff_t *tvb _U_,
+ tvbuff_t *tvb,
int offset,
- struct pdcp_lte_info *p_pdcp_info _U_,
+ struct pdcp_lte_info *p_pdcp_info,
packet_info *pinfo)
{
+ rohc_info *p_rohc_info;
+
col_append_str(pinfo->cinfo, COL_INFO, " IRDYN");
proto_item_append_text(root_item, " (IRDYN)");
}
/* Profile */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* 8-bit CRC */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
+#if 0
/* Dissect dynamic chain */
offset = dissect_pdcp_dynamic_chain(tree,
root_item,
offset,
p_pdcp_info,
pinfo);
+#endif
+ /* RoHC settings */
+ p_rohc_info = ep_new(rohc_info);
+
+ p_rohc_info->rohc_compression = p_pdcp_info->rohc_compression;
+ p_rohc_info->rohc_ip_version = p_pdcp_info->rohc_ip_version;
+ p_rohc_info->cid_inclusion_info = p_pdcp_info->cid_inclusion_info;
+ p_rohc_info->large_cid_present = p_pdcp_info->large_cid_present;
+ p_rohc_info->mode = p_pdcp_info->mode;
+ p_rohc_info->rnd = p_pdcp_info->rnd;
+ p_rohc_info->udp_checkum_present = p_pdcp_info->udp_checkum_present;
+ p_rohc_info->profile = p_pdcp_info->profile;
+ p_rohc_info->last_created_item = root_item;
+
+ offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
return offset;
}
packet_info *pinfo)
{
unsigned char dynamic_chain_present;
+ rohc_info *p_rohc_info;
col_append_str(pinfo->cinfo, COL_INFO, " IR");
proto_item_append_text(root_item, " (IR)");
/* Is dynamic chain present? */
dynamic_chain_present = tvb_get_guint8(tvb, offset) & 0x1;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_d, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_d, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Large CID */
}
/* Profile */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_profile, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* 8-bit CRC */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_ir_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* IPv4 static part */
guint32 source, dest;
/* Create static IPv4 subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_ipv4, tvb, offset, -1, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_ipv4, tvb, offset, -1, ENC_NA);
static_ipv4_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_ipv4);
/* IP version (must be 4) */
- proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_version, tvb, offset, 1, FALSE);
+ proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_version, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Protocol */
protocol = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_protocol, tvb, offset, 1, FALSE);
+ proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_protocol, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Source address */
source = tvb_get_ipv4(tvb, offset);
- proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_src, tvb, offset, 4, FALSE);
+ proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_src, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* Dest address */
dest = tvb_get_ipv4(tvb, offset);
- proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_dst, tvb, offset, 4, FALSE);
+ proto_tree_add_item(static_ipv4_tree, hf_pdcp_lte_rohc_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* Set proper length for subtree */
/* Add summary to root item */
proto_item_append_text(root_ti, " (prot=%s: %s -> %s)",
- val_to_str(protocol, ip_protocol_vals, "Unknown"),
+ val_to_str_const(protocol, ip_protocol_vals, "Unknown"),
(char*)get_hostname(source),
(char*)get_hostname(dest));
}
unsigned short source_port, dest_port;
/* Create static UDP subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_udp, tvb, offset, -1, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_udp, tvb, offset, -1, ENC_NA);
static_udp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_udp);
/* Source port */
source_port = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, FALSE);
+ proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Dest port */
dest_port = tvb_get_ntohs(tvb, offset);
- proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, FALSE);
+ proto_tree_add_item(static_udp_tree, hf_pdcp_lte_rohc_static_udp_src_port, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Set proper length for subtree */
guint32 ssrc;
/* Create static RTP subtree */
- root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_rtp, tvb, offset, 4, FALSE);
+ root_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_static_rtp, tvb, offset, 4, ENC_NA);
static_rtp_tree = proto_item_add_subtree(root_ti, ett_pdcp_rohc_static_rtp);
/* SSRC */
ssrc = tvb_get_ntohl(tvb, offset);
- proto_tree_add_item(static_rtp_tree, hf_pdcp_lte_rohc_static_rtp_ssrc, tvb, offset, 4, FALSE);
+ proto_tree_add_item(static_rtp_tree, hf_pdcp_lte_rohc_static_rtp_ssrc, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* Add summary to root item */
/* Dynamic chain */
if (dynamic_chain_present) {
+#if 0
offset = dissect_pdcp_dynamic_chain(tree,
root_item,
tvb,
offset,
p_pdcp_info,
pinfo);
+#endif
+ /* RoHC settings */
+ p_rohc_info = ep_new(rohc_info);
+
+ p_rohc_info->rohc_compression = p_pdcp_info->rohc_compression;
+ p_rohc_info->rohc_ip_version = p_pdcp_info->rohc_ip_version;
+ p_rohc_info->cid_inclusion_info = p_pdcp_info->cid_inclusion_info;
+ p_rohc_info->large_cid_present = p_pdcp_info->large_cid_present;
+ p_rohc_info->mode = p_pdcp_info->mode;
+ p_rohc_info->rnd = p_pdcp_info->rnd;
+ p_rohc_info->udp_checkum_present = p_pdcp_info->udp_checkum_present;
+ p_rohc_info->profile = p_pdcp_info->profile;
+ p_rohc_info->last_created_item = root_item;
+
+ offset = dissect_rohc_ir_rtp_profile_dynamic(tvb, tree, offset, p_rohc_info);
+
}
return offset;
/* TODO: profile-specific */
sn = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback1, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback1, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
col_append_fstr(pinfo->cinfo, COL_INFO, " (sn=%u)", sn);
tvbuff_t *tvb,
int offset,
int size,
- struct pdcp_lte_info *p_pdcp_info _U_,
- packet_info *pinfo _U_)
+ struct pdcp_lte_info *p_pdcp_info,
+ packet_info *pinfo)
{
proto_item *ti;
guint8 ack_type;
}
/* Feedback2 hidden filter */
- ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback2, tvb, offset, -1, FALSE);
+ ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_feedback2, tvb, offset, -1, ENC_NA);
PROTO_ITEM_SET_HIDDEN(ti);
/* Ack-type */
first_octet = tvb_get_guint8(tvb, offset);
ack_type = (first_octet & 0xc0) >> 6;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_ack_type, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_ack_type, tvb, offset, 1, ENC_BIG_ENDIAN);
/* TODO: expert info on NACK? */
/* Mode */
mode = (first_octet & 0x30) >> 4;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_mode, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_mode, tvb, offset, 1, ENC_BIG_ENDIAN);
/* Show ACK-TYPE(Mode) in info column */
- full_mode_name = val_to_str(mode, rohc_mode_vals, "Error");
+ full_mode_name = val_to_str_const(mode, rohc_mode_vals, "Error");
col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%c)",
- val_to_str(ack_type, feedback_ack_vals, "Unknown"),
+ val_to_str_const(ack_type, feedback_ack_vals, "Unknown"),
full_mode_name[0]);
/* 11 bits of SN */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_sn, tvb, offset, 2, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_sn, tvb, offset, 2, ENC_BIG_ENDIAN);
sn = tvb_get_ntohs(tvb, offset) & 0x7ff;
offset += 2;
/* Preference setting controls showing option and lengths */
if (global_pdcp_show_feedback_option_tag_length) {
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option, tvb, offset, 1, FALSE);
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_length, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_length, tvb, offset, 1, ENC_BIG_ENDIAN);
}
offset++;
size_remaining--;
case 1:
/* CRC */
one_byte_value = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_crc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
col_append_fstr(pinfo->cinfo, COL_INFO, " CRC=%u ", one_byte_value);
break;
case 2:
case 4:
/* SN */
one_byte_value = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_sn, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_sn, tvb, offset, 1, ENC_BIG_ENDIAN);
col_append_fstr(pinfo->cinfo, COL_INFO, " SN=%u ", one_byte_value);
break;
case 5:
/* Clock */
one_byte_value = tvb_get_guint8(tvb, offset);
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_clock, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback_option_clock, tvb, offset, 1, ENC_BIG_ENDIAN);
col_append_fstr(pinfo->cinfo, COL_INFO, " Clock=%u ", one_byte_value);
break;
case 6:
proto_item_append_text(root_item, " (Feedback)");
/* Create feedback tree root */
- feedback_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback, tvb, offset, -1, FALSE);
+ feedback_ti = proto_tree_add_item(tree, hf_pdcp_lte_rohc_feedback, tvb, offset, -1, ENC_NA);
feedback_tree = proto_item_add_subtree(feedback_ti, ett_pdcp_packet);
/* Code */
code = tvb_get_guint8(tvb, offset) & 0x07;
- ti = proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_code, tvb, offset, 1, FALSE);
+ ti = proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_code, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Optional length field */
size = code;
}
else {
- proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_size, tvb, offset, 1, FALSE);
+ proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_feedback_size, tvb, offset, 1, ENC_BIG_ENDIAN);
size = tvb_get_guint8(tvb, offset);
offset++;
}
}
else if ((size > 1) && ((tvb_get_guint8(tvb, offset) & 0xc0) == 0xc0)) {
/* Add-CID here! */
- proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, FALSE);
+ proto_tree_add_item(feedback_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
if (size == 2) {
proto_item *root_item,
tvbuff_t *tvb,
int offset,
- struct pdcp_lte_info *p_pdcp_info _U_,
+ struct pdcp_lte_info *p_pdcp_info,
packet_info *pinfo)
{
guint8 sn;
/* 6 bits of sn */
sn = tvb_get_guint8(tvb, offset) & 0x3f;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_sn, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_sn, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Large CID */
col_append_str(pinfo->cinfo, COL_INFO, " R-0-CRC");
proto_item_append_text(root_item, " (R-0-CRC)");
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_r_0_crc, tvb, offset, -1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_r_0_crc, tvb, offset, -1, ENC_NA);
/* 7 bits of sn */
/* TODO: wrong! Large-cid may be in-between!!!! */
proto_tree_add_uint(tree, hf_pdcp_lte_rohc_r0_crc_sn, tvb, offset, 1, sn);
/* 7 bit CRC */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_crc_crc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_r0_crc_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* Show SN in info column */
/* SN */
sn = (tvb_get_guint8(tvb, offset) & 0x78) >> 3;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_sn, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_sn, tvb, offset, 1, ENC_BIG_ENDIAN);
/* CRC (3 bits) */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_crc, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_uo0_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* T determines frame type */
T = tvb_get_guint8(tvb, ++offset) >> 7;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_type1_t, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_type1_t, tvb, offset, 1, ENC_BIG_ENDIAN);
if (T) {
col_append_str(pinfo->cinfo, COL_INFO, " R-1-TS");
proto_item_append_text(root_item, " (R-1-TS)");
/* T determines frame type */
T = tvb_get_guint8(tvb, ++offset) >> 5;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_type0_t, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_type0_t, tvb, offset, 1, ENC_BIG_ENDIAN);
if (T) {
col_append_str(pinfo->cinfo, COL_INFO, " UO-1-TS");
proto_item_append_text(root_item, " (UO-1-TS)");
if (p_pdcp_info->profile == 1) {
/* M */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, ENC_BIG_ENDIAN);
/* SN (6 bits) */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_sn, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_sn, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
/* X (one bit) */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_x, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_uor2_x, tvb, offset, 1, ENC_BIG_ENDIAN);
/* TODO: CRC */
offset++;
/* T determines frame type */
T = tvb_get_guint8(tvb, offset) >> 7;
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_type2_t, tvb, offset, 1, FALSE);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_type2_t, tvb, offset, 1, ENC_BIG_ENDIAN);
if (T) {
col_append_str(pinfo->cinfo, COL_INFO, " U0R-2-TS");
}
/* m */
- proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, ts);
+ proto_tree_add_item(tree, hf_pdcp_lte_rohc_m, tvb, offset, 1, ENC_BIG_ENDIAN);
/* TODO: */
}
proto_tree *configuration_tree;
proto_item *configuration_ti = proto_tree_add_item(tree,
hf_pdcp_lte_configuration,
- tvb, 0, 0, FALSE);
+ tvb, 0, 0, ENC_ASCII|ENC_NA);
configuration_tree = proto_item_add_subtree(configuration_ti, ett_pdcp_configuration);
/* Direction */
p_pdcp_info->plane);
PROTO_ITEM_SET_GENERATED(ti);
+ /* UEId */
+ if (p_pdcp_info->ueid != 0) {
+ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_ueid, tvb, 0, 0,
+ p_pdcp_info->ueid);
+ PROTO_ITEM_SET_GENERATED(ti);
+ }
+
+ /* Channel type */
+ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_channel_type, tvb, 0, 0,
+ p_pdcp_info->channelType);
+ PROTO_ITEM_SET_GENERATED(ti);
+ if (p_pdcp_info->channelId != 0) {
+ /* Channel type */
+ ti = proto_tree_add_uint(configuration_tree, hf_pdcp_lte_channel_id, tvb, 0, 0,
+ p_pdcp_info->channelId);
+ PROTO_ITEM_SET_GENERATED(ti);
+ }
+
+
/* User-plane-specific fields */
if (p_pdcp_info->plane == USER_PLANE) {
/* Append summary to configuration root */
proto_item_append_text(configuration_ti, "(direction=%s, plane=%s",
- val_to_str(p_pdcp_info->direction, direction_vals, "Unknown"),
- val_to_str(p_pdcp_info->plane, pdcp_plane_vals, "Unknown"));
+ val_to_str_const(p_pdcp_info->direction, direction_vals, "Unknown"),
+ val_to_str_const(p_pdcp_info->plane, pdcp_plane_vals, "Unknown"));
if (p_pdcp_info->rohc_compression) {
- const char *mode = val_to_str(p_pdcp_info->mode, rohc_mode_vals, "Error");
+ const char *mode = val_to_str_const(p_pdcp_info->mode, rohc_mode_vals, "Error");
proto_item_append_text(configuration_ti, ", mode=%c, profile=%s",
mode[0],
- val_to_str(p_pdcp_info->profile, rohc_profile_vals, "Unknown"));
+ val_to_str_const(p_pdcp_info->profile, rohc_profile_vals, "Unknown"));
}
proto_item_append_text(configuration_ti, ")");
PROTO_ITEM_SET_GENERATED(configuration_ti);
/* Show plane in info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " %s: ",
- val_to_str(p_pdcp_info->plane, pdcp_plane_vals, "Unknown"));
+ val_to_str_const(p_pdcp_info->plane, pdcp_plane_vals, "Unknown"));
}
{
case Channel_CCCH:
if (p_pdcp_info->direction == DIRECTION_UPLINK) {
- rrc_handle = find_dissector("lte-rrc.ul.ccch");
+ rrc_handle = find_dissector("lte_rrc.ul_ccch");
}
else {
- rrc_handle = find_dissector("lte-rrc.dl.ccch");
+ rrc_handle = find_dissector("lte_rrc.dl_ccch");
}
break;
case Channel_PCCH:
case Channel_BCCH:
switch (p_pdcp_info->BCCHTransport) {
case BCH_TRANSPORT:
- rrc_handle = find_dissector("lte-rrc.bcch.bch");
+ rrc_handle = find_dissector("lte_rrc.bcch_bch");
break;
case DLSCH_TRANSPORT:
- rrc_handle = find_dissector("lte-rrc.bcch.dl.sch");
+ rrc_handle = find_dissector("lte_rrc.bcch_dl_sch");
break;
}
break;
case Channel_DCCH:
if (p_pdcp_info->direction == DIRECTION_UPLINK) {
- rrc_handle = find_dissector("lte-rrc.ul.dcch");
+ rrc_handle = find_dissector("lte_rrc.ul_dcch");
}
else {
- rrc_handle = find_dissector("lte-rrc.dl.dcch");
+ rrc_handle = find_dissector("lte_rrc.dl_dcch");
}
break;
}
+/* Forwad declarations */
+static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+/* Heuristic dissection */
+static gboolean global_pdcp_lte_heur = FALSE;
+
+/* Heuristic dissector looks for supported framing protocol (see wiki page) */
+static gboolean dissect_pdcp_lte_heur(tvbuff_t *tvb, packet_info *pinfo,
+ proto_tree *tree)
+{
+ gint offset = 0;
+ struct pdcp_lte_info *p_pdcp_lte_info;
+ tvbuff_t *pdcp_tvb;
+ guint8 tag = 0;
+ gboolean infoAlreadySet = FALSE;
+ gboolean seqnumLengthTagPresent = FALSE;
+
+ /* This is a heuristic dissector, which means we get all the UDP
+ * traffic not sent to a known dissector and not claimed by
+ * a heuristic dissector called before us!
+ */
+
+ if (!global_pdcp_lte_heur) {
+ return FALSE;
+ }
+
+ /* Do this again on re-dissection to re-discover offset of actual PDU */
+
+ /* Needs to be at least as long as:
+ - the signature string
+ - fixed header bytes
+ - tag for data
+ - at least one byte of PDCP PDU payload */
+ if ((size_t)tvb_length_remaining(tvb, offset) < (strlen(PDCP_LTE_START_STRING)+3+2)) {
+ return FALSE;
+ }
+
+ /* OK, compare with signature string */
+ if (tvb_strneql(tvb, offset, PDCP_LTE_START_STRING, strlen(PDCP_LTE_START_STRING)) != 0) {
+ return FALSE;
+ }
+ offset += (gint)strlen(PDCP_LTE_START_STRING);
+
+
+ /* If redissecting, use previous info struct (if available) */
+ p_pdcp_lte_info = p_get_proto_data(pinfo->fd, proto_pdcp_lte);
+ if (p_pdcp_lte_info == NULL) {
+ /* Allocate new info struct for this frame */
+ p_pdcp_lte_info = se_alloc0(sizeof(struct pdcp_lte_info));
+ infoAlreadySet = FALSE;
+ }
+ else {
+ infoAlreadySet = TRUE;
+ }
+
+
+ /* Read fixed fields */
+ p_pdcp_lte_info->no_header_pdu = tvb_get_guint8(tvb, offset++);
+ p_pdcp_lte_info->plane = tvb_get_guint8(tvb, offset++);
+ p_pdcp_lte_info->rohc_compression = tvb_get_guint8(tvb, offset++);
+
+ /* Read optional fields */
+ while (tag != PDCP_LTE_PAYLOAD_TAG) {
+ /* Process next tag */
+ tag = tvb_get_guint8(tvb, offset++);
+ switch (tag) {
+ case PDCP_LTE_SEQNUM_LENGTH_TAG:
+ p_pdcp_lte_info->seqnum_length = tvb_get_guint8(tvb, offset);
+ offset++;
+ seqnumLengthTagPresent = TRUE;
+ break;
+ case PDCP_LTE_DIRECTION_TAG:
+ p_pdcp_lte_info->direction = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_LOG_CHAN_TYPE_TAG:
+ p_pdcp_lte_info->channelType = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_BCCH_TRANSPORT_TYPE_TAG:
+ p_pdcp_lte_info->BCCHTransport = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_IP_VERSION_TAG:
+ p_pdcp_lte_info->rohc_ip_version = tvb_get_ntohs(tvb, offset);
+ offset += 2;
+ break;
+ case PDCP_LTE_ROHC_CID_INC_INFO_TAG:
+ p_pdcp_lte_info->cid_inclusion_info = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_LARGE_CID_PRES_TAG:
+ p_pdcp_lte_info->large_cid_present = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_MODE_TAG:
+ p_pdcp_lte_info->mode = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_RND_TAG:
+ p_pdcp_lte_info->rnd = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_UDP_CHECKSUM_PRES_TAG:
+ p_pdcp_lte_info->udp_checkum_present = tvb_get_guint8(tvb, offset);
+ offset++;
+ break;
+ case PDCP_LTE_ROHC_PROFILE_TAG:
+ p_pdcp_lte_info->profile = tvb_get_ntohs(tvb, offset);
+ offset += 2;
+ break;
+
+ case PDCP_LTE_PAYLOAD_TAG:
+ /* Have reached data, so get out of loop */
+ continue;
+
+ default:
+ /* It must be a recognised tag */
+ return FALSE;
+ }
+ }
+
+ if ((p_pdcp_lte_info->plane == USER_PLANE) && (seqnumLengthTagPresent == FALSE)) {
+ /* Conditional field is not present */
+ return FALSE;
+ }
+
+ if (!infoAlreadySet) {
+ /* Store info in packet */
+ p_add_proto_data(pinfo->fd, proto_pdcp_lte, p_pdcp_lte_info);
+ }
+
+ /**************************************/
+ /* OK, now dissect as PDCP LTE */
+
+ /* Create tvb that starts at actual PDCP PDU */
+ pdcp_tvb = tvb_new_subset(tvb, offset, -1, tvb_reported_length(tvb)-offset);
+ dissect_pdcp_lte(pdcp_tvb, pinfo, tree);
+ return TRUE;
+}
+
+
/******************************/
/* Main dissection function. */
static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Create pdcp tree. */
if (tree) {
- root_ti = proto_tree_add_item(tree, proto_pdcp_lte, tvb, offset, -1, FALSE);
+ root_ti = proto_tree_add_item(tree, proto_pdcp_lte, tvb, offset, -1, ENC_NA);
pdcp_tree = proto_item_add_subtree(root_ti, ett_pdcp);
}
/* Set mode string */
- mode = val_to_str(p_pdcp_info->mode, rohc_mode_vals, "Error");
+ mode = val_to_str_const(p_pdcp_info->mode, rohc_mode_vals, "Error");
/* Show configuration (attached packet) info in tree */
if (pdcp_tree) {
/* Handle PDCP header (if present) */
if (!p_pdcp_info->no_header_pdu) {
+ /* TODO: shouldn't need to initialise this one!! */
+ guint16 seqnum = 0;
+ gboolean seqnum_set = FALSE;
+
/*****************************/
/* Signalling plane messages */
if (p_pdcp_info->plane == SIGNALING_PLANE) {
guint32 data_length;
/* 5-bit sequence number */
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_5, tvb, offset, 1, FALSE);
- col_append_fstr(pinfo->cinfo, COL_INFO, " sn=%u ",
- tvb_get_guint8(tvb, offset) & 0x1f);
+ seqnum = tvb_get_guint8(tvb, offset) & 0x1f;
+ seqnum_set = TRUE;
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_5, tvb, offset, 1, ENC_BIG_ENDIAN);
+ write_pdu_label_and_info(root_ti, pinfo, " sn=%-2u ", seqnum);
offset++;
-
/* RRC data is all but last 4 bytes.
Call lte-rrc dissector (according to direction and channel type) */
if (global_pdcp_dissect_signalling_plane_as_rrc) {
else {
/* Just show data */
proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset,
- tvb_length_remaining(tvb, offset) - 4, FALSE);
+ tvb_length_remaining(tvb, offset) - 4, ENC_NA);
}
}
else {
/* Just show as unparsed data */
proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset,
- tvb_length_remaining(tvb, offset) - 4, FALSE);
+ tvb_length_remaining(tvb, offset) - 4, ENC_NA);
}
data_length = tvb_length_remaining(tvb, offset) - 4;
/* Last 4 bytes are MAC */
mac = tvb_get_ntohl(tvb, offset);
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_mac, tvb, offset, 4, FALSE);
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_mac, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
col_append_fstr(pinfo->cinfo, COL_INFO, " MAC=0x%08x (%u bytes data)",
mac, data_length);
- return;
}
else if (p_pdcp_info->plane == USER_PLANE) {
/**********************************/
/* User-plane messages */
- guint16 seqnum;
gboolean pdu_type = (tvb_get_guint8(tvb, offset) & 0x80) >> 7;
/* Data/Control flag */
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_data_control, tvb, offset, 1, FALSE);
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_data_control, tvb, offset, 1, ENC_BIG_ENDIAN);
if (pdu_type == 1) {
/*****************************/
/* Number of sequence number bits depends upon config */
if (p_pdcp_info->seqnum_length == PDCP_SN_LENGTH_7_BITS) {
seqnum = tvb_get_guint8(tvb, offset) & 0x7f;
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_7, tvb, offset, 1, FALSE);
+ seqnum_set = TRUE;
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_7, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
}
else if (p_pdcp_info->seqnum_length == PDCP_SN_LENGTH_12_BITS) {
guint8 reserved_value;
/* 3 reserved bits */
- ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_reserved3, tvb, offset, 1, FALSE);
+ ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_reserved3, tvb, offset, 1, ENC_BIG_ENDIAN);
reserved_value = (tvb_get_guint8(tvb, offset) & 0x70) >> 4;
/* Complain if not 0 */
/* 12-bit sequence number */
seqnum = tvb_get_ntohs(tvb, offset) & 0x0fff;
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_12, tvb, offset, 2, FALSE);
+ seqnum_set = TRUE;
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_seq_num_12, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
}
else {
return;
}
- col_append_fstr(pinfo->cinfo, COL_INFO, " sn=%u ", seqnum);
+ write_pdu_label_and_info(root_ti, pinfo, " (SN=%u)", seqnum);
}
else {
/*******************************/
/* User-plane Control messages */
guint8 control_pdu_type = (tvb_get_guint8(tvb, offset) & 0x70) >> 4;
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_control_pdu_type, tvb, offset, 1, FALSE);
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_control_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN);
switch (control_pdu_type) {
case 0: /* PDCP status report */
/* First-Missing-Sequence SN */
fms = tvb_get_ntohs(tvb, offset) & 0x0fff;
- sn = fms;
+ sn = (fms + 1) % 4096;
proto_tree_add_item(pdcp_tree, hf_pdcp_lte_fms, tvb,
- offset, 2, FALSE);
+ offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Bitmap tree */
if (tvb_length_remaining(tvb, offset) > 0) {
bitmap_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_bitmap, tvb,
- offset, -1, FALSE);
+ offset, -1, ENC_NA);
bitmap_tree = proto_item_add_subtree(bitmap_ti, ett_pdcp_rohc_report_bitmap);
-
-
+
+
/* For each byte... */
for ( ; tvb_length_remaining(tvb, offset); offset++) {
guint bit_offset = 0;
if (bitmap_ti != NULL) {
proto_item_append_text(bitmap_ti, " (not-received=%u)", not_received);
}
- col_append_fstr(pinfo->cinfo, COL_INFO,
- " Status Report (fms=%u) not-received=%u",
- fms, not_received);
+ write_pdu_label_and_info(root_ti, pinfo, " Status Report (fms=%u) not-received=%u",
+ fms, not_received);
}
return;
}
else {
/* Invalid plane setting...! */
- col_append_fstr(pinfo->cinfo, COL_INFO, " - INVALID PLANE (%u)",
- p_pdcp_info->plane);
+ write_pdu_label_and_info(root_ti, pinfo, " - INVALID PLANE (%u)",
+ p_pdcp_info->plane);
return;
}
+
+ /* For now, only do sequence analysis if RLC wasn't present in the frame */
+ /* This can be fixed once RLC does re-assembly... */
+ if (global_pdcp_check_sequence_numbers && seqnum_set &&
+ (p_get_proto_data(pinfo->fd, proto_rlc_lte) == NULL)) {
+
+ checkChannelSequenceInfo(pinfo, tvb, p_pdcp_info,
+ (guint16)seqnum, pdcp_tree);
+ }
+
}
else {
/* Show that its a no-header PDU */
- col_append_str(pinfo->cinfo, COL_INFO, " No-Header ");
+ write_pdu_label_and_info(root_ti, pinfo, " No-Header ");
}
/* If not compressed with ROHC, show as user-plane data */
if (!p_pdcp_info->rohc_compression) {
-
- if (global_pdcp_dissect_user_plane_as_ip && (ip_handle != 0)) {
- tvbuff_t *payload_tvb = tvb_new_subset_remaining(tvb, offset);
- call_dissector_only(ip_handle, payload_tvb, pinfo, pdcp_tree);
- }
- else {
- if (tvb_length_remaining(tvb, offset) > 0) {
- if (p_pdcp_info->plane == USER_PLANE) {
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, FALSE);
+ if (tvb_length_remaining(tvb, offset) > 0) {
+ if (p_pdcp_info->plane == USER_PLANE) {
+ if (global_pdcp_dissect_user_plane_as_ip) {
+ tvbuff_t *payload_tvb = tvb_new_subset_remaining(tvb, offset);
+ switch (tvb_get_guint8(tvb, offset) & 0xf0) {
+ case 0x40:
+ call_dissector_only(ip_handle, payload_tvb, pinfo, pdcp_tree);
+ break;
+ case 0x60:
+ call_dissector_only(ipv6_handle, payload_tvb, pinfo, pdcp_tree);
+ break;
+ default:
+ call_dissector_only(data_handle, payload_tvb, pinfo, pdcp_tree);
+ break;
+ }
}
else {
- if (global_pdcp_dissect_signalling_plane_as_rrc) {
- /* Get appropriate dissector handle */
- dissector_handle_t rrc_handle = lookup_rrc_dissector_handle(p_pdcp_info);
-
- if (rrc_handle != 0) {
- /* Call RRC dissector if have one */
- tvbuff_t *payload_tvb = tvb_new_subset(tvb, offset,
- tvb_length_remaining(tvb, offset),
- tvb_length_remaining(tvb, offset));
- call_dissector_only(rrc_handle, payload_tvb, pinfo, pdcp_tree);
- }
- else {
- /* Just show data */
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset,
- tvb_length_remaining(tvb, offset), FALSE);
- }
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, ENC_NA);
+ }
+ }
+ else {
+ if (global_pdcp_dissect_signalling_plane_as_rrc) {
+ /* Get appropriate dissector handle */
+ dissector_handle_t rrc_handle = lookup_rrc_dissector_handle(p_pdcp_info);
+
+ if (rrc_handle != 0) {
+ /* Call RRC dissector if have one */
+ tvbuff_t *payload_tvb = tvb_new_subset(tvb, offset,
+ tvb_length_remaining(tvb, offset),
+ tvb_length_remaining(tvb, offset));
+ call_dissector_only(rrc_handle, payload_tvb, pinfo, pdcp_tree);
}
else {
- proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, -1, FALSE);
+ /* Just show data */
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset,
+ tvb_length_remaining(tvb, offset), ENC_NA);
}
}
-
- col_append_fstr(pinfo->cinfo, COL_INFO, "(%u bytes data)",
- tvb_length_remaining(tvb, offset));
+ else {
+ proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, -1, ENC_NA);
+ }
}
+
+ write_pdu_label_and_info(root_ti, pinfo, "(%u bytes data)",
+ tvb_length_remaining(tvb, offset));
}
return;
}
/***************************/
col_append_fstr(pinfo->cinfo, COL_PROTOCOL, "|ROHC(%s)",
- val_to_str(p_pdcp_info->profile, rohc_profile_vals, "Unkown"));
+ val_to_str_const(p_pdcp_info->profile, rohc_profile_vals, "Unknown"));
/* Only attempt ROHC if configured to */
if (!global_pdcp_dissect_rohc) {
/* Create pdcp tree. */
if (pdcp_tree) {
- rohc_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_rohc, tvb, offset, -1, FALSE);
+ rohc_ti = proto_tree_add_item(pdcp_tree, hf_pdcp_lte_rohc, tvb, offset, -1, ENC_NA);
rohc_tree = proto_item_add_subtree(rohc_ti, ett_pdcp_rohc);
}
}
if (offset > rohc_offset) {
proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_padding, tvb, rohc_offset,
- offset-rohc_offset, FALSE);
+ offset-rohc_offset, ENC_NA);
}
/* Add-CID octet */
!p_pdcp_info->large_cid_present)
{
if (((tvb_get_guint8(tvb, offset) >> 4) & 0x0f) == 0x0e) {
- proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, FALSE);
+ proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_add_cid, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
}
else {
/* UO-1 if !(ipv4 && rand) */
if (!((p_pdcp_info->rohc_ip_version == 4) &&
(!p_pdcp_info->rnd))) {
- offset = dissect_pdcp_uo_1_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);
- return;
- }
- else {
+
+ dissect_pdcp_uo_1_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);
+ } else {
/* Whether its UO-1-ID or UO-1-TS depends upon T bit */
dissect_pdcp_uo_1_ts_or_id_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);
- return;
- }
+ }
- return;
+ return;
}
}
if (!((p_pdcp_info->rohc_ip_version == 4) &&
(!p_pdcp_info->rnd))) {
- offset = dissect_pdcp_uor_2_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);
+ dissect_pdcp_uor_2_packet(rohc_tree, rohc_ti, tvb, offset, p_pdcp_info, pinfo);
}
else {
/* Whether its UOR-2-ID or UOR-2-TS depends upon T bit */
/* IP-ID */
if (p_pdcp_info->rnd && ip_id_needed) {
- proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_ip_id, tvb, offset, 2, FALSE);
+ proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_ip_id, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
}
/* UDP Checksum */
if (p_pdcp_info->udp_checkum_present && udp_checksum_needed) {
- proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_udp_checksum, tvb, offset, 2, FALSE);
+ proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_udp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
}
/* Payload */
if (tvb_reported_length_remaining(tvb, offset) > 0) {
- proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_payload, tvb, offset, -1, FALSE);
+ proto_tree_add_item(rohc_tree, hf_pdcp_lte_rohc_payload, tvb, offset, -1, ENC_NA);
}
}
+
+/* Initializes the hash table and the mem_chunk area each time a new
+ * file is loaded or re-loaded in wireshark */
+static void
+pdcp_lte_init_protocol(void)
+{
+ /* Destroy any existing hashes. */
+ if (pdcp_sequence_analysis_channel_hash) {
+ g_hash_table_destroy(pdcp_sequence_analysis_channel_hash);
+ }
+ if (pdcp_lte_frame_sequence_analysis_report_hash) {
+ g_hash_table_destroy(pdcp_lte_frame_sequence_analysis_report_hash);
+ }
+
+
+ /* Now create them over */
+ pdcp_sequence_analysis_channel_hash = g_hash_table_new(pdcp_channel_hash_func, pdcp_channel_equal);
+ pdcp_lte_frame_sequence_analysis_report_hash = g_hash_table_new(pdcp_frame_hash_func, pdcp_frame_equal);
+}
+
+
+
void proto_register_pdcp(void)
{
static hf_register_info hf[] =
{ &hf_pdcp_lte_configuration,
{ "Configuration",
"pdcp-lte.configuration", FT_STRING, BASE_NONE, NULL, 0x0,
- "Configuation info passed into dissector", HFILL
+ "Configuration info passed into dissector", HFILL
}
},
{ &hf_pdcp_lte_rohc_compression,
{ "ROHC Compression",
- "pdcp-lte.rohc", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "ROHC Mode", HFILL
+ "pdcp-lte.rohc.compression", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_rohc_mode,
- { "ROHC mode",
+ { "ROHC Mode",
"pdcp-lte.rohc.mode", FT_UINT8, BASE_DEC, VALS(rohc_mode_vals), 0x0,
- "ROHC Mode", HFILL
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_rohc_rnd,
{ &hf_pdcp_lte_rohc_udp_checksum_present,
{ "UDP Checksum", /* TODO: true/false vals? */
"pdcp-lte.rohc.checksum-present", FT_UINT8, BASE_DEC, NULL, 0x0,
- "UDP Checksum_present", HFILL
+ "UDP Checksum present", HFILL
}
},
-
-
{ &hf_pdcp_lte_direction,
{ "Direction",
"pdcp-lte.direction", FT_UINT8, BASE_DEC, VALS(direction_vals), 0x0,
"Direction of message", HFILL
}
},
+ { &hf_pdcp_lte_ueid,
+ { "UE",
+ "pdcp-lte.ueid", FT_UINT16, BASE_DEC, 0, 0x0,
+ "UE Identifier", HFILL
+ }
+ },
+ { &hf_pdcp_lte_channel_type,
+ { "Channel type",
+ "pdcp-lte.channel-type", FT_UINT8, BASE_DEC, VALS(logical_channel_vals), 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_channel_id,
+ { "Channel Id",
+ "pdcp-lte.channel-id", FT_UINT8, BASE_DEC, 0, 0x0,
+ NULL, HFILL
+ }
+ },
{ &hf_pdcp_lte_rohc_profile,
{ "ROHC profile",
"pdcp-lte.rohc.profile", FT_UINT8, BASE_DEC, VALS(rohc_profile_vals), 0x0,
{ &hf_pdcp_lte_plane,
{ "Plane",
"pdcp-lte.plane", FT_UINT8, BASE_DEC, VALS(pdcp_plane_vals), 0x0,
- "No Header PDU", HFILL
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_seqnum_length,
{ &hf_pdcp_lte_data_control,
{ "PDU Type",
"pdcp-lte.pdu-type", FT_UINT8, BASE_HEX, VALS(pdu_type_vals), 0x80,
- "PDU type", HFILL
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_user_plane_data,
{ &hf_pdcp_lte_control_pdu_type,
{ "Control PDU Type",
"pdcp-lte.control-pdu-type", FT_UINT8, BASE_HEX, VALS(control_pdu_type_vals), 0x70,
- "Control PDU type", HFILL
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_fms,
}
},
+
+ { &hf_pdcp_lte_sequence_analysis,
+ { "Sequence Analysis",
+ "pdcp-lte.sequence-analysis", FT_STRING, BASE_NONE, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_sequence_analysis_ok,
+ { "OK",
+ "pdcp-lte.sequence-analysis.ok", FT_BOOLEAN, BASE_NONE, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_sequence_analysis_previous_frame,
+ { "Previous frame for channel",
+ "pdcp-lte.sequence-analysis.previous-frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_sequence_analysis_expected_sn,
+ { "Expected SN",
+ "pdcp-lte.sequence-analysis.expected-sn", FT_UINT16, BASE_DEC, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_sequence_analysis_skipped,
+ { "Skipped frames",
+ "pdcp-lte.sequence-analysis.skipped-frames", FT_BOOLEAN, BASE_NONE, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+ { &hf_pdcp_lte_sequence_analysis_repeated,
+ { "Repeated frame",
+ "pdcp-lte.sequence-analysis.repeated-frame", FT_BOOLEAN, BASE_NONE, 0, 0x0,
+ NULL, HFILL
+ }
+ },
+
{ &hf_pdcp_lte_rohc,
{ "ROHC Message",
"pdcp-lte.rohc", FT_NONE, BASE_NONE, NULL, 0,
"Feedback Packet", HFILL
}
},
-
{ &hf_pdcp_lte_rohc_type0_t,
{ "T",
"pdcp-lte.rohc.t0.t", FT_UINT8, BASE_HEX, VALS(t_vals), 0x20,
"Indicates whether frame type is TS (1) or ID (0)", HFILL
}
},
-
{ &hf_pdcp_lte_rohc_d,
{ "D",
- "pdcp-lte.rohc.t2.t", FT_UINT8, BASE_HEX, NULL, 0x01,
+ "pdcp-lte.rohc.d", FT_UINT8, BASE_HEX, NULL, 0x01,
"Indicates whether Dynamic chain is present", HFILL
}
},
NULL, HFILL
}
},
-
-
{ &hf_pdcp_lte_rohc_static_rtp,
{ "Static RTP chain",
"pdcp-lte.rohc.static.rtp", FT_NONE, BASE_NONE, NULL, 0x0,
},
{ &hf_pdcp_lte_rohc_dynamic_ipv4_id,
{ "IP-ID",
- "pdcp-lte.rohc.ip.id", FT_UINT8, BASE_HEX, NULL, 0x0,
+ "pdcp-lte.rohc.ip.id", FT_UINT16, BASE_HEX, NULL, 0x0,
"IP ID", HFILL
}
},
NULL, HFILL
}
},
-
{ &hf_pdcp_lte_rohc_dynamic_udp,
{ "Dynamic UDP chain",
"pdcp-lte.rohc.dynamic.udp", FT_NONE, BASE_NONE, NULL, 0x0,
"Dynamic RTP chain Timestamp", HFILL
}
},
-
{ &hf_pdcp_lte_rohc_dynamic_rtp_reserved3,
{ "Reserved",
"pdcp-lte.rohc.dynamic.rtp.reserved3", FT_UINT8, BASE_HEX, NULL, 0xc0,
"CRC 7", HFILL
}
},
-
{ &hf_pdcp_lte_rohc_feedback_code,
{ "Code",
"pdcp-lte.rohc.feedback-code", FT_UINT8, BASE_DEC, NULL, 0x07,
{ &hf_pdcp_lte_rohc_feedback_feedback2,
{ "FEEDBACK-2",
"pdcp-lte.rohc.feedback.feedback2", FT_NONE, BASE_NONE, NULL, 0x0,
- "Feedback-2", HFILL
+ NULL, HFILL
}
},
{ &hf_pdcp_lte_rohc_feedback_sn,
{ "SN",
"pdcp-lte.rohc.feedback-sn", FT_UINT16, BASE_DEC, NULL, 0x0fff,
- "Feedback mode", HFILL
+ "Feedback sequence number", HFILL
}
},
{ &hf_pdcp_lte_rohc_feedback_option,
{ "Option",
"pdcp-lte.rohc.feedback-option", FT_UINT8, BASE_DEC, VALS(feedback_option_vals), 0xf0,
- "Feedback mode", HFILL
+ "Feedback option", HFILL
}
},
{ &hf_pdcp_lte_rohc_feedback_length,
&ett_pdcp,
&ett_pdcp_configuration,
&ett_pdcp_packet,
+ &ett_pdcp_lte_sequence_analysis,
&ett_pdcp_rohc,
&ett_pdcp_rohc_static_ipv4,
&ett_pdcp_rohc_static_udp,
"Show unciphered Signalling-Plane data as RRC",
&global_pdcp_dissect_signalling_plane_as_rrc);
+ /* Check for missing sequence numbers */
+ prefs_register_bool_preference(pdcp_lte_module, "check_sequence_numbers",
+ "Do sequence number analysis",
+ "Do sequence number analysis",
+ &global_pdcp_check_sequence_numbers);
+
/* Attempt to dissect ROHC headers */
prefs_register_bool_preference(pdcp_lte_module, "dissect_rohc",
"Attempt to decode ROHC data",
"Show ROHC feedback option tag & length",
"Show ROHC feedback option tag & length",
&global_pdcp_show_feedback_option_tag_length);
+
+ prefs_register_bool_preference(pdcp_lte_module, "heuristic_pdcp_lte_over_udp",
+ "Try Heuristic LTE-PDCP over UDP framing",
+ "When enabled, use heuristic dissector to find PDCP-LTE frames sent with "
+ "UDP framing",
+ &global_pdcp_lte_heur);
+
+ register_init_routine(&pdcp_lte_init_protocol);
}
void proto_reg_handoff_pdcp_lte(void)
{
+ /* Add as a heuristic UDP dissector */
+ heur_dissector_add("udp", dissect_pdcp_lte_heur, proto_pdcp_lte);
+
ip_handle = find_dissector("ip");
+ ipv6_handle = find_dissector("ipv6");
+ data_handle = find_dissector("data");
}
git.samba.org / obnox / wireshark / wip.git / blobdiff