Merge remote-tracking branch 'upstream/master'

doc/release-notes.adoc

@@ -159,6 +159,10 @@ EGNOS Messager Server (EMS) files
 --
 
 // === New and Updated Capture Interfaces support
+[commaize]
+--
+u-blox GNSS receivers
+--
 
 //=== New and Updated Codec support
 

docbook/wsug_src/wsug_customize.adoc

@@ -807,9 +807,10 @@ btn:[Copy from]:: Copy the list of user specified display filter buttons from an
 
 The columns in the entries are as follows.
 
-Selecting _Show in toolbar_ causes the column to be shown in the toolbar besides the display filter text entry.
+Selecting _Show in toolbar_ causes the button to be shown in the toolbar besides the display filter text entry.
 
 The _Button Label_ is the text shown on the button in the toolbar.
+The use of a double slash causes the button to create a dropdown list to allow grouping of multiple buttons, e.g. TCP//Syn and TCP//Res.
 
 The _Filter Expression_ is the <<ChWorkBuildDisplayFilterSection,display filter expression>> entered into the display filter text entry when the button is clicked.
 

epan/dissectors/CMakeLists.txt

@@ -214,7 +214,6 @@ set(ASN1_DISSECTOR_SRC
 set(DIRTY_CORBA_IDL_DISSECTOR_SRC
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-cosnaming.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-gias.c
-	${CMAKE_CURRENT_SOURCE_DIR}/packet-parlay.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-tango.c
 )
 

epan/dissectors/corba-idl/parlay/README.parlay

@@ -4,3 +4,5 @@ idl2wrs Parlay.idl
 
 The Parlay.idl file includes all the other .idl files to create one
 dissector for Parlay.
+2023-01-12 The Parlay dissector has been removed on the assumption that it is no longer required. These files will be keept around for a while
+if the need to regenerate it should arise.

epan/dissectors/packet-mle.c

@@ -1666,7 +1666,7 @@ proto_register_mle(void)
       }
     },
     { &hf_mle_tlv_mode_receiver_on_idle,
-      { "R(Reciever/rx)-on-idle",
+      { "R(Receiver/rx)-on-idle",
         "mle.tlv.mode.receiver_on_idle",
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL,

epan/dissectors/packet-pfcp.c

@@ -16286,7 +16286,7 @@ proto_register_pfcp(void)
         },
 
         { &hf_pfcp_reporting_suggestion_info_reporting_urgency_value,
-        { "Teporting Urgency value", "pfcp.reporting_suggestion_info.reporting_urgency_value",
+        { "Reporting Urgency value", "pfcp.reporting_suggestion_info.reporting_urgency_value",
             FT_UINT8, BASE_DEC, VALS(pfcp_reporting_urgency_type_vals), 0x0f,
             NULL, HFILL }
         },

epan/dissectors/packet-rtmpt.c

@@ -484,6 +484,8 @@ typedef struct rtmpt_packet {
                 guint32  offset;
         } data;
 
+        wmem_list_t *frames;
+
         /* used during unchunking */
         int              alloc;
         int              want;
@@ -550,6 +552,14 @@ typedef struct rtmpt_conv {
         wmem_tree_t *txids[2];
 } rtmpt_conv_t;
 
+static void
+rtmpt_packet_mark_depended(gpointer data, gpointer user_data)
+{
+    frame_data *fd = (frame_data *)user_data;
+    uint32_t frame_num = GPOINTER_TO_UINT(data);
+    mark_frame_as_depended_upon(fd, frame_num);
+}
+
 #ifdef DEBUG_RTMPT
 static void rtmpt_debug(const char *fmt, ...)
 {
@@ -2222,6 +2232,9 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_
                         tp->isresponse = FALSE;
                         tp->otherframe = 0;
 
+                        tp->frames     = wmem_list_new(wmem_file_scope());
+                        wmem_list_prepend(tp->frames, GUINT_TO_POINTER(pinfo->num));
+
                         /* Save the header information for future defaulting needs */
                         ti->ts  = ts;
                         ti->tsd = tsd;
@@ -2321,6 +2334,10 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_
                         tp->data.p = wmem_realloc(wmem_file_scope(), tp->data.p, tp->alloc);
                 }
                 tvb_memcpy(tvb, tp->data.p+tp->have, offset, want);
+                wmem_list_frame_t *frame_head = wmem_list_head(tp->frames);
+                if (wmem_list_frame_data(frame_head) != GUINT_TO_POINTER(pinfo->num)) {
+                        wmem_list_prepend(tp->frames, GUINT_TO_POINTER(pinfo->num));
+                }
 
                 if (tf) {
                         tf->have += want;
@@ -2342,6 +2359,7 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_
                 if (tp->have == tp->want) {
                         /* Whole packet is complete */
                         wmem_tree_insert32(rconv->packets[cdir], tp->lastseq, tp);
+                        wmem_list_foreach(tp->frames, rtmpt_packet_mark_depended, pinfo->fd);
 
                         pktbuf = tvb_new_child_real_data(tvb, tp->data.p, tp->have, tp->have);
                         add_new_data_source(pinfo, pktbuf, "Unchunked RTMP");

epan/dissectors/packet-stanag4607.c

@@ -251,8 +251,8 @@ static const value_string stanag4607_terrain_vals[] = {
 
 static const value_string stanag4607_geoid_vals[] = {
 	{   0, "None Specified" },
-	{   1, "EGM96 (Earth Gravitional Model, Version 1996)" },
-	{   2, "GEO96 (Geoid Gravitional Model, Version 1996)" },
+	{   1, "EGM96 (Earth Gravitational Model, Version 1996)" },
+	{   2, "GEO96 (Geoid Gravitational Model, Version 1996)" },
 	{   3, "Flat Earth" },
 	{ 0, NULL }
 };

epan/dissectors/packet-tftp.c

@@ -779,7 +779,7 @@ is_valid_request_body(tvbuff_t *tvb, packet_info *pinfo)
   guint len = tvb_strsize(tvb, offset);
   const gchar* mode = tvb_format_stringzpad(pinfo->pool, tvb, offset, len);
 
-  const gchar* modes[] = {"netscii", "octet", "mail"};
+  const gchar* modes[] = {"netascii", "octet", "mail"};
   for(guint i = 0; i < array_length(modes); ++i) {
     if (g_ascii_strcasecmp(mode, modes[i]) == 0) return TRUE;
   }

epan/dissectors/packet-thread.c

@@ -4120,7 +4120,7 @@ proto_register_thread_mc(void)
         },
 
          { &hf_thread_mc_tlv_sec_policy_ccm,
-            { "Commercial Commisioning Mode Bit disabled",
+            { "Commercial Commissioning Mode Bit disabled",
             "thread_meshcop.tlv.sec_policy_ccm",
             FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), THREAD_MC_SEC_POLICY_MASK_CCM_MASK,
             NULL,