1 files changed, 35 insertions, 30 deletions
diff --git a/ui/tap-rlc-graph.h b/ui/tap-rlc-graph.h
index 5f5b4c16..45a77eb4 100644
--- a/ui/tap-rlc-graph.h
+++ b/ui/tap-rlc-graph.h
@@ -16,6 +16,7 @@
 #include <epan/packet.h>
 #include <cfile.h>
 #include <epan/dissectors/packet-rlc-lte.h>
+#include <epan/dissectors/packet-rlc-3gpp-common.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,24 +24,25 @@ extern "C" {
 
 struct rlc_segment {
     struct rlc_segment *next;
-    guint32         num;            /* framenum */
+    uint32_t        num;            /* framenum */
     time_t          rel_secs;
-    guint32         rel_usecs;
-
-    gboolean        isControlPDU;
-    guint16         SN;
-    guint16         isResegmented;
-    guint16         ACKNo;
-    #define MAX_NACKs 128
-    guint16         noOfNACKs;
-    guint16         NACKs[MAX_NACKs];
-    guint16         pduLength;
-
-    guint16         ueid;
-    guint16         channelType;
-    guint16         channelId;
-    guint8          rlcMode;
-    guint8          direction;
+    uint32_t        rel_usecs;
+
+    bool            isControlPDU;
+    uint32_t        SN;
+    uint16_t        isResegmented;
+    uint32_t        ACKNo;
+    uint16_t        noOfNACKs;
+    uint32_t        NACKs[MAX_NACKs];
+    uint16_t        pduLength;
+
+    uint8_t         rat;
+    uint16_t        ueid;
+    uint16_t        channelType;
+    uint16_t        channelId;
+    uint8_t         rlcMode;
+    uint8_t         direction;
+    uint16_t        sequenceNumberLength;
 };
 
 /* A collection of channels that may be found in one frame.  Used when working out
@@ -48,7 +50,7 @@ struct rlc_segment {
 typedef struct _th_t {
     int num_hdrs;
     #define MAX_SUPPORTED_CHANNELS 8
-    rlc_lte_tap_info *rlchdrs[MAX_SUPPORTED_CHANNELS];
+    rlc_3gpp_tap_info *rlchdrs[MAX_SUPPORTED_CHANNELS];
 } th_t;
 
 struct rlc_graph {
@@ -57,25 +59,28 @@ struct rlc_graph {
     struct rlc_segment *last_segment;
 
     /* These are filled in with the channel/direction this graph is showing */
-    gboolean        channelSet;
-    guint16         ueid;
-    guint16         channelType;
-    guint16         channelId;
-    guint8          rlcMode;
-    guint8          direction;
+    bool            channelSet;
+
+    uint8_t         rat;
+    uint16_t        ueid;
+    uint16_t        channelType;
+    uint16_t        channelId;
+    uint8_t         rlcMode;
+    uint8_t         direction;
 };
 
-gboolean rlc_graph_segment_list_get(capture_file *cf, struct rlc_graph *tg, gboolean stream_known,
+bool rlc_graph_segment_list_get(capture_file *cf, struct rlc_graph *tg, bool stream_known,
                                     char **err_string);
 void rlc_graph_segment_list_free(struct rlc_graph * );
 
 
 
-gboolean compare_rlc_headers(guint16 ueid1, guint16 channelType1, guint16 channelId1, guint8 rlcMode1, guint8 direction1,
-                            guint16 ueid2, guint16 channelType2, guint16 channelId2, guint8 rlcMode2, guint8 direction2,
-                            gboolean isControlFrame);
-rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, struct rlc_segment *hdrs,
-                                         gchar **err_msg);
+bool compare_rlc_headers(uint8_t rat1, uint8_t rat2,
+                             uint16_t ueid1, uint16_t channelType1, uint16_t channelId1, uint8_t rlcMode1, uint8_t direction1,
+                             uint16_t ueid2, uint16_t channelType2, uint16_t channelId2, uint8_t rlcMode2, uint8_t direction2,
+                             bool isControlFrame);
+rlc_3gpp_tap_info *select_rlc_lte_session(capture_file *cf, struct rlc_segment *hdrs,
+                                         char **err_msg);
 
 
 #ifdef __cplusplus