aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dtn.h
diff options
context:
space:
mode:
authorKeith Scott <keithlscott@gmail.com>2019-08-21 07:48:56 -0400
committerAnders Broman <a.broman58@gmail.com>2019-10-04 13:10:46 +0000
commit13a9a98f956fd2b37e90e3fff29d1118a88f0aff (patch)
tree2becc7fbd7032aa3ea6708801a9b90add7eea574 /epan/dissectors/packet-dtn.h
parentba88d0a7cf16edd050d07c14dd0dd1d6c163ca56 (diff)
dtn: Updates to TCPCL and AMP parsers and dtn payload ids.
This patch updates the TCP Convergence Layer (TCPCL) parser, updates the Compressed Bundle Header Encoding (CBHE) BP Endpoints that identify CCSDS File Delivery Protocol (CFDP) and Asynchronous Management Protocol (AMP) payloads, and adds an AMP dissector that parses the new Compressed Bundle Header Encoding (CBOR) wire format. 1. Correctly parses the TCP Convergence Layer Length field 2. Adds support for the TCP Convergence Layer Refuse-Bundle Reason-Code Flags per RFC-7242: Section-5.4 3. Parses BP traffic between Compressed Bundle Header Encoding (CBHE) endpoints 64 and 65 as CCSDS File Delivery Protocol (CFDP) payloads. 4. Parses BP traffic beetween Compressed Bundle Header Encoding (CBHE) endpoints 5 and 6 as Asynchronous Network Management (AMP) payloads 5. Updates the AMP parser to use the new Compressed Binary Object Representation (CBOR) The AMP dissector was originally written by Krishnamurthy Mayya (krishnamurthymayya@gmail.com) against an older version of the AMP specification and updated to parse the new Compressed Binary Object Representation (CBOR) format by Keith Scott (keithlscott@gmail.com) Change-Id: I8d1eff9fb09f1a9dbdb9f4cf077448316f6a9e05 Reviewed-on: https://code.wireshark.org/review/34216 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dtn.h')
-rw-r--r--epan/dissectors/packet-dtn.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dtn.h b/epan/dissectors/packet-dtn.h
index 59539dc88c..e2be07af27 100644
--- a/epan/dissectors/packet-dtn.h
+++ b/epan/dissectors/packet-dtn.h
@@ -29,6 +29,7 @@
#define TCP_CONVERGENCE_REFUSE_BUNDLE 0x30
#define TCP_CONVERGENCE_KEEP_ALIVE 0x40
#define TCP_CONVERGENCE_SHUTDOWN 0x50
+#define TCP_CONVERGENCE_LENGTH 0x60
/* TCP Convergence Layer - Contact Header Flags */
#define TCP_CONV_BUNDLE_ACK_FLAG 0x01
@@ -45,6 +46,14 @@
#define TCP_CONVERGENCE_SHUTDOWN_REASON 0x02
#define TCP_CONVERGENCE_SHUTDOWN_DELAY 0x01
+/* REFUSE-BUNDLE Reason-Codes */
+#define TCP_REFUSE_BUNDLE_REASON_UNKNOWN 0x00
+#define TCP_REFUSE_BUNDLE_REASON_RX_COMPLETE 0x01
+#define TCP_REFUSE_BUNDLE_REASON_RX_EXHAUSTED 0x02
+#define TCP_REFUSE_BUNDLE_REASON_RX_RETRANSMIT 0x03
+/* 0x4-0x7 - Unassigned
+ * 0x8-0xf - Reserved for future Use */
+
/*
* TCP Convergence Layer - Minimum buffer sizes
* For Data Packet require 5 bytes fixed plus