diff options
80 files changed, 660 insertions, 660 deletions
diff --git a/epan/dfilter/README.dfilter b/epan/dfilter/README.dfilter index 4c2cb69cf9..4c2cb69cf9 100755..100644 --- a/epan/dfilter/README.dfilter +++ b/epan/dfilter/README.dfilter diff --git a/epan/dissectors/dcerpc/atsvc/Makefile b/epan/dissectors/dcerpc/atsvc/Makefile index adbd8357c6..63b5968e6d 100644 --- a/epan/dissectors/dcerpc/atsvc/Makefile +++ b/epan/dissectors/dcerpc/atsvc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-atsvc.c packet-dcerpc-atsvc.h diff --git a/epan/dissectors/dcerpc/atsvc/template.c b/epan/dissectors/dcerpc/atsvc/template.c index 08cddffe08..f5ee87f699 100755..100644 --- a/epan/dissectors/dcerpc/atsvc/template.c +++ b/epan/dissectors/dcerpc/atsvc/template.c @@ -8,7 +8,7 @@ * * Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr> * and IDL file from samba 4 * - * $Id: packet-dcerpc-atsvc.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/atsvc/template.h b/epan/dissectors/dcerpc/atsvc/template.h index 600b5a7eb1..bc95fab073 100755..100644 --- a/epan/dissectors/dcerpc/atsvc/template.h +++ b/epan/dissectors/dcerpc/atsvc/template.h @@ -5,7 +5,7 @@ /* packet-dcerpc-atsvc.h * Routines for ATSVC packet disassembly * - * $Id: packet-dcerpc-atsvc.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/budb/Makefile b/epan/dissectors/dcerpc/budb/Makefile index 1b9b555846..6941e36764 100644 --- a/epan/dissectors/dcerpc/budb/Makefile +++ b/epan/dissectors/dcerpc/budb/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-budb.c packet-dcerpc-budb.h diff --git a/epan/dissectors/dcerpc/budb/budb.cnf b/epan/dissectors/dcerpc/budb/budb.cnf index c99e8f47cb..c99e8f47cb 100755..100644 --- a/epan/dissectors/dcerpc/budb/budb.cnf +++ b/epan/dissectors/dcerpc/budb/budb.cnf diff --git a/epan/dissectors/dcerpc/budb/budb.idl b/epan/dissectors/dcerpc/budb/budb.idl index 0af9d5e6f3..0af9d5e6f3 100755..100644 --- a/epan/dissectors/dcerpc/budb/budb.idl +++ b/epan/dissectors/dcerpc/budb/budb.idl diff --git a/epan/dissectors/dcerpc/budb/template.c b/epan/dissectors/dcerpc/budb/template.c index 0386893a8e..0c1edc9787 100755..100644 --- a/epan/dissectors/dcerpc/budb/template.c +++ b/epan/dissectors/dcerpc/budb/template.c @@ -6,7 +6,7 @@ * Routines for BUDB packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-budb.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/budb/template.h b/epan/dissectors/dcerpc/budb/template.h index 99eb800220..d0059850c9 100755..100644 --- a/epan/dissectors/dcerpc/budb/template.h +++ b/epan/dissectors/dcerpc/budb/template.h @@ -5,7 +5,7 @@ /* packet-dcerpc-budb.h * Routines for BUDB packet disassembly * - * $Id: packet-dcerpc-budb.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/butc/Makefile b/epan/dissectors/dcerpc/butc/Makefile index e9d10548da..9780e3277a 100644 --- a/epan/dissectors/dcerpc/butc/Makefile +++ b/epan/dissectors/dcerpc/butc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-butc.c packet-dcerpc-butc.h diff --git a/epan/dissectors/dcerpc/butc/template.c b/epan/dissectors/dcerpc/butc/template.c index f9343970e3..5f84bedbdf 100644 --- a/epan/dissectors/dcerpc/butc/template.c +++ b/epan/dissectors/dcerpc/butc/template.c @@ -5,7 +5,7 @@ /* packet-dcerpc-butc.c * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/butc/template.h b/epan/dissectors/dcerpc/butc/template.h index fc0dec6f15..9bc9698aba 100644 --- a/epan/dissectors/dcerpc/butc/template.h +++ b/epan/dissectors/dcerpc/butc/template.h @@ -4,7 +4,7 @@ /* packet-dcerpc-butc.h * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/drsuapi/Makefile b/epan/dissectors/dcerpc/drsuapi/Makefile index 058a1713dd..e7399a5363 100644 --- a/epan/dissectors/dcerpc/drsuapi/Makefile +++ b/epan/dissectors/dcerpc/drsuapi/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-drsuapi.c packet-dcerpc-drsuapi.h diff --git a/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf b/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf index 41491c3ec1..41491c3ec1 100755..100644 --- a/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf +++ b/epan/dissectors/dcerpc/drsuapi/drsuapi.cnf diff --git a/epan/dissectors/dcerpc/drsuapi/template.c b/epan/dissectors/dcerpc/drsuapi/template.c index 4465106c60..98e121a440 100755..100644 --- a/epan/dissectors/dcerpc/drsuapi/template.c +++ b/epan/dissectors/dcerpc/drsuapi/template.c @@ -6,7 +6,7 @@ * Routines for DRSUAPI packet disassembly * ronnie sahlberg 2005 * - * $Id: packet-dcerpc-drsuapi.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/drsuapi/template.h b/epan/dissectors/dcerpc/drsuapi/template.h index 1b5ee9a58e..ba12115e11 100755..100644 --- a/epan/dissectors/dcerpc/drsuapi/template.h +++ b/epan/dissectors/dcerpc/drsuapi/template.h @@ -5,7 +5,7 @@ /* packet-dcerpc-drsuapi.h * Routines for DRSUAPI packet disassembly * - * $Id: packet-dcerpc-drsuapi.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/dssetup/Makefile b/epan/dissectors/dcerpc/dssetup/Makefile index 67904dba06..9d426306c9 100644 --- a/epan/dissectors/dcerpc/dssetup/Makefile +++ b/epan/dissectors/dcerpc/dssetup/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-dssetup.c packet-dcerpc-dssetup.h diff --git a/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.c b/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.c index cea792ee80..95a70eac88 100644 --- a/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.c +++ b/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.c @@ -7,7 +7,7 @@ * ronnie sahlberg 2005 * Autogenerated based on the IDL definitions from samba 4 * - * $Id: packet-dcerpc-dssetup.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.h b/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.h index 1040ba28a4..b9cfd25987 100644 --- a/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.h +++ b/epan/dissectors/dcerpc/dssetup/packet-dcerpc-dssetup.h @@ -6,7 +6,7 @@ /* packet-dcerpc-dssetup.h * Routines for DSSETUP packet disassembly * - * $Id: packet-dcerpc-dssetup.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/dssetup/template.c b/epan/dissectors/dcerpc/dssetup/template.c index 0cb823684d..0d885532fb 100755..100644 --- a/epan/dissectors/dcerpc/dssetup/template.c +++ b/epan/dissectors/dcerpc/dssetup/template.c @@ -7,7 +7,7 @@ * ronnie sahlberg 2005 * Autogenerated based on the IDL definitions from samba 4 * - * $Id: packet-dcerpc-dssetup.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/dssetup/template.h b/epan/dissectors/dcerpc/dssetup/template.h index 8ef6c55af6..2dd3862274 100755..100644 --- a/epan/dissectors/dcerpc/dssetup/template.h +++ b/epan/dissectors/dcerpc/dssetup/template.h @@ -6,7 +6,7 @@ /* packet-dcerpc-dssetup.h * Routines for DSSETUP packet disassembly * - * $Id: packet-dcerpc-dssetup.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/efs/Makefile b/epan/dissectors/dcerpc/efs/Makefile index 8e728d1f51..69ba297866 100644 --- a/epan/dissectors/dcerpc/efs/Makefile +++ b/epan/dissectors/dcerpc/efs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 13071 2005-01-16 10:19:21Z guy $ +# $Id$ DISSECTOR_FILES=packet-dcerpc-efs.c packet-dcerpc-efs.h diff --git a/epan/dissectors/dcerpc/efs/template.c b/epan/dissectors/dcerpc/efs/template.c index 734e5025e1..5b948bfb09 100755..100644 --- a/epan/dissectors/dcerpc/efs/template.c +++ b/epan/dissectors/dcerpc/efs/template.c @@ -8,7 +8,7 @@ * Autogenerated based on the IDL definitions by * Jean-Baptiste Marchand * - * $Id: packet-dcerpc-efs.c 11592 2004-08-03 02:28:49Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/dcerpc/efs/template.h b/epan/dissectors/dcerpc/efs/template.h index 901aac4094..d86cbdb3d5 100755..100644 --- a/epan/dissectors/dcerpc/efs/template.h +++ b/epan/dissectors/dcerpc/efs/template.h @@ -7,7 +7,7 @@ /* packet-dcerpc-efs.h * Routines for EFS packet disassembly * - * $Id: packet-dcerpc-efs.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/make-reg-dotc b/epan/dissectors/make-reg-dotc index a90019af05..a90019af05 100755..100644 --- a/epan/dissectors/make-reg-dotc +++ b/epan/dissectors/make-reg-dotc diff --git a/epan/dissectors/make-reg-dotc.py b/epan/dissectors/make-reg-dotc.py index 0ce7ed6029..0ce7ed6029 100755..100644 --- a/epan/dissectors/make-reg-dotc.py +++ b/epan/dissectors/make-reg-dotc.py diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py index 5e156ccf62..5e156ccf62 100755..100644 --- a/epan/dissectors/ncp2222.py +++ b/epan/dissectors/ncp2222.py diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index a09dfa5f16..b2e7080a81 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -2,7 +2,7 @@ * Routines for the Armagetronad packet dissection * Copyright 2005, Guillaume Chazarain <guichaz@yahoo.fr> * - * $Id: README.developer 13227 2005-02-01 15:45:03Z jmayer $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h index 72e9541f33..60545e0536 100755..100644 --- a/epan/dissectors/packet-bacapp.h +++ b/epan/dissectors/packet-bacapp.h @@ -2,7 +2,7 @@ * Routines for BACnet (APDU) dissection * Copyright 2004, Herbert Lischka <lischka@kieback-peter.de>, Berlin * - * $Id: packet-bacapp.h,v 1.00 2004/03/11 17:50:07 Lka Exp $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index d7bb4b8aa7..d6fa986f7e 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -9,7 +9,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip-template.c 12245 2004-10-08 20:28:04Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 0409b11988..8c0f9e7a53 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -9,7 +9,7 @@ * Routines for X.711 CMIP packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmip-template.h 12203 2004-10-05 09:18:55Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index b8fb8dceb1..e44b40ee0a 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -9,7 +9,7 @@ * Routines for RFC2510 Certificate Management Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmp-template.c 12740 2004-12-13 08:15:34Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index cc80c98395..f1a421bbd4 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -9,7 +9,7 @@ * Routines for RFC2510 Certificate Management Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cmp-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 62278b0b1f..deaba2d860 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -9,7 +9,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf-template.c 12740 2004-12-13 08:15:34Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index 0f97f48535..b9cb15f1c8 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -9,7 +9,7 @@ * Routines for RFC2511 Certificate Request Message Format packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-crmf-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-dcerpc-budb.h b/epan/dissectors/packet-dcerpc-budb.h index 6673653b40..931df0cab5 100644 --- a/epan/dissectors/packet-dcerpc-budb.h +++ b/epan/dissectors/packet-dcerpc-budb.h @@ -5,7 +5,7 @@ /* packet-dcerpc-budb.h * Routines for BUDB packet disassembly * - * $Id: packet-dcerpc-budb.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-dcerpc-butc.h b/epan/dissectors/packet-dcerpc-butc.h index 4dd0cc0aad..2dfb4fdb7e 100644 --- a/epan/dissectors/packet-dcerpc-butc.h +++ b/epan/dissectors/packet-dcerpc-butc.h @@ -4,7 +4,7 @@ /* packet-dcerpc-butc.h * Routines for BUTC packet disassembly * - * $Id: packet-dcerpc-butc.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-dcerpc-dssetup.h b/epan/dissectors/packet-dcerpc-dssetup.h index 1040ba28a4..b9cfd25987 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.h +++ b/epan/dissectors/packet-dcerpc-dssetup.h @@ -6,7 +6,7 @@ /* packet-dcerpc-dssetup.h * Routines for DSSETUP packet disassembly * - * $Id: packet-dcerpc-dssetup.h 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index cbf32620d7..03fc21aac0 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -6,7 +6,7 @@ * Copyright 2003-2005 Fred Hoekstra, Philips Medical Systems. * (fred.hoekstra@philips.com) * - * $Id: packet-dec-dnart.c 14135 2005-07-25 12:05:50Z fhoekstra $ + * $Id$ * * Use was made of the following documentation: * (See URL http://linux-decnet.sourceforge.net/docs). diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index 292aa7b882..1337b2290a 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -9,7 +9,7 @@ * * Copyright 2005, Michael Tuexen <tuexen [AT] fh-muenster.de> * - * $Id: packet-dua.c 12115 2004-09-27 22:55:15Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 8da379d1d9..a5df540ded 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -9,7 +9,7 @@ * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ess-template.c 12438 2004-10-30 02:36:58Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h index 1e3815f4f4..32ebe386d3 100644 --- a/epan/dissectors/packet-ess.h +++ b/epan/dissectors/packet-ess.h @@ -9,7 +9,7 @@ * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-ess-template.h 12437 2004-10-30 02:18:44Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 84099c67df..190692cc3d 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -9,7 +9,7 @@ * Routines for H.248/MEGACO packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-h248-template.h 12203 2004-10-05 09:18:55Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-h248_package_bcp.c b/epan/dissectors/packet-h248_package_bcp.c index a33d30e40c..58d6ebce57 100644 --- a/epan/dissectors/packet-h248_package_bcp.c +++ b/epan/dissectors/packet-h248_package_bcp.c @@ -9,7 +9,7 @@ * Routines for H.248/MEGACO-Package_bcp packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-h248_package_bcp-template.c 12205 2004-10-05 09:50:19Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-h248_package_bcp.h b/epan/dissectors/packet-h248_package_bcp.h index 4f1e1e009b..cbf4dce717 100644 --- a/epan/dissectors/packet-h248_package_bcp.h +++ b/epan/dissectors/packet-h248_package_bcp.h @@ -9,7 +9,7 @@ * Routines for H.248/MEGACO-Package-bcp packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-h248_package_bcp-template.h 12203 2004-10-05 09:18:55Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 363c833285..2efcf4b5b1 100755..100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -8,7 +8,7 @@ * Significantly based on packet-fcip.c by * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-ifcp.c 14796 2005-06-27 08:27:49Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 602659a718..16544daa17 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -3,7 +3,7 @@ * * Ronnie Sahlberg 2004 * - * $Id: packet-kerberos4.c 11410 2004-07-18 18:06:47Z gram $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index c93ac65c07..f0c0b9b41e 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -9,7 +9,7 @@ * Routines for RFC3709 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotype-cert-extn-template.c 12438 2004-10-30 02:36:58Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index cc367ebb63..42e64fef5a 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -9,7 +9,7 @@ * Routines for RFC3907 Logotype Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-logotype-cert-extn-template.h 12437 2004-10-30 02:18:44Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index b733ffb18a..c6111ff8de 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -9,7 +9,7 @@ * * Ronnie Sahlberg 2005 * - * $Id: packet-mms-template.c 13967 2005-03-29 14:56:09Z gerald $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index efe3e8c22e..177bad4340 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -9,7 +9,7 @@ * Routines for MMS packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-mms-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 1e135ae872..7422ba764d 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -1,7 +1,7 @@ /* packet-netsync.c * Routines for Monotone Netsync packet disassembly * - * $Id: packet-enttec.c 13644 2005-03-07 02:44:41Z guy $ + * $Id$ * * Copyright (c) 2005 by Erwin Rol <erwin@erwinrol.com> * diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index 62c3367f1b..64d0903c98 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -4,7 +4,7 @@ * Original Author Mark C. Brown <mbrown@hp.com> * Copyright (C) 2005 Hewlett-Packard Development Company, L.P. * - * $Id: packet-nettl.c $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 75dd4dcb94..4be6beb582 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -8,7 +8,7 @@ /* packet-ns_cert_exts.c * Routines for NetScape Certificate Extensions packet dissection * - * $Id: packet-ns_cert_exts-template.c 12395 2004-10-26 14:02:02Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 19ba8f69a4..4b2dc26b65 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -9,7 +9,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1-template.c 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index 36ece89466..45fade9beb 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -9,7 +9,7 @@ * Routines for PKCS#1/RFC2313 packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkcs1-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index cec778a92e..31495b6033 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -9,7 +9,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit-template.c 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h index 0daba26cca..ec5f8bc65d 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -9,7 +9,7 @@ * Routines for PKINIT packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkinit-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 6517cd20b0..0f025cfeae 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -8,7 +8,7 @@ /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * - * $Id: packet-pkix1implicit-template.c 12827 2004-12-24 12:22:52Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 9f7869b2ea..511d04fafd 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -8,7 +8,7 @@ /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * - * $Id: packet-pkix1implicit-template.h 12827 2004-12-24 12:22:52Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 8d1d995fcb..fb65a2bca5 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -9,7 +9,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy-template.c 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index 316fb1f953..4f90d51fbe 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -9,7 +9,7 @@ * Routines for RFC3820 PKIXProxy packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixproxy-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 9220a1c28b..f9f9fe556b 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -9,7 +9,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified-template.c 12434 2004-10-29 12:11:42Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h index 09619b5dda..40118c05aa 100644 --- a/epan/dissectors/packet-pkixqualified.h +++ b/epan/dissectors/packet-pkixqualified.h @@ -9,7 +9,7 @@ * Routines for RFC3739 PKIXqualified packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixqualified-template.h 12434 2004-10-29 12:11:42Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 5e0b352b21..7cd80aab3c 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -9,7 +9,7 @@ * Routines for RFC2634 Extended Security Services packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp-template.c 12438 2004-10-30 02:36:58Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h index 31f051536d..6f2723a9bc 100644 --- a/epan/dissectors/packet-pkixtsp.h +++ b/epan/dissectors/packet-pkixtsp.h @@ -9,7 +9,7 @@ * Routines for RFC3161 Time-Stamp Protocol packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-pkixtsp-template.h 12437 2004-10-30 02:18:44Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 9d699fd735..54044459c4 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -1,584 +1,584 @@ -/* packet-synergy.c
- * Routines for synergy dissection
- * Copyright 2005, Vasanth Manickam <vasanthm@gmail.com>
- *
- * $Id: $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include <epan/packet.h>
-#include <epan/prefs.h>
-
-
-
-void proto_reg_handoff_synergy(void);
-
-
-static int proto_synergy = -1;
-
-static int hf_synergy_unknown = -1;
-static int hf_synergy_handshake = -1;
-static int hf_synergy_handshake_majorversion = -1;
-static int hf_synergy_handshake_minorversion = -1;
-static int hf_synergy_handshake_clientname = -1;
-
-static int hf_synergy_cnop = -1;
-
-static int hf_synergy_cbye = -1;
-
-static int hf_synergy_cinn = -1;
-static int hf_synergy_cinn_x = -1;
-static int hf_synergy_cinn_y = -1;
-static int hf_synergy_cinn_sequence = -1;
-static int hf_synergy_cinn_modifiermask = -1;
-
-static int hf_synergy_cout = -1;
-
-static int hf_synergy_cclp = -1;
-static int hf_synergy_cclp_clipboardidentifier = -1;
-static int hf_synergy_cclp_sequencenumber = -1;
-
-static int hf_synergy_csec = -1;
-
-static int hf_synergy_crop = -1;
-
-static int hf_synergy_ciak = -1;
-
-static int hf_synergy_dkdn = -1;
-static int hf_synergy_dkdn_keyid = -1;
-static int hf_synergy_dkdn_keymodifiermask = -1;
-static int hf_synergy_dkdn_keybutton = -1;
-
-static int hf_synergy_dkrp = -1;
-static int hf_synergy_dkrp_keyid = -1;
-static int hf_synergy_dkrp_keymodifiermask = -1;
-static int hf_synergy_dkrp_numberofrepeats = -1;
-static int hf_synergy_dkrp_keybutton = -1;
-
-static int hf_synergy_dkup = -1;
-static int hf_synergy_dkup_keyid = -1;
-static int hf_synergy_dkup_keymodifiermask = -1;
-static int hf_synergy_dkup_keybutton = -1;
-
-static int hf_synergy_dmdn = -1;
-static int hf_synergy_dmup = -1;
-
-static int hf_synergy_dmmv = -1;
-static int hf_synergy_dmmv_x = -1;
-static int hf_synergy_dmmv_y = -1;
-
-static int hf_synergy_dmrm = -1;
-static int hf_synergy_dmrm_x = -1;
-static int hf_synergy_dmrm_y = -1;
-
-static int hf_synergy_dmwm = -1;
-
-static int hf_synergy_dclp = -1;
-static int hf_synergy_dclp_clipboardidentifier = -1;
-static int hf_synergy_dclp_sequencenumber = -1;
-static int hf_synergy_dclp_clipboarddata = -1;
-
-static int hf_synergy_dinf = -1;
-static int hf_synergy_dinf_clp = -1;
-static int hf_synergy_dinf_ctp= -1;
-static int hf_synergy_dinf_wsp = -1;
-static int hf_synergy_dinf_hsp = -1;
-static int hf_synergy_dinf_swz = -1;
-static int hf_synergy_dinf_x = -1;
-static int hf_synergy_dinf_y = -1;
-
-static int hf_synergy_dsop = -1;
-
-static int hf_synergy_qinf = -1;
-
-static int hf_synergy_eicv = -1;
-static int hf_synergy_eicv_majorversion = -1;
-static int hf_synergy_eicv_minorversion = -1;
-
-static int hf_synergy_ebsy = -1;
-
-static int hf_synergy_eunk = -1;
-
-static int hf_synergy_ebad = -1;
-
-/* Initialize the subtree pointers */
-static gint ett_synergy = -1;
-
-static void dissect_synergy_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_cinn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_cclp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dkdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dkrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dkup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dmmv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dmrm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dclp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_dinf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-static void dissect_synergy_eicv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset);
-
-
-/* Code to actually dissect the packets */
-static void
-dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-
- if(check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "synergy");
-
- if (tree) {
- gint offset=0;
- char buffer[20];
- proto_item *ti = NULL;
- proto_tree *synergy_tree = NULL;
- ti = proto_tree_add_protocol_format(tree, proto_synergy, tvb, 0, -1,"Synergy Protocol");
- synergy_tree = proto_item_add_subtree(ti, ett_synergy);
-
- tvb_get_nstringz(tvb,offset+4,20,buffer);
-
- if(strncmp(buffer,"Synergy",7)==0)
- dissect_synergy_handshake(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"CNOP",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_cnop,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"CBYE",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_cbye,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"CINN",4)==0)
- dissect_synergy_cinn(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"COUT",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_cout,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"CCLP",4)==0)
- dissect_synergy_cclp(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"CSEC",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_csec,tvb,offset+4,1,FALSE);
- else if(strncmp(buffer,"CROP",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"CIAK",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_ciak,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"DKDN",4)==0)
- dissect_synergy_dkdn(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DKRP",4)==0)
- dissect_synergy_dkrp(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DKUP",4)==0)
- dissect_synergy_dkup(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DMDN",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_dmdn,tvb,offset+4,1,FALSE);
- else if(strncmp(buffer,"DMUP",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_dmup,tvb,offset+4,1,FALSE);
- else if(strncmp(buffer,"DMMV",4)==0)
- dissect_synergy_dmmv(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DMRM",4)==0)
- dissect_synergy_dmrm(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DMWM",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_dmwm,tvb,offset+4,2,FALSE);
- else if(strncmp(buffer,"DCLP",4)==0)
- dissect_synergy_dclp(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DINF",4)==0)
- dissect_synergy_dinf(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"DSOP",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_dsop,tvb,offset+4,4,FALSE);
- else if(strncmp(buffer,"QINF",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_qinf,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"EICV",4)==0)
- dissect_synergy_eicv(tvb,pinfo,synergy_tree,offset+4);
- else if(strncmp(buffer,"EBSY",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_ebsy,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"EUNK",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_eunk,tvb,offset+4,-1,FALSE);
- else if(strncmp(buffer,"EBAD",4)==0)
- proto_tree_add_item(synergy_tree,hf_synergy_ebad,tvb,offset+4,-1,FALSE);
- else
- proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+4,-1,FALSE);
- }
-}
-
-static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_handshake, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_handshake_majorversion, tvb, offset + 7, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_handshake_minorversion, tvb, offset + 9, 2, FALSE);
-
- if (tvb_length_remaining(tvb, offset + 11) != 0)
- {
- proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 11, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 15, -1, FALSE);
- }
-}
-
-static void dissect_synergy_cinn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_cinn, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_cinn_x, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_cinn_y, tvb, offset + 6, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_cinn_sequence, tvb, offset + 8, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_cinn_modifiermask, tvb, offset + 12, 2, FALSE);
-}
-
-static void dissect_synergy_cclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_cclp, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_cclp_clipboardidentifier, tvb, offset + 4, 1, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_cclp_sequencenumber, tvb, offset + 5, 4, FALSE);
-}
-
-static void dissect_synergy_dkdn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dkdn, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dkdn_keyid, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dkdn_keymodifiermask, tvb, offset + 6, 2, FALSE);
-
- if (tvb_length_remaining(tvb, offset + 8) != 0)
- proto_tree_add_item(sub_tree, hf_synergy_dkdn_keybutton, tvb, offset + 8, 2, FALSE);
-}
-
-static void dissect_synergy_dkrp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dkrp, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dkrp_keyid, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dkrp_keymodifiermask, tvb, offset + 6, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dkrp_numberofrepeats, tvb, offset + 8, 2, FALSE);
-
- if (tvb_length_remaining(tvb, offset + 10) != 0)
- proto_tree_add_item(sub_tree, hf_synergy_dkrp_keybutton, tvb, offset + 10, 2, FALSE);
-}
-
-static void dissect_synergy_dkup( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dkup, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dkup_keyid, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dkup_keymodifiermask, tvb, offset + 6, 2, FALSE);
-
- if (tvb_length_remaining(tvb, offset + 8) != 0)
- proto_tree_add_item(sub_tree, hf_synergy_dkup_keybutton, tvb, offset + 8, 2, FALSE);
-}
-
-static void dissect_synergy_dmmv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dmmv, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dmmv_x, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dmmv_y, tvb, offset + 6, 2, FALSE);
-}
-
-static void dissect_synergy_dmrm( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dmrm, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dmrm_x, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dmrm_y, tvb, offset + 6, 2, FALSE);
-}
-
-static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dclp, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 5, 4, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 9, -1, FALSE);
-}
-
-static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_dinf, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_dinf_clp, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_ctp, tvb, offset + 6, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_wsp, tvb, offset + 8, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_hsp, tvb, offset + 10, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_swz, tvb, offset + 12, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_x, tvb, offset + 14, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_dinf_y, tvb, offset + 16, 2, FALSE);
-}
-
-static void dissect_synergy_eicv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset )
-{
- proto_item *ti = NULL;
- proto_tree *sub_tree = NULL;
- ti = proto_tree_add_item(tree, hf_synergy_eicv, tvb, offset, -1, FALSE);
- sub_tree = proto_item_add_subtree(ti, ett_synergy);
-
- proto_tree_add_item(sub_tree, hf_synergy_eicv_majorversion, tvb, offset + 4, 2, FALSE);
- proto_tree_add_item(sub_tree, hf_synergy_eicv_minorversion, tvb, offset + 6, 2, FALSE);
-}
-
-
-void
-proto_register_synergy(void)
-{
- static hf_register_info hf[] = {
-
- { &hf_synergy_unknown,
- { "unknown","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_handshake,
- { "Handshake","synergy.handshake",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_handshake_majorversion,
- { "Major Version","synergy.handshake.majorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_handshake_minorversion,
- { "Minor Version","synergy.handshake.minorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_handshake_clientname,
- { "Client Name","synergy.handshake.client",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cnop,
- { "No Operation","synergy.cnop",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cbye,
- { "Close Connection","synergy.cbye",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cinn,
- { "Enter Screen","synergy.cinn",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cinn_x,
- { "Screen X","synergy.cinn.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cinn_y,
- { "Screen Y","synergy.cinn.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cinn_sequence,
- { "Sequence Number","synergy.cinn.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cinn_modifiermask,
- { "Modifier Key Mask","synergy.cinn.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cout,
- { "Leave Screen","synergy.cout",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cclp,
- { "Grab Clipboard","synergy.clipboard",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cclp_clipboardidentifier,
- { "Identifier","synergy.clipboard.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_cclp_sequencenumber,
- { "Sequence Number","synergy.clipboard.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_csec,
- { "Screen Saver Change","synergy.screensaver",FT_BOOLEAN, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_crop,
- { "Reset Options","synergy.resetoptions",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_ciak,
- { "resolution change acknowledgment","synergy.ack",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkdn,
- { "Key Pressed","synergy.keypressed",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkdn_keyid,
- { "Key Id","synergy.keypressed.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkdn_keymodifiermask,
- { "Key Modifier Mask","synergy.keypressed.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkdn_keybutton,
- { "Key Button","synergy.keypressed.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkrp,
- { "key auto-repeat","synergy.keyautorepeat",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkrp_keyid,
- { "Key ID","synergy.keyautorepeat.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkrp_keymodifiermask,
- { "Key modifier Mask","synergy.keyautorepeat.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkrp_numberofrepeats,
- { "Number of Repeats","synergy.keyautorepeat.repeat",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkrp_keybutton,
- { "Key Button","synergy.keyautorepeat.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkup,
- { "key released","synergy.keyreleased",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkup_keyid,
- { "Key Id","synergy.keyreleased.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkup_keymodifiermask,
- { "Key Modifier Mask","synergykeyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dkup_keybutton,
- { "Key Button","synergy.keyreleased.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmdn,
- { "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmup,
- { "Mouse Button Released","synergy.mousebuttonreleased",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmmv,
- { "Mouse Moved","synergy.mousemoved",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmmv_x,
- { "X Axis","synergy.mousemoved.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmmv_y,
- { "Y Axis","synergy.mousemoved.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmrm,
- { "Relative Mouse Move","synergy.relativemousemove",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmrm_x,
- { "X Axis","synergy.relativemousemove.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmrm_y,
- { "Y Axis","synergy.relativemousemove.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dmwm,
- { "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dclp,
- { "Clipboard Data","synergy.clipboarddata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dclp_clipboardidentifier,
- { "Clipboard Identifier","synergy.clipboarddata.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dclp_sequencenumber,
- { "Sequence Number","synergy.clipboarddata.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dclp_clipboarddata,
- { "Clipboard Data","synergy.clipboarddata.data",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf,
- { "Client Data","synergy.clientdata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_clp,
- { "coordinate of leftmost pixel on secondary screen","synergy.clps",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_ctp,
- { "coordinate of topmost pixel on secondary screen","synergy.clps.ctp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_wsp,
- { "width of secondary screen in pixels","synergy.clps.wsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_hsp,
- { "height of secondary screen in pixels","synergy.clps.hsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_swz,
- { "size of warp zone","synergy.clps.swz",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_x,
- { "x position of the mouse on the secondary screen","synergy.clps.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dinf_y,
- { "y position of the mouse on the secondary screen","synergy.clps.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_dsop,
- { "Set Options","synergy.setoptions",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_qinf,
- { "Query Screen Info","synergy.qinf",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_eicv,
- { "incompatible versions","synergy.eicv",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_eicv_majorversion,
- { "Major Version Number","synergy.eicv.major",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_eicv_minorversion,
- { "Minor Version Number","synergy.eicv.minor",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_ebsy,
- { "Connection Already in Use","synergy.ebsy",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_eunk,
- { "Unknown Client","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- { &hf_synergy_ebad,
- { "protocol violation","synergy.violation",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
- },
- };
-
-
-/* Setup protocol subtree array */
- static gint *ett[] = {
- &ett_synergy,
- };
-
-/* Register the protocol name and description */
- proto_synergy = proto_register_protocol("Synergy",
- "Synergy", "synergy");
-
-/* Required function calls to register the header fields and subtrees used */
- proto_register_field_array(proto_synergy, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
- register_dissector("synergy", dissect_synergy, proto_synergy);
-
-}
-
-
-
-
-void
-proto_reg_handoff_synergy(void)
-{
-
- dissector_handle_t synergy_handle;
- synergy_handle = find_dissector("synergy");
- dissector_add("tcp.port",24800, synergy_handle);
-}
+/* packet-synergy.c + * Routines for synergy dissection + * Copyright 2005, Vasanth Manickam <vasanthm@gmail.com> + * + * $Id$ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * 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. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <glib.h> + +#include <epan/packet.h> +#include <epan/prefs.h> + + + +void proto_reg_handoff_synergy(void); + + +static int proto_synergy = -1; + +static int hf_synergy_unknown = -1; +static int hf_synergy_handshake = -1; +static int hf_synergy_handshake_majorversion = -1; +static int hf_synergy_handshake_minorversion = -1; +static int hf_synergy_handshake_clientname = -1; + +static int hf_synergy_cnop = -1; + +static int hf_synergy_cbye = -1; + +static int hf_synergy_cinn = -1; +static int hf_synergy_cinn_x = -1; +static int hf_synergy_cinn_y = -1; +static int hf_synergy_cinn_sequence = -1; +static int hf_synergy_cinn_modifiermask = -1; + +static int hf_synergy_cout = -1; + +static int hf_synergy_cclp = -1; +static int hf_synergy_cclp_clipboardidentifier = -1; +static int hf_synergy_cclp_sequencenumber = -1; + +static int hf_synergy_csec = -1; + +static int hf_synergy_crop = -1; + +static int hf_synergy_ciak = -1; + +static int hf_synergy_dkdn = -1; +static int hf_synergy_dkdn_keyid = -1; +static int hf_synergy_dkdn_keymodifiermask = -1; +static int hf_synergy_dkdn_keybutton = -1; + +static int hf_synergy_dkrp = -1; +static int hf_synergy_dkrp_keyid = -1; +static int hf_synergy_dkrp_keymodifiermask = -1; +static int hf_synergy_dkrp_numberofrepeats = -1; +static int hf_synergy_dkrp_keybutton = -1; + +static int hf_synergy_dkup = -1; +static int hf_synergy_dkup_keyid = -1; +static int hf_synergy_dkup_keymodifiermask = -1; +static int hf_synergy_dkup_keybutton = -1; + +static int hf_synergy_dmdn = -1; +static int hf_synergy_dmup = -1; + +static int hf_synergy_dmmv = -1; +static int hf_synergy_dmmv_x = -1; +static int hf_synergy_dmmv_y = -1; + +static int hf_synergy_dmrm = -1; +static int hf_synergy_dmrm_x = -1; +static int hf_synergy_dmrm_y = -1; + +static int hf_synergy_dmwm = -1; + +static int hf_synergy_dclp = -1; +static int hf_synergy_dclp_clipboardidentifier = -1; +static int hf_synergy_dclp_sequencenumber = -1; +static int hf_synergy_dclp_clipboarddata = -1; + +static int hf_synergy_dinf = -1; +static int hf_synergy_dinf_clp = -1; +static int hf_synergy_dinf_ctp= -1; +static int hf_synergy_dinf_wsp = -1; +static int hf_synergy_dinf_hsp = -1; +static int hf_synergy_dinf_swz = -1; +static int hf_synergy_dinf_x = -1; +static int hf_synergy_dinf_y = -1; + +static int hf_synergy_dsop = -1; + +static int hf_synergy_qinf = -1; + +static int hf_synergy_eicv = -1; +static int hf_synergy_eicv_majorversion = -1; +static int hf_synergy_eicv_minorversion = -1; + +static int hf_synergy_ebsy = -1; + +static int hf_synergy_eunk = -1; + +static int hf_synergy_ebad = -1; + +/* Initialize the subtree pointers */ +static gint ett_synergy = -1; + +static void dissect_synergy_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_cinn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_cclp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dkdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dkrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dkup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dmmv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dmrm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dclp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_dinf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); +static void dissect_synergy_eicv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,gint offset); + + +/* Code to actually dissect the packets */ +static void +dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + + if(check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "synergy"); + + if (tree) { + gint offset=0; + char buffer[20]; + proto_item *ti = NULL; + proto_tree *synergy_tree = NULL; + ti = proto_tree_add_protocol_format(tree, proto_synergy, tvb, 0, -1,"Synergy Protocol"); + synergy_tree = proto_item_add_subtree(ti, ett_synergy); + + tvb_get_nstringz(tvb,offset+4,20,buffer); + + if(strncmp(buffer,"Synergy",7)==0) + dissect_synergy_handshake(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"CNOP",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_cnop,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"CBYE",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_cbye,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"CINN",4)==0) + dissect_synergy_cinn(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"COUT",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_cout,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"CCLP",4)==0) + dissect_synergy_cclp(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"CSEC",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_csec,tvb,offset+4,1,FALSE); + else if(strncmp(buffer,"CROP",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_crop,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"CIAK",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_ciak,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"DKDN",4)==0) + dissect_synergy_dkdn(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DKRP",4)==0) + dissect_synergy_dkrp(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DKUP",4)==0) + dissect_synergy_dkup(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DMDN",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_dmdn,tvb,offset+4,1,FALSE); + else if(strncmp(buffer,"DMUP",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_dmup,tvb,offset+4,1,FALSE); + else if(strncmp(buffer,"DMMV",4)==0) + dissect_synergy_dmmv(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DMRM",4)==0) + dissect_synergy_dmrm(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DMWM",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_dmwm,tvb,offset+4,2,FALSE); + else if(strncmp(buffer,"DCLP",4)==0) + dissect_synergy_dclp(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DINF",4)==0) + dissect_synergy_dinf(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"DSOP",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_dsop,tvb,offset+4,4,FALSE); + else if(strncmp(buffer,"QINF",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_qinf,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"EICV",4)==0) + dissect_synergy_eicv(tvb,pinfo,synergy_tree,offset+4); + else if(strncmp(buffer,"EBSY",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_ebsy,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"EUNK",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_eunk,tvb,offset+4,-1,FALSE); + else if(strncmp(buffer,"EBAD",4)==0) + proto_tree_add_item(synergy_tree,hf_synergy_ebad,tvb,offset+4,-1,FALSE); + else + proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+4,-1,FALSE); + } +} + +static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_handshake, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_handshake_majorversion, tvb, offset + 7, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_handshake_minorversion, tvb, offset + 9, 2, FALSE); + + if (tvb_length_remaining(tvb, offset + 11) != 0) + { + proto_tree_add_item(sub_tree, hf_synergy_unknown, tvb, offset + 11, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_handshake_clientname, tvb, offset + 15, -1, FALSE); + } +} + +static void dissect_synergy_cinn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_cinn, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_cinn_x, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cinn_y, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cinn_sequence, tvb, offset + 8, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cinn_modifiermask, tvb, offset + 12, 2, FALSE); +} + +static void dissect_synergy_cclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_cclp, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_cclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_cclp_sequencenumber, tvb, offset + 5, 4, FALSE); +} + +static void dissect_synergy_dkdn( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dkdn, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keyid, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keymodifiermask, tvb, offset + 6, 2, FALSE); + + if (tvb_length_remaining(tvb, offset + 8) != 0) + proto_tree_add_item(sub_tree, hf_synergy_dkdn_keybutton, tvb, offset + 8, 2, FALSE); +} + +static void dissect_synergy_dkrp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dkrp, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keyid, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keymodifiermask, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkrp_numberofrepeats, tvb, offset + 8, 2, FALSE); + + if (tvb_length_remaining(tvb, offset + 10) != 0) + proto_tree_add_item(sub_tree, hf_synergy_dkrp_keybutton, tvb, offset + 10, 2, FALSE); +} + +static void dissect_synergy_dkup( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dkup, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dkup_keyid, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dkup_keymodifiermask, tvb, offset + 6, 2, FALSE); + + if (tvb_length_remaining(tvb, offset + 8) != 0) + proto_tree_add_item(sub_tree, hf_synergy_dkup_keybutton, tvb, offset + 8, 2, FALSE); +} + +static void dissect_synergy_dmmv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dmmv, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dmmv_x, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dmmv_y, tvb, offset + 6, 2, FALSE); +} + +static void dissect_synergy_dmrm( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dmrm, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dmrm_x, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dmrm_y, tvb, offset + 6, 2, FALSE); +} + +static void dissect_synergy_dclp( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dclp, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboardidentifier, tvb, offset + 4, 1, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dclp_sequencenumber, tvb, offset + 5, 4, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dclp_clipboarddata, tvb, offset + 9, -1, FALSE); +} + +static void dissect_synergy_dinf( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_dinf, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_dinf_clp, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_ctp, tvb, offset + 6, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_wsp, tvb, offset + 8, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_hsp, tvb, offset + 10, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_swz, tvb, offset + 12, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_x, tvb, offset + 14, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_dinf_y, tvb, offset + 16, 2, FALSE); +} + +static void dissect_synergy_eicv( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) +{ + proto_item *ti = NULL; + proto_tree *sub_tree = NULL; + ti = proto_tree_add_item(tree, hf_synergy_eicv, tvb, offset, -1, FALSE); + sub_tree = proto_item_add_subtree(ti, ett_synergy); + + proto_tree_add_item(sub_tree, hf_synergy_eicv_majorversion, tvb, offset + 4, 2, FALSE); + proto_tree_add_item(sub_tree, hf_synergy_eicv_minorversion, tvb, offset + 6, 2, FALSE); +} + + +void +proto_register_synergy(void) +{ + static hf_register_info hf[] = { + + { &hf_synergy_unknown, + { "unknown","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_handshake, + { "Handshake","synergy.handshake",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_handshake_majorversion, + { "Major Version","synergy.handshake.majorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_handshake_minorversion, + { "Minor Version","synergy.handshake.minorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_handshake_clientname, + { "Client Name","synergy.handshake.client",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cnop, + { "No Operation","synergy.cnop",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cbye, + { "Close Connection","synergy.cbye",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cinn, + { "Enter Screen","synergy.cinn",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cinn_x, + { "Screen X","synergy.cinn.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cinn_y, + { "Screen Y","synergy.cinn.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cinn_sequence, + { "Sequence Number","synergy.cinn.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cinn_modifiermask, + { "Modifier Key Mask","synergy.cinn.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cout, + { "Leave Screen","synergy.cout",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cclp, + { "Grab Clipboard","synergy.clipboard",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cclp_clipboardidentifier, + { "Identifier","synergy.clipboard.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_cclp_sequencenumber, + { "Sequence Number","synergy.clipboard.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_csec, + { "Screen Saver Change","synergy.screensaver",FT_BOOLEAN, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_crop, + { "Reset Options","synergy.resetoptions",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_ciak, + { "resolution change acknowledgment","synergy.ack",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkdn, + { "Key Pressed","synergy.keypressed",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkdn_keyid, + { "Key Id","synergy.keypressed.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkdn_keymodifiermask, + { "Key Modifier Mask","synergy.keypressed.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkdn_keybutton, + { "Key Button","synergy.keypressed.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkrp, + { "key auto-repeat","synergy.keyautorepeat",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkrp_keyid, + { "Key ID","synergy.keyautorepeat.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkrp_keymodifiermask, + { "Key modifier Mask","synergy.keyautorepeat.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkrp_numberofrepeats, + { "Number of Repeats","synergy.keyautorepeat.repeat",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkrp_keybutton, + { "Key Button","synergy.keyautorepeat.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkup, + { "key released","synergy.keyreleased",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkup_keyid, + { "Key Id","synergy.keyreleased.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkup_keymodifiermask, + { "Key Modifier Mask","synergykeyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dkup_keybutton, + { "Key Button","synergy.keyreleased.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmdn, + { "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmup, + { "Mouse Button Released","synergy.mousebuttonreleased",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmmv, + { "Mouse Moved","synergy.mousemoved",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmmv_x, + { "X Axis","synergy.mousemoved.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmmv_y, + { "Y Axis","synergy.mousemoved.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmrm, + { "Relative Mouse Move","synergy.relativemousemove",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmrm_x, + { "X Axis","synergy.relativemousemove.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmrm_y, + { "Y Axis","synergy.relativemousemove.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dmwm, + { "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dclp, + { "Clipboard Data","synergy.clipboarddata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dclp_clipboardidentifier, + { "Clipboard Identifier","synergy.clipboarddata.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dclp_sequencenumber, + { "Sequence Number","synergy.clipboarddata.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dclp_clipboarddata, + { "Clipboard Data","synergy.clipboarddata.data",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf, + { "Client Data","synergy.clientdata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_clp, + { "coordinate of leftmost pixel on secondary screen","synergy.clps",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_ctp, + { "coordinate of topmost pixel on secondary screen","synergy.clps.ctp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_wsp, + { "width of secondary screen in pixels","synergy.clps.wsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_hsp, + { "height of secondary screen in pixels","synergy.clps.hsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_swz, + { "size of warp zone","synergy.clps.swz",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_x, + { "x position of the mouse on the secondary screen","synergy.clps.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dinf_y, + { "y position of the mouse on the secondary screen","synergy.clps.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_dsop, + { "Set Options","synergy.setoptions",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_qinf, + { "Query Screen Info","synergy.qinf",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_eicv, + { "incompatible versions","synergy.eicv",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_eicv_majorversion, + { "Major Version Number","synergy.eicv.major",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_eicv_minorversion, + { "Minor Version Number","synergy.eicv.minor",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_ebsy, + { "Connection Already in Use","synergy.ebsy",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_eunk, + { "Unknown Client","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + { &hf_synergy_ebad, + { "protocol violation","synergy.violation",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL } + }, + }; + + +/* Setup protocol subtree array */ + static gint *ett[] = { + &ett_synergy, + }; + +/* Register the protocol name and description */ + proto_synergy = proto_register_protocol("Synergy", + "Synergy", "synergy"); + +/* Required function calls to register the header fields and subtrees used */ + proto_register_field_array(proto_synergy, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + register_dissector("synergy", dissect_synergy, proto_synergy); + +} + + + + +void +proto_reg_handoff_synergy(void) +{ + + dissector_handle_t synergy_handle; + synergy_handle = find_dissector("synergy"); + dissector_add("tcp.port",24800, synergy_handle); +} diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index ab8f6a914f..7f107d73e9 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -9,7 +9,7 @@ * Routines for Wireless Certificate Extension (RFC3770) * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn-template.c 12434 2004-10-29 12:11:42Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h index 7e681887dd..30dfde8d6d 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -9,7 +9,7 @@ * Routines for Wireless Certificate Extensions (RFC3770) packet dissection * Ronnie Sahlberg 2005 * - * $Id: packet-wlancertextn-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 33141a4f50..885ed9d99f 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -9,7 +9,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce-template.c 14169 2005-04-22 21:17:13Z gerald $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h index df391c57d1..9dcd8a2040 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -9,7 +9,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index b7e88eafe8..71623a6d59 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -9,7 +9,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.c 14169 2005-04-22 21:17:13Z gerald $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index 01e482fc7e..044fa42425 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -9,7 +9,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 42ed43959d..7d21a24e89 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -9,7 +9,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat-template.c 12743 2004-12-13 11:59:48Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index d47365e2b2..e2fc9b5d5a 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -9,7 +9,7 @@ * Routines for X.509 Selected Attribute Types packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509sat-template.h 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c index af87e19cf0..2909a58bbf 100644 --- a/epan/sigcomp_state_hdlr.c +++ b/epan/sigcomp_state_hdlr.c @@ -3,7 +3,7 @@ * used for Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman <anders.broman@ericsson.com> * - * $Id: sigcomp_state_hdlr.c 12788 2004-12-20 10:56:25Z jmayer $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/sigcomp_state_hdlr.h b/epan/sigcomp_state_hdlr.h index 29bf893145..cf61dd4402 100644 --- a/epan/sigcomp_state_hdlr.h +++ b/epan/sigcomp_state_hdlr.h @@ -3,7 +3,7 @@ * used for Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman <anders.broman@ericsson.com> * - * $Id: udvm.c 11445 2004-07-20 19:04:48Z etxrab $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index 8cd8664b96..8a74afe5a6 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -1,7 +1,7 @@ /* * Copyright 2004, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * - * $Id: sctp_chunk_stat_dlg.c 13531 2005-02-27 13:57:45Z lego $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index e9bd663b76..cd3e2316da 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -465,7 +465,7 @@ static const value_string pn_io_module_state[] = { /* dissect a 6 byte MAC address */ -int +static int dissect_MAC(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hfindex, guint8 *pdata) { diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index 9c94be0f33..9fc5d39682 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -250,7 +250,7 @@ static const value_string pn_dcp_suboption_manuf[] = { /* dissect an 8 bit unsigned integer */ -int +static int dissect_pn_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, int hfindex, guint8 *pdata) { @@ -266,7 +266,7 @@ dissect_pn_uint8(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, } /* dissect a 16 bit unsigned integer */ -int +static int dissect_pn_uint16(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, int hfindex, guint16 *pdata) { @@ -283,7 +283,7 @@ dissect_pn_uint16(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, } /* dissect a 32 bit unsigned integer */ -int +static int dissect_pn_uint32(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, int hfindex, guint32 *pdata) { @@ -300,7 +300,7 @@ dissect_pn_uint32(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, } /* dissect an IPv4 address */ -int +static int dissect_pn_ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hfindex, guint32 *pdata) { @@ -317,7 +317,7 @@ dissect_pn_ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } /* dissect some padding data (with the given length) */ -int +static int dissect_pn_padding(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int length) { |