From Kriang Lerdsuwanakij:

1 Add ALCAP and NBAP as subdissectors of SSCOP. Previously it only
 knows about SSCF-NNI and data. (Changes in packet-sscop.c,
 packet-sscop.h)

2 Add capability for lower layer to force SSCOP to choose a particular
 dissector. It is passed as "subdissector" field of SSCOP protocol
 data. This is required because different payload protocol is
 distinguished by different VPI/VCI. There is no protocol field inside
 SSCOP frame. (Changes in packet-sscop.c, packet-sscop.h)

3 Make K12xx configuration file supporting the following syntax:
   C:\k1297\stacks\umts_iub\umts_iub_aal2l3.stk sscop:alcap
 This says dissect with SSCOP first and then pass to ALCAP.
 The change is made general, so it supports arbitrary number of
 protocol, like "proto1:proto2:proto3". Using ":" as separator
 allow us to expand the syntax further to support parameters like
 "proto1 param1:proto2 param2 param3". (Changes in packet-k12.c)

With above 3 changes together, dissecting Iub traces are correct for
control and signaling planes. I am still investigating user plane
frames because writing UMTS RLC/MAC protocol dissector is required.
The patch and sample .rf file (same as my previous patch) is in the
attachment.

plus:
Add Kriang to the AUTHORS list (and once at it upate my own record)


svn path=/trunk/; revision=20580

1 files changed, 13 insertions, 0 deletions

diff --git a/epan/dissectors/packet-sscop.h b/epan/dissectors/packet-sscop.h
index 8a702c27d9..469f106f81 100644
--- a/epan/dissectors/packet-sscop.h
+++ b/epan/dissectors/packet-sscop.h
@@ -28,4 +28,17 @@ typedef struct _sscop_info_t {
 	guint32 payload_len;
 } sscop_info_t;
 
+typedef struct _sscop_payload_info {
+	dissector_handle_t subdissector;
+} sscop_payload_info;
+
+typedef enum {
+  DATA_DISSECTOR = 1,
+  Q2931_DISSECTOR = 2,
+  SSCF_NNI_DISSECTOR = 3,
+  ALCAP_DISSECTOR = 4,
+  NBAP_DISSECTOR = 5
+} Dissector_Option;
+
+extern gboolean sscop_allowed_subdissector(dissector_handle_t handle);
 extern void dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissector_handle_t handle);