Use MAC address documentation range in filter examples

[metze/wireshark/wip.git] / epan / dissectors / packet-git.c

diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index bac4578b7af9d2ea130928d1421a427da679492b..42401a960ef3055d39ee648d404673acdba71e6e 100644 (file)
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -1,10 +1,7 @@
 /* packet-git.c
  * Routines for git packet dissection
- * RFC 1939
  * Copyright 2010, Jelmer Vernooij <jelmer@samba.org>
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -30,12 +27,15 @@
 
 #include <stdio.h>
 
-#include <glib.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"
 
+void proto_register_git(void);
+void proto_reg_handoff_git(void);
+
+static dissector_handle_t git_handle;
+
 static int proto_git = -1;
 
 static gint ett_git = -1;
@@ -44,35 +44,35 @@ static gint hf_git_packet_len = -1;
 static gint hf_git_packet_data = -1;
 static gint hf_git_packet_terminator = -1;
 
-#define TCP_PORT_GIT                   9418
+#define TCP_PORT_GIT    9418
 
 /* desegmentation of Git over TCP */
 static gboolean git_desegment = TRUE;
 
 static gboolean get_packet_length(tvbuff_t *tvb, int offset,
-                                                                         guint16 *length)
+                                  guint16 *length)
 {
-       guint8 *lenstr;
+  guint8 *lenstr;
 
-       lenstr = tvb_get_string(wmem_packet_scope(), tvb, offset, 4);
+  lenstr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII);
 
-       return (sscanf(lenstr, "%hx", length) == 1);
+  return (sscanf(lenstr, "%hx", length) == 1);
 }
 
 static guint
-get_git_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
+get_git_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-       guint16 plen;
+  guint16 plen;
 
-       if (!get_packet_length(tvb, offset, &plen))
-               return 0; /* No idea what this is */
+  if (!get_packet_length(tvb, offset, &plen))
+    return 0; /* No idea what this is */
 
-       if (plen == 0) {
-               /* Terminator packet */
-               return 4;
-       }
+  if (plen == 0) {
+    /* Terminator packet */
+    return 4;
+  }
 
-       return plen;
+  return plen;
 }
 
 static int
@@ -91,47 +91,47 @@ dissect_git_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
   git_tree = proto_item_add_subtree(ti, ett_git);
 
   if (!get_packet_length(tvb, 0, &plen))
-         return 0;
+    return 0;
 
   if (plen == 0) {
-         proto_tree_add_uint(git_tree, hf_git_packet_terminator, tvb, offset,
-                                                               4, plen);
-         return 4;
+    proto_tree_add_uint(git_tree, hf_git_packet_terminator, tvb, offset,
+                        4, plen);
+    return 4;
   }
 
   if (git_tree)
   {
-         proto_tree_add_uint(git_tree, hf_git_packet_len, tvb, offset,
-                                                               4, plen);
+    proto_tree_add_uint(git_tree, hf_git_packet_len, tvb, offset,
+                        4, plen);
 
-         proto_tree_add_item(git_tree, hf_git_packet_data, tvb, offset+4,
-                                                               plen-4, ENC_NA);
+    proto_tree_add_item(git_tree, hf_git_packet_data, tvb, offset+4,
+                        plen-4, ENC_NA);
   }
 
-  return tvb_length(tvb);
+  return tvb_captured_length(tvb);
 }
 
 static int
 dissect_git(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-       tcp_dissect_pdus(tvb, pinfo, tree, git_desegment, 4, get_git_pdu_len,
-                        dissect_git_pdu, data);
-       return tvb_length(tvb);
+  tcp_dissect_pdus(tvb, pinfo, tree, git_desegment, 4, get_git_pdu_len,
+                   dissect_git_pdu, data);
+  return tvb_captured_length(tvb);
 }
 
 void
 proto_register_git(void)
 {
   static hf_register_info hf[] = {
-       { &hf_git_packet_len,
-               { "Packet length", "git.length", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
-       },
-       { &hf_git_packet_data,
-               { "Packet data", "git.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
-       },
-       { &hf_git_packet_terminator,
-               { "Terminator packet", "git.terminator", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
-       },
+    { &hf_git_packet_len,
+      { "Packet length", "git.length", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
+    },
+    { &hf_git_packet_data,
+      { "Packet data", "git.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
+    },
+    { &hf_git_packet_terminator,
+      { "Terminator packet", "git.terminator", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
+    },
   };
 
   static gint *ett[] = {
@@ -139,25 +139,37 @@ proto_register_git(void)
   };
 
   module_t *git_module;
+
   proto_git = proto_register_protocol("Git Smart Protocol", "GIT", "git");
-  new_register_dissector("git", dissect_git, proto_git);
   proto_register_field_array(proto_git, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
+  git_handle = new_register_dissector("git", dissect_git, proto_git);
+
   git_module = prefs_register_protocol(proto_git, NULL);
 
   prefs_register_bool_preference(git_module, "desegment",
-                                "Reassemble GIT messages spanning multiple TCP segments",
-                                "Whether the GIT dissector should reassemble messages spanning multiple TCP segments."
-                                " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
-                                &git_desegment);
+                                 "Reassemble GIT messages spanning multiple TCP segments",
+                                 "Whether the GIT dissector should reassemble messages spanning multiple TCP segments."
+                                 " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+                                 &git_desegment);
 }
 
 void
 proto_reg_handoff_git(void)
 {
-  dissector_handle_t git_handle;
-
-  git_handle = find_dissector("git");
   dissector_add_uint("tcp.port", TCP_PORT_GIT, git_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */