epan/dissectors/packet-git.c

@@ -28,6 +28,7 @@ static int proto_git = -1;
 
 static gint ett_git = -1;
 
+static gint hf_git_protocol_version = -1;
 static gint hf_git_packet_len = -1;
 static gint hf_git_packet_data = -1;
 static gint hf_git_packet_terminator = -1;
@@ -39,6 +40,12 @@ static gint hf_git_sideband_control_code = -1;
 
 #define TCP_PORT_GIT    9418
 
+static const value_string version_vals[] = {
+  { '1', "Git protocol version 1" },
+  { '2', "Git protocol version 2" },
+  { 0, NULL }
+};
+
 #define SIDEBAND_PACKFILE_DATA 0x01
 #define SIDEBAND_PROGRESS_INFO 0x02
 #define SIDEBAND_ERROR_INFO 0x03
@@ -106,6 +113,18 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
   offset += 4;
   plen -= 4;
 
+  /*
+   * Parse out the version of the Git Protocol
+   *
+   * The initial server response contains the version of the Git Protocol in use;
+   * 1 or 2. Parsing out this information helps identify the capabilities and
+   * information that can be used with the protocol.
+  */
+  if (plen >= 9 && !tvb_strneql(tvb, offset, "version ", 8)) {
+    proto_tree_add_item(git_tree, hf_git_protocol_version, tvb, offset + 8,
+                        1, ENC_NA);
+  }
+
   /*
    * Parse out the sideband control code.
    *
@@ -140,6 +159,10 @@ void
 proto_register_git(void)
 {
   static hf_register_info hf[] = {
+    { &hf_git_protocol_version,
+      { "Git Protocol Version", "git.version", FT_UINT8, BASE_NONE, VALS(version_vals),
+      0, NULL, HFILL },
+    },
     { &hf_git_packet_len,
       { "Packet length", "git.length", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
     },

epan/dissectors/packet-udp.c

@@ -161,6 +161,9 @@ static gboolean udp_summary_in_tree = TRUE;
 /* Check UDP checksums */
 static gboolean udp_check_checksum = FALSE;
 
+/* Ignore zero-value UDP checksums over IPv6 */
+static gboolean udp_ignore_ipv6_zero_checksum = FALSE;
+
 /* Collect IPFIX process flow information */
 static gboolean udp_process_info = FALSE;
 
@@ -1087,21 +1090,24 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto)
   udph->uh_sum = tvb_get_ntohs(tvb, offset + 6);
   if (udph->uh_sum == 0) {
     /* No checksum supplied in the packet. */
-    if (((ip_proto == IP_PROTO_UDP) && (pinfo->src.type == AT_IPv4)) || pinfo->flags.in_error_pkt) {
-      proto_tree_add_checksum(udp_tree, tvb, offset + 6, &hfi_udp_checksum, hfi_udp_checksum_status.id, &ei_udp_checksum_bad,
-                              pinfo, 0, ENC_BIG_ENDIAN, PROTO_CHECKSUM_NOT_PRESENT);
-    } else {
-      item = proto_tree_add_uint_format_value(udp_tree, &hfi_udp_checksum, tvb, offset + 6, 2, 0, "0 (Illegal)%s", "");
-      checksum_tree = proto_item_add_subtree(item, ett_udp_checksum);
 
+    gboolean ignore_zero_checksum = (ip_proto == IP_PROTO_UDP) &&
+      ((pinfo->src.type == AT_IPv4) || ((pinfo->src.type == AT_IPv6) && udp_ignore_ipv6_zero_checksum));
+    proto_checksum_enum_e checksum_status;
+
+    item = proto_tree_add_item(udp_tree, &hfi_udp_checksum, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
+    if (ignore_zero_checksum || pinfo->flags.in_error_pkt) {
+      proto_item_append_text(item, " [zero-value ignored]");
+      checksum_status = PROTO_CHECKSUM_E_NOT_PRESENT;
+    } else {
+      proto_item_append_text(item, " [zero-value illegal]");
+      checksum_status = PROTO_CHECKSUM_E_ILLEGAL;
       expert_add_info(pinfo, item, &ei_udp_checksum_zero);
       col_append_str(pinfo->cinfo, COL_INFO, " [ILLEGAL CHECKSUM (0)]");
-
-      /* XXX - What should this special status be? */
-      item = proto_tree_add_uint(checksum_tree, &hfi_udp_checksum_status, tvb,
-                                        offset + 6, 0, 4);
-      proto_item_set_generated(item);
     }
+    checksum_tree = proto_item_add_subtree(item, ett_udp_checksum);
+    item = proto_tree_add_uint(checksum_tree, &hfi_udp_checksum_status, tvb, offset + 6, 2, checksum_status);
+    proto_item_set_generated(item);
   } else if (!pinfo->fragmented && (len >= reported_len) &&
              (len >= udph->uh_sum_cov) && (reported_len >= udph->uh_sum_cov) &&
              (udph->uh_sum_cov >= 8)) {
@@ -1328,7 +1334,7 @@ proto_register_udp(void)
     { &ei_udp_possible_traceroute, { "udp.possible_traceroute", PI_SEQUENCE, PI_CHAT, "Possible traceroute", EXPFILL }},
     { &ei_udp_length_bad, { "udp.length.bad", PI_MALFORMED, PI_ERROR, "Bad length value", EXPFILL }},
     { &ei_udplite_checksum_coverage_bad, { "udplite.checksum_coverage.bad", PI_MALFORMED, PI_ERROR, "Bad checksum coverage length value", EXPFILL }},
-    { &ei_udp_checksum_zero, { "udp.checksum.zero", PI_CHECKSUM, PI_ERROR, "Illegal Checksum value (0)", EXPFILL }},
+    { &ei_udp_checksum_zero, { "udp.checksum.zero", PI_CHECKSUM, PI_ERROR, "Illegal checksum value (0)", EXPFILL }},
     { &ei_udp_checksum_bad, { "udp.checksum.bad", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }},
     { &ei_udp_length_bad_zero, { "udp.length.bad_zero", PI_PROTOCOL, PI_WARN, "Length is zero but payload < 65536", EXPFILL }},
   };
@@ -1380,6 +1386,10 @@ proto_register_udp(void)
                                  "Validate the UDP checksum if possible",
                                  "Whether to validate the UDP checksum",
                                  &udp_check_checksum);
+  prefs_register_bool_preference(udp_module, "ignore_ipv6_zero_checksum",
+                                 "Ignore zero-value UDP checksums over IPv6",
+                                 "Whether to ignore zero-value UDP checksums over IPv6",
+                                 &udp_ignore_ipv6_zero_checksum);
   prefs_register_bool_preference(udp_module, "process_info",
                                  "Collect process flow information",
                                  "Collect process flow information from IPFIX",

epan/proto.c

@@ -12950,6 +12950,7 @@ const value_string proto_checksum_vals[] = {
 	{ PROTO_CHECKSUM_E_GOOD,       "Good" },
 	{ PROTO_CHECKSUM_E_UNVERIFIED, "Unverified" },
 	{ PROTO_CHECKSUM_E_NOT_PRESENT, "Not present" },
+	{ PROTO_CHECKSUM_E_ILLEGAL,    "Illegal" },
 
 	{ 0,        NULL }
 };

epan/proto.h

@@ -3256,7 +3256,8 @@ typedef enum
     PROTO_CHECKSUM_E_BAD = 0,
     PROTO_CHECKSUM_E_GOOD,
     PROTO_CHECKSUM_E_UNVERIFIED,
-    PROTO_CHECKSUM_E_NOT_PRESENT
+    PROTO_CHECKSUM_E_NOT_PRESENT,
+    PROTO_CHECKSUM_E_ILLEGAL
 } proto_checksum_enum_e;
 
 #define PROTO_CHECKSUM_NO_FLAGS     0x00    /**< Don't use any flags */