Ethereal-dev: [Ethereal-dev] [PATCH] Plugin for the Monotone netsync protocol

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Erwin Rol <mailinglists@xxxxxxxxxxxx>
Date: Sun, 17 Apr 2005 23:59:27 +0200
Hey all,

Here a patch that adds a plugin for the Monotone netsync protocol, with
the request to apply it, because it will be a helpfull tool for the
Monotone developers.

TIA,

 Erwin

-- 
        Erwin Rol Software Engineering - http://www.erwinrol.com
Index: configure.in
===================================================================
--- configure.in	(revision 14112)
+++ configure.in	(working copy)
@@ -1234,6 +1234,7 @@
   plugins/mate/Makefile
   plugins/megaco/Makefile
   plugins/mgcp/Makefile
+  plugins/monotone/Makefile
   plugins/opsi/Makefile
   plugins/pcli/Makefile
   plugins/rdm/Makefile
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 14112)
+++ Makefile.am	(working copy)
@@ -106,6 +106,7 @@
 	plugins/lwres/lwres.la \
 	plugins/megaco/megaco.la \
 	plugins/mgcp/mgcp.la \
+	plugins/monotone/monotone.la \
 	plugins/opsi/opsi.la \
 	plugins/pcli/pcli.la \
 	plugins/rdm/rdm.la \
@@ -156,6 +157,7 @@
 	plugins/lwres/packet-lwres.o \
 	plugins/megaco/packet-megaco.o \
 	plugins/mgcp/packet-mgcp.o \
+	plugins/monotone/packet-netsync.o \
 	plugins/opsi/packet-opsi.o \
 	plugins/pcli/packet-pcli.o \
 	plugins/rdm/packet-rdm.o \
@@ -181,6 +183,7 @@
 	"-dlopen" plugins/lwres/lwres.la \
 	"-dlopen" plugins/megaco/megaco.la \
 	"-dlopen" plugins/mgcp/mgcp.la \
+	"-dlopen" plugins/monotone/monotone.la \
 	"-dlopen" plugins/opsi/opsi.la \
 	"-dlopen" plugins/pcli/pcli.la \
 	"-dlopen" plugins/rdm/rdm.la \
Index: plugins/monotone/AUTHORS
===================================================================
--- plugins/monotone/AUTHORS	(revision 0)
+++ plugins/monotone/AUTHORS	(revision 0)
@@ -0,0 +1,3 @@
+Author :
+Erwin Rol <erwin@xxxxxxxxxxxx>
+
Index: plugins/monotone/INSTALL
===================================================================
Index: plugins/monotone/ChangeLog
===================================================================
--- plugins/monotone/ChangeLog	(revision 0)
+++ plugins/monotone/ChangeLog	(revision 0)
@@ -0,0 +1,6 @@
+$Id: ChangeLog 12587 2004-11-24 03:35:17Z guy $
+
+Overview of changes in Monotone Ethereal plugin
+
+Version 0.0.1:
+* Intial version
Index: plugins/monotone/Makefile.nmake
===================================================================
--- plugins/monotone/Makefile.nmake	(revision 0)
+++ plugins/monotone/Makefile.nmake	(revision 0)
@@ -0,0 +1,31 @@
+#
+# $Id: Makefile.nmake 13596 2005-03-05 06:28:10Z lroland $
+#
+
+include ..\..\config.nmake
+
+############### no need to modify below this line #########
+
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
+	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+
+LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+
+!IFDEF ENABLE_LIBETHEREAL
+LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+
+OBJECTS=packet-netsync.obj 
+
+monotone.dll monotone.exp monotone.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
+	link -dll /out:monotone.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
+	$(GLIB_LIBS)
+
+!ENDIF
+
+clean:
+	rm -f $(OBJECTS) monotone.dll monotone.exp monotone.lib *.pdb
+
+distclean: clean
+
+maintainer-clean: distclean
Index: plugins/monotone/moduleinfo.h
===================================================================
--- plugins/monotone/moduleinfo.h	(revision 0)
+++ plugins/monotone/moduleinfo.h	(revision 0)
@@ -0,0 +1,17 @@
+/* Included *after* config.h, in order to re-define these macros */
+
+#ifdef PACKAGE
+#undef PACKAGE
+#endif
+
+/* Name of package */
+#define PACKAGE "monotone"
+
+
+#ifdef VERSION
+#undef VERSION
+#endif
+
+/* Version number of package */
+#define VERSION "0.0.1"
+
Index: plugins/monotone/COPYING
===================================================================
--- plugins/monotone/COPYING	(revision 0)
+++ plugins/monotone/COPYING	(revision 0)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Index: plugins/monotone/packet-netsync.c
===================================================================
--- plugins/monotone/packet-netsync.c	(revision 0)
+++ plugins/monotone/packet-netsync.c	(revision 0)
@@ -0,0 +1,823 @@
+/* packet-netsync.c
+ * Routines for ENTTEC packet disassembly
+ *
+ * $Id: packet-enttec.c 13644 2005-03-07 02:44:41Z guy $
+ *
+ * Copyright (c) 2005 by Erwin Rol <erwin@xxxxxxxxxxxx>
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@xxxxxxxxxxxx>
+ * Copyright 1999 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/* Include files */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "moduleinfo.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gmodule.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+#include <epan/packet.h>
+#include <epan/addr_resolv.h>
+#include <epan/prefs.h>
+#include <epan/strutil.h>
+#include <epan/dissectors/packet-tcp.h>
+
+/* Define version if we are not building ethereal statically */
+
+#ifndef ENABLE_STATIC
+G_MODULE_EXPORT const gchar version[] = VERSION;
+#endif
+
+/*
+ * See
+ *
+ *	http://www.venge.net/monotone/
+ */
+
+/* Define TCP ports for Monotone netsync */
+
+#define TCP_PORT_NETSYNC 5253
+
+#define NETSYNC_ROLE_SOURCE	1
+#define NETSYNC_ROLE_SINK	2
+#define NETSYNC_ROLE_BOTH	3
+
+static const value_string netsync_role_vals[] = {
+	{ NETSYNC_ROLE_SOURCE,	"Source" },
+	{ NETSYNC_ROLE_SINK,	"Sink" },
+	{ NETSYNC_ROLE_BOTH,	"Both" },
+	{ 0,			NULL }
+};
+
+
+#define NETSYNC_CMD_ERROR	0
+#define NETSYNC_CMD_BYE		1
+#define NETSYNC_CMD_HELLO	2
+#define NETSYNC_CMD_ANONYMOUS	3
+#define NETSYNC_CMD_AUTH	4
+#define NETSYNC_CMD_CONFIRM	5
+#define NETSYNC_CMD_REFINE	6
+#define NETSYNC_CMD_DONE	7
+#define NETSYNC_CMD_SEND_DATA	8
+#define NETSYNC_CMD_SEND_DELTA	9
+#define NETSYNC_CMD_DATA	10
+#define NETSYNC_CMD_DELTA	11
+#define NETSYNC_CMD_NONEXISTANT	12
+
+static const value_string netsync_cmd_vals[] = {
+	{ NETSYNC_CMD_ERROR,		"Error" },
+	{ NETSYNC_CMD_BYE, 		"Bye" },
+	{ NETSYNC_CMD_HELLO,		"Hello" },
+	{ NETSYNC_CMD_ANONYMOUS, 	"Anonymous" },
+	{ NETSYNC_CMD_AUTH, 		"Auth" },
+	{ NETSYNC_CMD_CONFIRM, 		"Confirm" },
+	{ NETSYNC_CMD_REFINE, 		"Refine" },
+	{ NETSYNC_CMD_DONE, 		"Done" },
+	{ NETSYNC_CMD_SEND_DATA,	"Send Data" },
+	{ NETSYNC_CMD_SEND_DELTA, 	"Send Delta" },
+	{ NETSYNC_CMD_DATA,		"Data" },
+	{ NETSYNC_CMD_DELTA,		"Delta" },
+	{ NETSYNC_CMD_NONEXISTANT, 	"Nonexistant" },
+	{ 0,				NULL }
+};
+
+#define NETSNYC_MERKLE_HASH_LENGTH 20
+
+void proto_reg_handoff_netsync(void);
+
+/* Define the monotone netsync proto */
+static int proto_netsync = -1;
+
+static int hf_netsync_version = -1;
+static int hf_netsync_command = -1;
+static int hf_netsync_size = -1;
+static int hf_netsync_data = -1;
+static int hf_netsync_checksum = -1;
+
+static int hf_netsync_cmd_done_level = -1;
+static int hf_netsync_cmd_done_type = -1;
+
+static int hf_netsync_cmd_hello_keyname = -1;
+static int hf_netsync_cmd_hello_key = -1;
+static int hf_netsync_cmd_nonce = -1;
+
+static int hf_netsync_cmd_anonymous_role = -1;
+static int hf_netsync_cmd_anonymous_collection = -1;
+
+static int hf_netsync_cmd_send_data_type = -1;
+static int hf_netsync_cmd_send_data_id = -1;
+
+static int hf_netsync_cmd_error_msg = -1;
+
+
+static int hf_netsync_cmd_confirm_sig = -1;
+
+static int hf_netsync_cmd_auth_role = -1;
+static int hf_netsync_cmd_auth_collection = -1;
+static int hf_netsync_cmd_auth_id = -1;
+static int hf_netsync_cmd_auth_nonce1 = -1;
+static int hf_netsync_cmd_auth_nonce2 = -1;
+static int hf_netsync_cmd_auth_sig = -1;
+
+static int hf_netsync_cmd_data_type = -1;
+static int hf_netsync_cmd_data_id = -1;
+static int hf_netsync_cmd_data_compressed = -1;
+static int hf_netsync_cmd_data_payload = -1;
+
+static int hf_netsync_cmd_delta_type = -1;
+static int hf_netsync_cmd_delta_base_id = -1;
+static int hf_netsync_cmd_delta_ident_id = -1;
+static int hf_netsync_cmd_delta_compressed = -1;
+static int hf_netsync_cmd_delta_payload = -1;
+
+static int hf_netsync_cmd_refine_tree_node = -1;
+
+static int hf_netsync_cmd_send_delta_type = -1;
+static int hf_netsync_cmd_send_delta_base_id = -1;
+static int hf_netsync_cmd_send_delta_ident_id = -1;
+
+static int hf_netsync_cmd_nonexistant_type = -1;
+static int hf_netsync_cmd_nonexistant_id = -1;
+
+/* Define the tree for netsync */
+static int ett_netsync = -1;
+
+/*
+ * Here are the global variables associated with the preferences
+ * for monotone netsync
+ */
+
+static guint global_tcp_port_netsync = TCP_PORT_NETSYNC;
+static guint tcp_port_netsync = TCP_PORT_NETSYNC;
+static gboolean netsync_desegment = TRUE;
+
+static gint dissect_uleb128( tvbuff_t *tvb, gint offset, guint* size)
+{
+	guint shift = 0;
+	guint8 tmp;
+	guint start_offset = offset;
+
+	*size = 0;
+
+	/* get size */
+	do {
+		tmp = tvb_get_guint8(tvb, offset);
+		offset += 1;
+			
+		*size |= (tmp & 0x7F) << shift;
+		shift += 7;	
+	} while (tmp & 0x80);
+
+
+	return offset - start_offset;
+}
+
+static gint dissect_netsync_cmd_error( tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_) 
+{
+	guint len = 0;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_error_msg, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	return offset;
+}
+
+static gint dissect_netsync_cmd_bye(tvbuff_t *tvb _U_,  gint offset, proto_tree *tree _U_, guint size _U_)
+{
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_hello(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_hello_keyname, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_hello_key, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_anonymous_role, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_anonymous_collection, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_nonce, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_auth(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_role, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_collection, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	offset += len;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_nonce1, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	offset += len;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_nonce2, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_auth_sig, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_confirm(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_confirm_sig, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_refine(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size)
+{
+	proto_tree_add_item(tree, hf_netsync_cmd_refine_tree_node, tvb,
+				offset, size, FALSE );
+	offset += size;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_done(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+	guint bytes = 0;
+
+	bytes = dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_uint(tree, hf_netsync_cmd_done_level, tvb,
+					offset, bytes, len );
+	offset += bytes;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_done_type, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_send_data(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	proto_tree_add_item(tree, hf_netsync_cmd_send_data_type, tvb,
+					offset, 1, FALSE );
+        offset += 1;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_send_data_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_send_delta(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	proto_tree_add_item(tree, hf_netsync_cmd_send_delta_type, tvb,
+					offset, 1, FALSE );
+        offset += 1;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_send_delta_base_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+
+	proto_tree_add_item(tree, hf_netsync_cmd_send_delta_ident_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_data(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = -1;
+	
+	proto_tree_add_item(tree, hf_netsync_cmd_data_type, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_data_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_data_compressed, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_data_payload, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_delta(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	guint len = 0;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_delta_type, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_delta_base_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_delta_ident_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_delta_compressed, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	offset += dissect_uleb128( tvb, offset, &len );
+
+	proto_tree_add_item(tree, hf_netsync_cmd_delta_payload, tvb,
+				offset, len, FALSE );
+	offset += len;
+
+	return offset;
+}
+
+
+static gint dissect_netsync_cmd_nonexistant(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
+{
+	proto_tree_add_item(tree, hf_netsync_cmd_nonexistant_type, tvb,
+				offset, 1, FALSE );
+	offset += 1;
+
+	proto_tree_add_item(tree, hf_netsync_cmd_nonexistant_id, tvb,
+				offset, NETSNYC_MERKLE_HASH_LENGTH, FALSE );
+	offset += NETSNYC_MERKLE_HASH_LENGTH;
+
+	return offset;
+}
+
+static guint
+get_netsync_pdu_len(tvbuff_t *tvb, int offset)
+{
+	guint size = 0, size_bytes;
+
+	/* skip version and command */
+	offset += 2;
+	
+	size_bytes = dissect_uleb128( tvb, offset, &size );
+		
+	/* the calculated size if for the data only, this doesn't
+	 * include the version (1 byte), command (1 byte), 
+	 * lenght (size_bytes bytes) and checksum (4 bytes)
+	 */
+
+	return 1 + 1 + size_bytes + size + 4;
+}
+
+static void
+dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 
+{
+	gint offset = 0;
+	guint8 tmp;
+	guint8 cmd, version;
+	guint32 size, size_bytes, shift;
+	proto_tree *ti,*netsync_tree=NULL;
+
+	/* Set the protocol column */
+	if (check_col(pinfo->cinfo,COL_PROTOCOL)) {
+		col_set_str(pinfo->cinfo,COL_PROTOCOL,"Netsync");
+	}
+
+
+	if (tree == NULL)
+		return;
+	
+	while (tvb_reported_length_remaining(tvb, offset)  > 0) {
+		ti = proto_tree_add_item(tree, proto_netsync, tvb, offset, -1, FALSE);
+		netsync_tree = proto_item_add_subtree(ti, ett_netsync);
+
+		version = tvb_get_guint8(tvb, offset);
+		proto_tree_add_item(netsync_tree, hf_netsync_version, tvb,
+					offset, 1, FALSE );
+		offset += 1;
+
+		cmd = tvb_get_guint8(tvb, offset);
+		proto_tree_add_item(netsync_tree, hf_netsync_command, tvb,
+					offset, 1, FALSE );
+		offset += 1;
+
+
+		/* get size */
+		size = 0;
+		size_bytes = 0;
+		shift = 0;
+		do {
+			tmp = tvb_get_guint8(tvb, offset + size_bytes);
+			size_bytes += 1;
+			
+			size |= (tmp & 0x7F) << shift;
+			shift += 7;	
+		} while (tmp & 0x80);
+		
+		
+		proto_tree_add_uint(netsync_tree, hf_netsync_size, tvb,
+                                        offset, size_bytes, size );
+		offset += size_bytes;
+
+		switch (cmd) {
+			case NETSYNC_CMD_DONE:
+				dissect_netsync_cmd_done( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_ERROR:
+				dissect_netsync_cmd_error( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_BYE:
+				dissect_netsync_cmd_bye( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_HELLO:
+				dissect_netsync_cmd_hello( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_ANONYMOUS:
+				dissect_netsync_cmd_anonymous( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_AUTH:
+				dissect_netsync_cmd_auth( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_CONFIRM:
+				dissect_netsync_cmd_confirm( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_REFINE:
+				dissect_netsync_cmd_refine( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_SEND_DATA:
+				dissect_netsync_cmd_send_data( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_SEND_DELTA:
+				dissect_netsync_cmd_send_delta( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_DATA:
+				dissect_netsync_cmd_data( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_DELTA:
+				dissect_netsync_cmd_delta( tvb, offset, netsync_tree, size );
+				break;
+
+			case NETSYNC_CMD_NONEXISTANT:
+				dissect_netsync_cmd_nonexistant( tvb, offset, netsync_tree, size );
+				break;
+
+			default:
+				proto_tree_add_item(netsync_tree, hf_netsync_data, tvb,
+					offset, size, FALSE );
+				break;
+		}
+
+		offset += size;
+
+		proto_tree_add_item(netsync_tree, hf_netsync_checksum, tvb,
+					offset, 4, FALSE );
+		offset += 4;
+
+
+		proto_item_append_text(netsync_tree, " V%d, Cmd: %s (%d), Size: %d", 
+					version, match_strval(cmd, netsync_cmd_vals), cmd, size );		
+
+		proto_item_set_len(netsync_tree, 1+1+size_bytes+size+4);
+	}
+}
+
+static void
+dissect_netsync(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	tcp_dissect_pdus(tvb, pinfo, tree, netsync_desegment, 7, get_netsync_pdu_len,
+					dissect_netsync_pdu);
+}
+
+void
+proto_register_netsync(void) 
+{
+	static hf_register_info hf[] = {
+		/* General */
+		{ &hf_netsync_version,
+			{ "Version", "netsync.version",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Version", HFILL } },
+		{ &hf_netsync_command,
+			{ "Command", "netsync.command",
+			  FT_UINT8, BASE_HEX, VALS(netsync_cmd_vals), 0x0,
+			  "Command", HFILL } },
+		{ &hf_netsync_size,
+			{ "Size", "netsync.size",
+			  FT_UINT32, BASE_DEC, NULL, 0x0,
+			  "Size", HFILL } },
+		{ &hf_netsync_data,
+			{ "Data", "netsync.data",
+			  FT_BYTES, BASE_HEX, NULL, 0x0,
+			  "Data", HFILL } },
+		{ &hf_netsync_checksum,
+			{ "Checksum", "netsync.checksum",
+			  FT_UINT32, BASE_HEX, NULL, 0x0,
+			  "Checksum", HFILL } },
+		{ &hf_netsync_cmd_hello_keyname,
+			{ "Key Name", "netsync.cmd.hello.keyname",
+			  FT_STRING, BASE_HEX, NULL, 0x0,
+			  "Key Name", HFILL } },
+		{ &hf_netsync_cmd_hello_key,
+			{ "Key", "netsync.cmd.hello.key",
+			  FT_BYTES, BASE_HEX, NULL, 0x0,
+			  "Key", HFILL } },
+		{ &hf_netsync_cmd_nonce,
+			{ "Nonce", "netsync.cmd.nonce",
+			  FT_BYTES, BASE_HEX, NULL, 0x0,
+			  "Nonce", HFILL } },
+		{ &hf_netsync_cmd_anonymous_role,
+			{ "Role", "netsync.cmd.anonymous.role",
+			  FT_UINT8, BASE_DEC, VALS(netsync_role_vals), 0x0,
+			  "Role", HFILL } },
+		{ &hf_netsync_cmd_anonymous_collection,
+			{ "Collection", "netsync.cmd.anonymous.collection",
+			  FT_STRING, BASE_DEC, NULL, 0x0,
+			  "Collection", HFILL } },
+		{ &hf_netsync_cmd_confirm_sig,
+			{ "Signature", "netsync.cmd.confirm.signature",
+			  FT_BYTES, BASE_HEX, NULL, 0x0,
+			  "Signature", HFILL } },
+		{ &hf_netsync_cmd_send_data_type,
+			{ "Type", "netsync.cmd.send_data.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } },
+		{ &hf_netsync_cmd_send_data_id,
+			{ "ID", "netsync.cmd.send_data.id",
+			  FT_BYTES, BASE_HEX, NULL, 0x0,
+			  "ID", HFILL } },
+		{ &hf_netsync_cmd_error_msg,
+			{ "Message", "netsync.cmd.error.msg",
+			  FT_STRING, BASE_DEC, NULL, 0x0,
+			  "Message", HFILL } },
+
+		{ &hf_netsync_cmd_done_level,
+			{ "Level", "netsync.cmd.done.level",
+			  FT_UINT32, BASE_DEC, NULL, 0x0,
+			  "Level", HFILL } },
+		{ &hf_netsync_cmd_auth_role,
+			{ "Role", "netsync.cmd.auth.role",
+			  FT_UINT8, BASE_DEC, VALS(netsync_role_vals), 0x0,
+			  "Role", HFILL } },
+		{ &hf_netsync_cmd_auth_collection,
+			{ "Collection", "netsync.cmd.auth.collection",
+			  FT_STRING, BASE_DEC, NULL, 0x0,
+			  "Collection", HFILL } },
+		{ &hf_netsync_cmd_auth_id,
+			{ "ID", "netsync.cmd.auth.id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "ID", HFILL } },
+		{ &hf_netsync_cmd_auth_nonce1,
+			{ "Nonce 1", "netsync.cmd.auth.nonce1",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Nonce 1", HFILL } },
+		{ &hf_netsync_cmd_auth_nonce2,
+			{ "Nonce 2", "netsync.cmd.auth.nonce2",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Nonce 2", HFILL } },
+		{ &hf_netsync_cmd_auth_sig,
+			{ "Signature", "netsync.cmd.auth.sig",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Signature", HFILL } },
+		{ &hf_netsync_cmd_data_type,
+			{ "Type", "netsync.cmd.data.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } },
+		{ &hf_netsync_cmd_data_id,
+			{ "ID", "netsync.cmd.data.id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "ID", HFILL } },
+		{ &hf_netsync_cmd_data_compressed,
+			{ "Compressed", "netsync.cmd.data.compressed",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Compressed", HFILL } },
+		{ &hf_netsync_cmd_data_payload,
+			{ "Payload", "netsync.cmd.data.payload",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Payload", HFILL } },
+		{ &hf_netsync_cmd_delta_type,
+			{ "Type", "netsync.cmd.delta.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } },
+		{ &hf_netsync_cmd_delta_base_id,
+			{ "Base ID", "netsync.cmd.delta.base_id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Base ID", HFILL } },
+		{ &hf_netsync_cmd_delta_ident_id,
+			{ "Ident ID", "netsync.cmd.delta.ident_id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Ident ID", HFILL } },
+		{ &hf_netsync_cmd_delta_compressed,
+			{ "Compressed", "netsync.cmd.delta.compressed",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Compressed", HFILL } },
+		{ &hf_netsync_cmd_delta_payload,
+			{ "Payload", "netsync.cmd.delta.payload",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Payload", HFILL } },
+		{ &hf_netsync_cmd_refine_tree_node,
+			{ "Tree Node", "netsync.cmd.refine.tree_node",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Tree Node", HFILL } },
+		{ &hf_netsync_cmd_send_delta_type,
+			{ "Type", "netsync.cmd.send_delta.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } },
+		{ &hf_netsync_cmd_send_delta_base_id,
+			{ "Base ID", "netsync.cmd.send_delta.base_id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Base ID", HFILL } },
+		{ &hf_netsync_cmd_send_delta_ident_id,
+			{ "Ident ID", "netsync.cmd.send_delta.ident_id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "Ident ID", HFILL } },
+		{ &hf_netsync_cmd_nonexistant_id,
+			{ "ID", "netsync.cmd.nonexistant.id",
+			  FT_BYTES, BASE_DEC, NULL, 0x0,
+			  "ID", HFILL } },
+		{ &hf_netsync_cmd_nonexistant_type,
+			{ "Type", "netsync.cmd.nonexistant.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } },
+		{ &hf_netsync_cmd_done_type,
+			{ "Type", "netsync.cmd.done.type",
+			  FT_UINT8, BASE_DEC, NULL, 0x0,
+			  "Type", HFILL } }
+
+
+	};
+
+	static gint *ett[] = {
+		&ett_netsync,
+	};
+
+	module_t *netsync_module;
+
+	proto_netsync = proto_register_protocol("Monotone Netsync", "Netsync", "netsync");
+	proto_register_field_array(proto_netsync, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
+	netsync_module = prefs_register_protocol(proto_netsync,
+						proto_reg_handoff_netsync);
+
+	prefs_register_uint_preference(netsync_module, "tcp_port",
+					"Monotone Netsync TCP Port",
+					"The TCP port on which Monotone Netsync packets will be sent",
+					10, &global_tcp_port_netsync);
+
+
+	prefs_register_bool_preference(netsync_module, "desegment_netsync_messages",
+		"Reassemble Netsync messages spanning multiple TCP segments",
+		"Whether the Netsync 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.",
+		&netsync_desegment);
+
+}
+
+/* The registration hand-off routing */
+void
+proto_reg_handoff_netsync(void) {
+	static int netsync_initialized = FALSE;
+	static dissector_handle_t netsync_handle;
+
+
+	if (!netsync_initialized) {
+		netsync_handle = create_dissector_handle(dissect_netsync, proto_netsync);
+		netsync_initialized = TRUE;
+	} else {
+		dissector_delete("tcp.port",tcp_port_netsync, netsync_handle);
+	}
+
+	tcp_port_netsync = global_tcp_port_netsync;  
+
+	dissector_add("tcp.port", global_tcp_port_netsync, netsync_handle);
+}
+
+/* Start the functions we need for the plugin stuff */
+
+#ifndef ENABLE_STATIC
+
+G_MODULE_EXPORT void
+plugin_register(void)
+{
+	/* register the new protocol, protocol fields, and subtrees */
+	if (proto_netsync == -1) { /* execute protocol initialization only once */
+		proto_register_netsync();
+	}
+}
+
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+	proto_reg_handoff_netsync();
+}
+
+#endif
+
+/* End the functions we need for plugin stuff */
+
Index: plugins/monotone/Makefile.am
===================================================================
--- plugins/monotone/Makefile.am	(revision 0)
+++ plugins/monotone/Makefile.am	(revision 0)
@@ -0,0 +1,44 @@
+# Makefile.am
+# Automake file for Ethereal/ENTTEC
+#
+# $Id: Makefile.am 11400 2004-07-18 00:24:25Z guy $
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@xxxxxxxxxxxx>
+# Copyright 1998 Gerald Combs
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+INCLUDES = -I$(top_srcdir)
+
+plugindir = @plugindir@
+
+plugin_LTLIBRARIES = monotone.la
+monotone_la_SOURCES = packet-netsync.c moduleinfo.h
+monotone_la_LDFLAGS = -module -avoid-version
+monotone_la_LIBADD = @PLUGIN_LIBS@
+
+# Libs must be cleared, or else libtool won't create a shared module.
+# If your module needs to be linked against any particular libraries,
+# add them here.
+LIBS =
+
+CLEANFILES = \
+	monotone \
+	*~
+
+EXTRA_DIST = \
+	Makefile.nmake
Index: plugins/monotone/NEWS
===================================================================
Index: plugins/Makefile.nmake
===================================================================
--- plugins/Makefile.nmake	(revision 14112)
+++ plugins/Makefile.nmake	(working copy)
@@ -6,7 +6,7 @@
 
 ############### no need to modify below this line #########
 
-all: acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
+all: acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp monotone opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
 
 acn:: 
 	cd acn
@@ -77,6 +77,12 @@
 	cd mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd .. 
+
+monotone::
+	cd monotone
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd .. 
+
 opsi::
 	cd opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -151,6 +157,8 @@
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../monotone
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../pcli
@@ -200,6 +208,8 @@
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../monotone
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../pcli
@@ -249,6 +259,8 @@
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ../monotone
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../opsi
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../pcli
Index: plugins/Makefile.am
===================================================================
--- plugins/Makefile.am	(revision 14112)
+++ plugins/Makefile.am	(working copy)
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
+SUBDIRS = acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp monotone opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
 
 plugindir = @plugindir@