2010-11-22 16:19:39 +00:00
|
|
|
/* packet-reload-framing.c
|
|
|
|
* Routines for REsource LOcation And Discovery (RELOAD) Framing
|
|
|
|
* Author: Stephane Bryant <sbryant@glycon.org>
|
|
|
|
* Copyright 2010 Stonyfish Inc.
|
|
|
|
*
|
|
|
|
* $Id$
|
|
|
|
*
|
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
2012-06-28 23:18:38 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2010-11-22 16:19:39 +00:00
|
|
|
*
|
|
|
|
* Please refer to the following specs for protocol detail:
|
2011-05-29 06:16:19 +00:00
|
|
|
* - draft-ietf-p2psip-base-15
|
2010-11-22 16:19:39 +00:00
|
|
|
*/
|
|
|
|
|
2012-09-20 02:03:38 +00:00
|
|
|
#include "config.h"
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
#include <epan/conversation.h>
|
|
|
|
#include <epan/expert.h>
|
2013-06-18 01:13:07 +00:00
|
|
|
#include <epan/tap.h>
|
|
|
|
#include <epan/exported_pdu.h>
|
2013-08-31 14:32:01 +00:00
|
|
|
#include <epan/wmem/wmem.h>
|
2010-11-22 16:19:39 +00:00
|
|
|
#include <packet-tcp.h>
|
|
|
|
|
|
|
|
/* Initialize the protocol and registered fields */
|
|
|
|
static int proto_reload_framing = -1;
|
|
|
|
|
|
|
|
static int hf_reload_framing_type = -1;
|
|
|
|
static int hf_reload_framing_sequence = -1;
|
|
|
|
static int hf_reload_framing_ack_sequence = -1;
|
|
|
|
static int hf_reload_framing_message = -1;
|
|
|
|
static int hf_reload_framing_message_length = -1;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
static int hf_reload_framing_message_data = -1;
|
2010-11-22 16:19:39 +00:00
|
|
|
static int hf_reload_framing_received = -1;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
static int hf_reload_framing_parsed_received = -1;
|
2010-11-22 16:19:39 +00:00
|
|
|
static int hf_reload_framing_duplicate = -1;
|
|
|
|
static int hf_reload_framing_response_in = -1;
|
|
|
|
static int hf_reload_framing_response_to = -1;
|
|
|
|
static int hf_reload_framing_time = -1;
|
|
|
|
|
|
|
|
static dissector_handle_t reload_handle;
|
|
|
|
|
2013-06-18 01:13:07 +00:00
|
|
|
static gint exported_pdu_tap = -1;
|
|
|
|
|
2010-11-22 16:19:39 +00:00
|
|
|
/* Structure containing transaction specific information */
|
|
|
|
typedef struct _reload_frame_t {
|
2012-08-16 13:51:54 +00:00
|
|
|
guint32 data_frame;
|
|
|
|
guint32 ack_frame;
|
2010-11-22 16:19:39 +00:00
|
|
|
nstime_t req_time;
|
|
|
|
} reload_frame_t;
|
|
|
|
|
|
|
|
/* Structure containing conversation specific information */
|
|
|
|
typedef struct _reload_frame_conv_info_t {
|
2013-08-31 14:32:01 +00:00
|
|
|
wmem_tree_t *transaction_pdus;
|
2010-11-22 16:19:39 +00:00
|
|
|
} reload_conv_info_t;
|
|
|
|
|
|
|
|
|
2011-05-06 01:09:04 +00:00
|
|
|
/* RELOAD Message classes = (message_code & 0x1) (response = request +1) */
|
2010-11-22 16:19:39 +00:00
|
|
|
#define DATA 128
|
|
|
|
#define ACK 129
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize the subtree pointers */
|
|
|
|
static gint ett_reload_framing = -1;
|
|
|
|
static gint ett_reload_framing_message = -1;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
static gint ett_reload_framing_received = -1;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
2013-05-27 23:21:11 +00:00
|
|
|
static expert_field ei_reload_no_dissector = EI_INIT;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
#define UDP_PORT_RELOAD 6084
|
|
|
|
#define TCP_PORT_RELOAD 6084
|
|
|
|
|
|
|
|
#define MIN_HDR_LENGTH 9
|
|
|
|
#define MIN_RELOADDATA_HDR_LENGTH 38
|
|
|
|
|
|
|
|
#define RELOAD_TOKEN 0xd2454c4f
|
|
|
|
|
|
|
|
static const value_string types[] = {
|
2011-05-06 01:09:04 +00:00
|
|
|
{DATA, "DATA"},
|
|
|
|
{ACK, "ACK"},
|
2010-11-22 16:19:39 +00:00
|
|
|
{0x00, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static guint
|
|
|
|
get_reload_framing_message_length(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
|
|
|
|
{
|
|
|
|
/* Get the type */
|
|
|
|
guint32 length = 9;
|
|
|
|
|
|
|
|
|
|
|
|
if (tvb_get_guint8(tvb, offset) == DATA) {
|
2012-12-03 01:41:32 +00:00
|
|
|
length = 1 + 4 + 3 + tvb_get_ntoh24(tvb, 1 + 4);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2013-06-18 01:13:07 +00:00
|
|
|
dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean from_dtls)
|
2010-11-22 16:19:39 +00:00
|
|
|
{
|
2012-08-16 13:51:54 +00:00
|
|
|
proto_item *ti;
|
|
|
|
proto_tree *reload_framing_tree;
|
|
|
|
guint32 relo_token;
|
|
|
|
guint32 message_length = 0;
|
2013-08-31 14:32:01 +00:00
|
|
|
wmem_tree_key_t transaction_id_key[4];
|
2012-08-16 13:51:54 +00:00
|
|
|
guint32 *key_save, len_save;
|
|
|
|
guint32 sequence;
|
|
|
|
guint effective_length;
|
|
|
|
guint16 offset;
|
|
|
|
conversation_t *conversation;
|
2012-12-03 01:41:32 +00:00
|
|
|
reload_conv_info_t *reload_framing_info = NULL;
|
2012-08-16 13:51:54 +00:00
|
|
|
reload_frame_t * reload_frame;
|
|
|
|
guint8 type;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
offset = 0;
|
|
|
|
effective_length = tvb_length(tvb);
|
|
|
|
|
|
|
|
/* First, make sure we have enough data to do the check. */
|
|
|
|
if (effective_length < MIN_HDR_LENGTH)
|
|
|
|
return 0;
|
|
|
|
|
2011-05-06 01:09:04 +00:00
|
|
|
/* Get the type
|
2010-11-24 15:15:28 +00:00
|
|
|
* http://tools.ietf.org/html/draft-ietf-p2psip-base-12
|
|
|
|
* 5.6.2. Framing Header
|
|
|
|
*/
|
2010-11-22 16:19:39 +00:00
|
|
|
type = tvb_get_guint8(tvb, 0);
|
|
|
|
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
switch(type) {
|
|
|
|
case DATA:
|
|
|
|
/* in the data type, check the reload token to be sure this
|
|
|
|
* is a reLoad packet
|
|
|
|
*/
|
2012-12-03 01:41:32 +00:00
|
|
|
if (effective_length < 12) /* [type + seq + length + token] */
|
|
|
|
return 0;
|
|
|
|
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
relo_token = tvb_get_ntohl(tvb,1 + 4 + 3);
|
|
|
|
if (relo_token != RELOAD_TOKEN) {
|
2011-05-06 01:09:04 +00:00
|
|
|
return 0;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
2013-10-14 18:16:11 +00:00
|
|
|
message_length = tvb_get_ntoh24(tvb, 1 + 4);
|
|
|
|
if (message_length < MIN_RELOADDATA_HDR_LENGTH) {
|
|
|
|
return 0;
|
|
|
|
}
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
break;
|
|
|
|
case ACK:
|
2012-12-03 01:41:32 +00:00
|
|
|
/* Require previous ACK (i.e., reload_framing_info attached to conversation). */
|
|
|
|
if (effective_length < 9 || ! reload_framing_info) {
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
2013-09-13 16:33:28 +00:00
|
|
|
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
|
|
|
|
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
|
|
|
if (conversation)
|
|
|
|
reload_framing_info = (reload_conv_info_t *)conversation_get_proto_data(conversation, proto_reload_framing);
|
|
|
|
|
2013-06-18 01:13:07 +00:00
|
|
|
if (from_dtls && have_tap_listener(exported_pdu_tap)) {
|
|
|
|
exp_pdu_data_t *exp_pdu_data;
|
|
|
|
|
|
|
|
exp_pdu_data = load_export_pdu_tags(pinfo, "reload-framing", -1,
|
|
|
|
(EXP_PDU_TAG_IP_SRC_BIT | EXP_PDU_TAG_IP_DST_BIT | EXP_PDU_TAG_SRC_PORT_BIT |
|
|
|
|
EXP_PDU_TAG_DST_PORT_BIT | EXP_PDU_TAG_ORIG_FNO_BIT));
|
|
|
|
|
2013-10-13 19:56:52 +00:00
|
|
|
exp_pdu_data->tvb_length = effective_length;
|
2013-06-18 01:13:07 +00:00
|
|
|
exp_pdu_data->pdu_tvb = tvb;
|
|
|
|
|
|
|
|
tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data);
|
|
|
|
}
|
|
|
|
|
2011-05-06 01:09:04 +00:00
|
|
|
/* The message seems to be a valid RELOAD framing message! */
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RELOAD Frame");
|
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
|
|
|
|
|
|
|
/* Create the transaction key which may be used to track the conversation */
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
|
2010-11-22 16:19:39 +00:00
|
|
|
sequence = tvb_get_ntohl(tvb, 1);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
transaction_id_key[0].length = 1;
|
|
|
|
transaction_id_key[0].key = &sequence; /* sequence number */
|
|
|
|
|
2013-08-31 14:32:01 +00:00
|
|
|
/* When the wmem_tree_* functions iterate through the keys, they
|
2012-07-21 19:18:12 +00:00
|
|
|
* perform pointer arithmetic with guint32s, so we have to divide
|
|
|
|
* our length fields by that to make things work, but we still want
|
|
|
|
* to g_malloc and memcpy the entire amounts, since those both operate
|
|
|
|
* in raw bytes. */
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
if (type==DATA) {
|
|
|
|
transaction_id_key[1].length = 1;
|
2012-08-16 13:51:54 +00:00
|
|
|
transaction_id_key[1].key = &pinfo->srcport;
|
2012-12-26 05:57:06 +00:00
|
|
|
transaction_id_key[2].length = (pinfo->src.len) / (guint)sizeof(guint32);
|
2013-03-18 22:38:56 +00:00
|
|
|
transaction_id_key[2].key = (guint32 *)g_malloc(pinfo->src.len);
|
2012-07-21 19:18:12 +00:00
|
|
|
memcpy(transaction_id_key[2].key, pinfo->src.data, pinfo->src.len);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
transaction_id_key[1].length = 1;
|
2012-08-16 13:51:54 +00:00
|
|
|
transaction_id_key[1].key = &pinfo->destport;
|
2012-12-26 05:57:06 +00:00
|
|
|
transaction_id_key[2].length = (pinfo->dst.len) / (guint)sizeof(guint32);
|
2013-03-18 22:38:56 +00:00
|
|
|
transaction_id_key[2].key = (guint32 *)g_malloc(pinfo->dst.len);
|
2012-07-21 19:18:12 +00:00
|
|
|
memcpy(transaction_id_key[2].key, pinfo->dst.data, pinfo->dst.len);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
transaction_id_key[3].length=0;
|
|
|
|
transaction_id_key[3].key=NULL;
|
2012-07-21 16:10:16 +00:00
|
|
|
/* The tree functions are destructive to this part of the key, so save the
|
|
|
|
* proper values here and restore them after each call. */
|
|
|
|
key_save = transaction_id_key[2].key;
|
|
|
|
len_save = transaction_id_key[2].length;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
2011-06-09 17:30:13 +00:00
|
|
|
if (!conversation) {
|
|
|
|
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
|
|
|
|
pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Do we already have a state structure for this conv
|
|
|
|
*/
|
|
|
|
if (!reload_framing_info) {
|
|
|
|
/* No. Attach that information to the conversation, and add
|
|
|
|
* it to the list of information structures.
|
|
|
|
*/
|
2013-08-31 14:32:01 +00:00
|
|
|
reload_framing_info = wmem_new(wmem_file_scope(), reload_conv_info_t);
|
|
|
|
reload_framing_info->transaction_pdus = wmem_tree_new(wmem_file_scope());
|
2010-11-22 16:19:39 +00:00
|
|
|
conversation_add_proto_data(conversation, proto_reload_framing, reload_framing_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!pinfo->fd->flags.visited) {
|
2013-03-18 22:38:56 +00:00
|
|
|
if ((reload_frame = (reload_frame_t *)
|
2013-08-31 14:32:01 +00:00
|
|
|
wmem_tree_lookup32_array(reload_framing_info->transaction_pdus, transaction_id_key)) == NULL) {
|
2012-07-21 16:10:16 +00:00
|
|
|
transaction_id_key[2].key = key_save;
|
|
|
|
transaction_id_key[2].length = len_save;
|
2013-08-31 14:32:01 +00:00
|
|
|
reload_frame = wmem_new(wmem_file_scope(), reload_frame_t);
|
2010-11-22 16:19:39 +00:00
|
|
|
reload_frame->data_frame = 0;
|
2012-08-16 13:51:54 +00:00
|
|
|
reload_frame->ack_frame = 0;
|
|
|
|
reload_frame->req_time = pinfo->fd->abs_ts;
|
2013-08-31 14:32:01 +00:00
|
|
|
wmem_tree_insert32_array(reload_framing_info->transaction_pdus, transaction_id_key, (void *)reload_frame);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
2012-07-21 16:10:16 +00:00
|
|
|
transaction_id_key[2].key = key_save;
|
|
|
|
transaction_id_key[2].length = len_save;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
/* check whether the message is a request or a response */
|
|
|
|
|
|
|
|
if (type == DATA) {
|
|
|
|
/* This is a data */
|
|
|
|
if (reload_frame->data_frame == 0) {
|
|
|
|
reload_frame->data_frame = pinfo->fd->num;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* This is a catch-all for all non-request messages */
|
|
|
|
if (reload_frame->ack_frame == 0) {
|
|
|
|
reload_frame->ack_frame = pinfo->fd->num;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2013-08-31 14:32:01 +00:00
|
|
|
reload_frame=(reload_frame_t *)wmem_tree_lookup32_array(reload_framing_info->transaction_pdus, transaction_id_key);
|
2012-07-21 16:10:16 +00:00
|
|
|
transaction_id_key[2].key = key_save;
|
|
|
|
transaction_id_key[2].length = len_save;
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
2012-07-21 01:24:54 +00:00
|
|
|
g_free(transaction_id_key[2].key);
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
if (!reload_frame) {
|
|
|
|
/* create a "fake" pana_trans structure */
|
2013-08-31 14:32:01 +00:00
|
|
|
reload_frame = wmem_new(wmem_packet_scope(), reload_frame_t);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
reload_frame->data_frame = (type==DATA) ? pinfo->fd->num : 0;
|
2012-08-16 13:51:54 +00:00
|
|
|
reload_frame->ack_frame = (type!=DATA) ? pinfo->fd->num : 0;
|
|
|
|
reload_frame->req_time = pinfo->fd->abs_ts;
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
2011-10-21 02:10:19 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_reload_framing, tvb, 0, -1, ENC_NA);
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
reload_framing_tree = proto_item_add_subtree(ti, ett_reload_framing);
|
|
|
|
|
2012-08-10 22:55:02 +00:00
|
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(type, types, "Unknown"));
|
|
|
|
proto_item_append_text(ti, ": %s", val_to_str_const(type, types, "Unknown"));
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
/* Retransmission control */
|
|
|
|
if (type == DATA) {
|
|
|
|
if (reload_frame->data_frame != pinfo->fd->num) {
|
|
|
|
proto_item *it;
|
|
|
|
it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->data_frame);
|
|
|
|
PROTO_ITEM_SET_GENERATED(it);
|
|
|
|
}
|
|
|
|
if (reload_frame->ack_frame) {
|
|
|
|
proto_item *it;
|
|
|
|
it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_in, tvb, 0, 0, reload_frame->ack_frame);
|
|
|
|
PROTO_ITEM_SET_GENERATED(it);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* This is a response */
|
|
|
|
if (reload_frame->ack_frame != pinfo->fd->num) {
|
|
|
|
proto_item *it;
|
|
|
|
it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_duplicate, tvb, 0, 0, reload_frame->ack_frame);
|
|
|
|
PROTO_ITEM_SET_GENERATED(it);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reload_frame->data_frame) {
|
|
|
|
proto_item *it;
|
2012-08-16 13:51:54 +00:00
|
|
|
nstime_t ns;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_to, tvb, 0, 0, reload_frame->data_frame);
|
|
|
|
PROTO_ITEM_SET_GENERATED(it);
|
|
|
|
|
|
|
|
nstime_delta(&ns, &pinfo->fd->abs_ts, &reload_frame->req_time);
|
|
|
|
it = proto_tree_add_time(reload_framing_tree, hf_reload_framing_time, tvb, 0, 0, &ns);
|
|
|
|
PROTO_ITEM_SET_GENERATED(it);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Message dissection
|
|
|
|
*/
|
2011-10-06 03:35:44 +00:00
|
|
|
proto_tree_add_item(reload_framing_tree, hf_reload_framing_type, tvb, offset , 1, ENC_BIG_ENDIAN);
|
2010-11-22 16:19:39 +00:00
|
|
|
offset += 1;
|
|
|
|
switch (type) {
|
|
|
|
|
|
|
|
case DATA:
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{
|
2012-08-16 13:51:54 +00:00
|
|
|
tvbuff_t *next_tvb;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
proto_item *ti_message;
|
|
|
|
proto_tree *message_tree;
|
|
|
|
|
|
|
|
proto_tree_add_item(reload_framing_tree, hf_reload_framing_sequence, tvb, offset , 4, ENC_BIG_ENDIAN);
|
|
|
|
offset += 4;
|
|
|
|
ti_message = proto_tree_add_item(reload_framing_tree, hf_reload_framing_message, tvb, offset, 3+message_length, ENC_NA);
|
|
|
|
proto_item_append_text(ti_message, " (opaque<%d>)", message_length);
|
|
|
|
message_tree = proto_item_add_subtree(ti_message, ett_reload_framing_message);
|
|
|
|
proto_tree_add_item(message_tree, hf_reload_framing_message_length, tvb, offset, 3, ENC_BIG_ENDIAN);
|
|
|
|
offset += 3;
|
|
|
|
proto_tree_add_item(message_tree, hf_reload_framing_message_data, tvb, offset, message_length, ENC_NA);
|
|
|
|
next_tvb = tvb_new_subset(tvb, offset, effective_length - offset, message_length);
|
|
|
|
if (reload_handle == NULL) {
|
2013-05-27 23:21:11 +00:00
|
|
|
expert_add_info(pinfo, ti, &ei_reload_no_dissector);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
return tvb_length(tvb);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
2012-09-11 08:28:07 +00:00
|
|
|
call_dissector_only(reload_handle, next_tvb, pinfo, tree, NULL);
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
break;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
case ACK:
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{
|
|
|
|
proto_item *ti_received;
|
|
|
|
|
|
|
|
proto_tree_add_uint(reload_framing_tree, hf_reload_framing_ack_sequence, tvb, offset , 4, sequence);
|
2010-11-22 16:19:39 +00:00
|
|
|
offset += 4;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
|
|
|
|
ti_received = proto_tree_add_item(reload_framing_tree, hf_reload_framing_received, tvb, offset , 4, ENC_BIG_ENDIAN);
|
|
|
|
{
|
2012-08-16 13:51:54 +00:00
|
|
|
guint32 received;
|
|
|
|
int last_received = -1;
|
2012-12-05 15:56:36 +00:00
|
|
|
int indx = 0;
|
2012-08-16 13:51:54 +00:00
|
|
|
proto_tree *received_tree;
|
|
|
|
proto_item *ti_parsed_received = NULL;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
|
|
|
|
received = tvb_get_ntohl(tvb, offset);
|
2012-12-05 15:56:36 +00:00
|
|
|
while ((received<<indx) != 0) {
|
|
|
|
if (indx>=32) break;
|
|
|
|
if (received &(0x1<<(31-indx))) {
|
|
|
|
if (indx==0) {
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
received_tree = proto_item_add_subtree(ti_received, ett_reload_framing_received);
|
|
|
|
ti_parsed_received = proto_tree_add_item(received_tree, hf_reload_framing_parsed_received, tvb, offset, 4, ENC_NA);
|
2012-12-05 15:56:36 +00:00
|
|
|
proto_item_append_text(ti_parsed_received, "[%u", (sequence -32+indx));
|
|
|
|
last_received = indx;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-12-05 15:56:36 +00:00
|
|
|
if (received &(0x1<<(31-indx+1))) {
|
|
|
|
indx++;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
/* range: skip */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* 1st acked in a serie */
|
|
|
|
if (last_received<0) {
|
|
|
|
/* 1st acked ever */
|
|
|
|
received_tree = proto_item_add_subtree(ti_received, ett_reload_framing_received);
|
|
|
|
ti_parsed_received = proto_tree_add_item(received_tree, hf_reload_framing_parsed_received, tvb, offset, 4, ENC_NA);
|
2012-12-05 15:56:36 +00:00
|
|
|
proto_item_append_text(ti_parsed_received, "[%u",(sequence-32+indx));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-12-05 15:56:36 +00:00
|
|
|
proto_item_append_text(ti_parsed_received, ",%u",(sequence-32+indx));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
2012-12-05 15:56:36 +00:00
|
|
|
last_received = indx;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-12-05 15:56:36 +00:00
|
|
|
else if (indx>0) {
|
|
|
|
if ((received &(0x1<<(31-indx+1))) && (received &(0x1<<(31-indx+2)))) {
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
/* end of a series */
|
2012-12-05 15:56:36 +00:00
|
|
|
if ((received &(0x1<<(31-indx+3)))) {
|
|
|
|
proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+indx-1));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just a pair */
|
2012-12-05 15:56:36 +00:00
|
|
|
proto_item_append_text(ti_received, ",%u", (sequence-32+indx-1));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2012-12-05 15:56:36 +00:00
|
|
|
indx++;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2012-12-05 15:56:36 +00:00
|
|
|
indx++;
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
if (last_received>=0) {
|
2012-12-05 15:56:36 +00:00
|
|
|
if ((received &(0x1<<(31-indx+1))) && (received &(0x1<<(31-indx+2)))) {
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
/* end of a series */
|
2012-12-05 15:56:36 +00:00
|
|
|
if ((received &(0x1<<(31-indx+3)))) {
|
|
|
|
proto_item_append_text(ti_parsed_received,"-%u",(sequence-32+indx-1));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just a pair */
|
2012-12-05 15:56:36 +00:00
|
|
|
proto_item_append_text(ti_parsed_received, ",%u", (sequence-32+indx-1));
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
proto_item_append_text(ti_parsed_received, "]");
|
|
|
|
PROTO_ITEM_SET_GENERATED(ti_parsed_received);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
default:
|
2011-03-27 16:15:19 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return tvb_length(tvb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-11-09 17:46:28 +00:00
|
|
|
dissect_reload_framing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
2010-11-22 16:19:39 +00:00
|
|
|
{
|
2013-06-18 01:13:07 +00:00
|
|
|
return dissect_reload_framing_message(tvb, pinfo, tree, FALSE);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
2013-11-09 17:46:28 +00:00
|
|
|
static int
|
|
|
|
dissect_reload_framing_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
2010-11-22 16:19:39 +00:00
|
|
|
{
|
2011-05-06 01:09:04 +00:00
|
|
|
/* XXX: Check if we have a valid RELOAD Frame Type ? */
|
2010-11-22 16:19:39 +00:00
|
|
|
tcp_dissect_pdus(tvb, pinfo, tree, TRUE, MIN_HDR_LENGTH,
|
2013-11-09 17:46:28 +00:00
|
|
|
get_reload_framing_message_length, dissect_reload_framing, data);
|
|
|
|
return tvb_length(tvb);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
2012-12-03 01:41:32 +00:00
|
|
|
/* ToDo: If a TCP connection is identified heuristically as reload-framing, then
|
|
|
|
* the code should be such that reload-framing PDUs can be re-assembled (as is
|
|
|
|
* done for a TCP connection identified as reload-framing because of
|
|
|
|
* the TCP port used).
|
|
|
|
*/
|
2010-11-22 16:19:39 +00:00
|
|
|
static gboolean
|
2012-09-10 21:40:21 +00:00
|
|
|
dissect_reload_framing_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
2010-11-22 16:19:39 +00:00
|
|
|
{
|
2013-06-18 01:13:07 +00:00
|
|
|
if (dissect_reload_framing_message(tvb, pinfo, tree, FALSE) == 0) {
|
|
|
|
/*
|
|
|
|
* It wasn't a valid RELOAD message, and wasn't
|
|
|
|
* dissected as such.
|
|
|
|
*/
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
dissect_reload_framing_heur_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
|
|
|
{
|
|
|
|
if (dissect_reload_framing_message(tvb, pinfo, tree, TRUE) == 0) {
|
2010-11-22 16:19:39 +00:00
|
|
|
/*
|
|
|
|
* It wasn't a valid RELOAD message, and wasn't
|
|
|
|
* dissected as such.
|
|
|
|
*/
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_reload_framing(void)
|
|
|
|
{
|
|
|
|
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_reload_framing_type,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "type (FramedMessageType)", "reload_framing.type", FT_UINT8,
|
|
|
|
BASE_DEC, VALS(types), 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_sequence,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "sequence (uint32)", "reload_framing.sequence", FT_UINT32,
|
|
|
|
BASE_DEC, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_ack_sequence,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "ack_sequence (uint32)", "reload_framing.ack_sequence", FT_UINT32,
|
|
|
|
BASE_DEC, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_message,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "message", "reload_framing.message", FT_NONE,
|
|
|
|
BASE_NONE, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_message_length,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "length (uint24)", "reload_framing.message.length", FT_UINT32,
|
|
|
|
BASE_DEC, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ &hf_reload_framing_message_data,
|
|
|
|
{ "data", "reload_framing.message.data", FT_BYTES,
|
|
|
|
BASE_NONE, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_received,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
{ "received (uint32)", "reload_framing.received", FT_UINT32,
|
|
|
|
BASE_HEX, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
|
|
|
},
|
|
|
|
{ &hf_reload_framing_parsed_received,
|
|
|
|
{ "Acked Frames:", "reload_framing.parsed_received", FT_NONE,
|
|
|
|
BASE_NONE, NULL, 0x0, NULL, HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_response_in,
|
|
|
|
{ "Response In", "reload_framing.response-in", FT_FRAMENUM,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
BASE_NONE, NULL, 0x0, "The response to this RELOAD Request is in this frame", HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_response_to,
|
|
|
|
{ "Request In", "reload_framing.response-to", FT_FRAMENUM,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
BASE_NONE, NULL, 0x0, "This is a response to the RELOAD Request in this frame", HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_time,
|
|
|
|
{ "Time", "reload_framing.time", FT_RELATIVE_TIME,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
BASE_NONE, NULL, 0x0, "The time between the Request and the Response", HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
{ &hf_reload_framing_duplicate,
|
|
|
|
{ "Duplicated original message in", "reload_framing.duplicate", FT_FRAMENUM,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
BASE_NONE, NULL, 0x0, "This is a duplicate of RELOAD message in this frame", HFILL
|
|
|
|
}
|
2010-11-22 16:19:39 +00:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Setup protocol subtree array */
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_reload_framing,
|
|
|
|
&ett_reload_framing_message,
|
From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
draft-ietf-p2psip-sip-06,
draft-ietf-p2psip-service-discovery-03,
draft-ietf-p2psip-self-tuning-04,
draft-ietf-p2psip-diagnostics-06,
draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
configuration data
- export the message content dissection function
in the new packet-reload.h file for use in
related protocols (draft-hautakorpi-p2psip-with-hip-01)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317
From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data
Note: Additional fix yet req'd since checkhf.pl gives:
ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
Unused entry: packet-reload.c, hf_reload_storeddata_signature
Unused entry: packet-reload.c, hf_reload_storeddataspecifiers
(Compile is OK).
svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
|
|
|
&ett_reload_framing_received,
|
2010-11-22 16:19:39 +00:00
|
|
|
};
|
|
|
|
|
2013-05-27 23:21:11 +00:00
|
|
|
static ei_register_info ei[] = {
|
|
|
|
{ &ei_reload_no_dissector, { "reload_framing.no_dissector", PI_PROTOCOL, PI_WARN, "Can not find reload dissector", EXPFILL }},
|
|
|
|
};
|
|
|
|
|
|
|
|
expert_module_t* expert_reload_framing;
|
|
|
|
|
2010-11-22 16:19:39 +00:00
|
|
|
/* Register the protocol name and description */
|
|
|
|
proto_reload_framing = proto_register_protocol("REsource LOcation And Discovery Framing", "RELOAD FRAMING", "reload-framing");
|
|
|
|
|
|
|
|
/* Required function calls to register the header fields and subtrees used */
|
|
|
|
proto_register_field_array(proto_reload_framing, hf, array_length(hf));
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2013-05-27 23:21:11 +00:00
|
|
|
expert_reload_framing = expert_register_protocol(proto_reload_framing);
|
|
|
|
expert_register_field_array(expert_reload_framing, ei, array_length(ei));
|
2011-03-28 15:23:27 +00:00
|
|
|
|
2013-11-09 17:46:28 +00:00
|
|
|
new_register_dissector("reload-framing", dissect_reload_framing, proto_reload_framing);
|
2011-03-28 15:23:27 +00:00
|
|
|
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_reload_framing(void)
|
|
|
|
{
|
|
|
|
|
|
|
|
dissector_handle_t reload_framing_tcp_handle;
|
|
|
|
dissector_handle_t reload_framing_udp_handle;
|
|
|
|
|
2013-11-09 17:46:28 +00:00
|
|
|
reload_framing_tcp_handle = new_create_dissector_handle(dissect_reload_framing_tcp, proto_reload_framing);
|
|
|
|
reload_framing_udp_handle = new_create_dissector_handle(dissect_reload_framing, proto_reload_framing);
|
2010-11-22 16:19:39 +00:00
|
|
|
|
|
|
|
reload_handle = find_dissector("reload");
|
|
|
|
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("tcp.port", TCP_PORT_RELOAD, reload_framing_tcp_handle);
|
|
|
|
dissector_add_uint("udp.port", UDP_PORT_RELOAD, reload_framing_udp_handle);
|
2010-11-22 16:19:39 +00:00
|
|
|
|
2012-08-16 13:51:54 +00:00
|
|
|
heur_dissector_add("udp", dissect_reload_framing_heur, proto_reload_framing);
|
|
|
|
heur_dissector_add("tcp", dissect_reload_framing_heur, proto_reload_framing);
|
2013-06-18 01:13:07 +00:00
|
|
|
heur_dissector_add("dtls", dissect_reload_framing_heur_dtls, proto_reload_framing);
|
|
|
|
|
|
|
|
exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LAYER_7);
|
2010-11-22 16:19:39 +00:00
|
|
|
}
|
2012-08-16 13:51:54 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
|
|
*
|
|
|
|
* Local variables:
|
|
|
|
* c-basic-offset: 2
|
|
|
|
* tab-width: 8
|
|
|
|
* indent-tabs-mode: nil
|
|
|
|
* End:
|
|
|
|
*
|
|
|
|
* vi: set shiftwidth=2 tabstop=8 expandtab:
|
|
|
|
* :indentSize=2:tabSize=8:noTabs=true:
|
|
|
|
*/
|