diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-08 09:45:36 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-08 09:45:36 +0000 |
commit | 42fe2398b9b51ab73b5815726730e8febe99f82d (patch) | |
tree | 42ea4354ef344b6fcd3129bf2d6d021342589357 /epan | |
parent | 4284906aba309f7b481b7dc54623b593a2186f60 (diff) |
Added missing "svn:keywords Id" and "svn:eol-style native" for some
c and h files.
svn path=/trunk/; revision=24290
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dfilter/sttype-function.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-bctp.c | 242 | ||||
-rw-r--r-- | epan/dissectors/packet-cigi.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcp.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-drda.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-erf.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ncp-sss.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ncp-sss.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-telkonet.c | 2 |
9 files changed, 130 insertions, 128 deletions
diff --git a/epan/dfilter/sttype-function.h b/epan/dfilter/sttype-function.h index 7324e97a9b..d8cfa38b11 100644 --- a/epan/dfilter/sttype-function.h +++ b/epan/dfilter/sttype-function.h @@ -1,5 +1,5 @@ /* - * $Id: sttype-test.h 11400 2004-07-18 00:24:25Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 06ef184899..b76082d69d 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -1,121 +1,121 @@ -/*
- * packet-bctp.c
- * Q.1990 BICC bearer control tunnelling protocol
- *
- * (c) 2007, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
- *
- * $Id: $
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * 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.
- *
- * Ref ITU-T Rec. Q.1990 (07/2001)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glib.h>
-#include <epan/packet.h>
-
-#define PNAME "BCTP Q.1990"
-#define PSNAME "BCTP"
-#define PFNAME "bctp"
-
-static int proto_bctp = -1;
-static int hf_bctp_bvei = -1;
-static int hf_bctp_bvi = -1;
-static int hf_bctp_tpei = -1;
-static int hf_bctp_tpi = -1;
-
-static gint ett_bctp = -1;
-static dissector_table_t bctp_dissector_table;
-static dissector_handle_t data_handle;
-static dissector_handle_t text_handle;
-
-/*
-static const range_string tpi_vals[] = {
- {0x00,0x17,"spare (binary encoded protocols)"},
- {0x18,0x1f,"reserved for national use (binary encoded protocols)"},
- {0x20,0x20,"IPBCP (text encoded)"},
- {0x21,0x21,"spare (text encoded protocol)"},
- {0x22,0x22,"not used"},
- {0x23,0x37,"spare (text encoded protocols)"},
- {0x38,0x3f,"reserved for national use (text encoded protocols)"},
- {0,0,NULL}
-};
-*/
-
-static const value_string bvei_vals[] = {
- {0,"No indication"},
- {0,"Version Error Indication, BCTP version not supported"},
- {0,NULL}
-};
-
-
-static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
- proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, FALSE);
- proto_tree* pt = proto_item_add_subtree(pi,ett_bctp);
- tvbuff_t* sub_tvb = tvb_new_subset(tvb, 2, -1, -1);
- guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f;
-
- proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, FALSE);
- proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, FALSE);
- proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE);
- proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE);
-
- if ( dissector_try_port(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) {
- return;
- } else if (tpi <= 0x22) {
- call_dissector(data_handle,sub_tvb, pinfo, tree);
- } else {
- /* tpi > 0x22 */
- call_dissector(text_handle,sub_tvb, pinfo, tree);
- }
-}
-
-void
-proto_register_bctp (void)
-{
- static hf_register_info hf[] = {
- {&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }},
- {&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }},
- {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunnelled Protocol Error Indicator", HFILL }},
- {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunnelled Protocol Indicator", HFILL }},
- };
- static gint *ett[] = {
- &ett_bctp
- };
-
- proto_bctp = proto_register_protocol(PNAME, PSNAME, PFNAME);
- proto_register_field_array(proto_bctp, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
-
- register_dissector("bctp", dissect_bctp, proto_bctp);
-
- bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunnelled Protocol Indicator", FT_UINT32, BASE_DEC);
-}
-
-void
-proto_reg_handoff_bctp(void)
-{
- data_handle = find_dissector("data");
- text_handle = find_dissector("data-text-lines");
-}
-
+/* + * packet-bctp.c + * Q.1990 BICC bearer control tunnelling protocol + * + * (c) 2007, Luis E. Garcia Ontanon <luis.ontanon@gmail.com> + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * 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. + * + * Ref ITU-T Rec. Q.1990 (07/2001) + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> + +#define PNAME "BCTP Q.1990" +#define PSNAME "BCTP" +#define PFNAME "bctp" + +static int proto_bctp = -1; +static int hf_bctp_bvei = -1; +static int hf_bctp_bvi = -1; +static int hf_bctp_tpei = -1; +static int hf_bctp_tpi = -1; + +static gint ett_bctp = -1; +static dissector_table_t bctp_dissector_table; +static dissector_handle_t data_handle; +static dissector_handle_t text_handle; + +/* +static const range_string tpi_vals[] = { + {0x00,0x17,"spare (binary encoded protocols)"}, + {0x18,0x1f,"reserved for national use (binary encoded protocols)"}, + {0x20,0x20,"IPBCP (text encoded)"}, + {0x21,0x21,"spare (text encoded protocol)"}, + {0x22,0x22,"not used"}, + {0x23,0x37,"spare (text encoded protocols)"}, + {0x38,0x3f,"reserved for national use (text encoded protocols)"}, + {0,0,NULL} +}; +*/ + +static const value_string bvei_vals[] = { + {0,"No indication"}, + {0,"Version Error Indication, BCTP version not supported"}, + {0,NULL} +}; + + +static void dissect_bctp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) { + proto_item* pi = proto_tree_add_item(tree, proto_bctp, tvb,0,2, FALSE); + proto_tree* pt = proto_item_add_subtree(pi,ett_bctp); + tvbuff_t* sub_tvb = tvb_new_subset(tvb, 2, -1, -1); + guint8 tpi = tvb_get_guint8(tvb,1) & 0x3f; + + proto_tree_add_item(pt, hf_bctp_bvei, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_bvi, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_tpei, tvb,0,2, FALSE); + proto_tree_add_item(pt, hf_bctp_tpi, tvb,0,2, FALSE); + + if ( dissector_try_port(bctp_dissector_table, tpi, sub_tvb, pinfo, tree) ) { + return; + } else if (tpi <= 0x22) { + call_dissector(data_handle,sub_tvb, pinfo, tree); + } else { + /* tpi > 0x22 */ + call_dissector(text_handle,sub_tvb, pinfo, tree); + } +} + +void +proto_register_bctp (void) +{ + static hf_register_info hf[] = { + {&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }}, + {&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }}, + {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunnelled Protocol Error Indicator", HFILL }}, + {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunnelled Protocol Indicator", HFILL }}, + }; + static gint *ett[] = { + &ett_bctp + }; + + proto_bctp = proto_register_protocol(PNAME, PSNAME, PFNAME); + proto_register_field_array(proto_bctp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + + register_dissector("bctp", dissect_bctp, proto_bctp); + + bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunnelled Protocol Indicator", FT_UINT32, BASE_DEC); +} + +void +proto_reg_handoff_bctp(void) +{ + data_handle = find_dissector("data"); + text_handle = find_dissector("data-text-lines"); +} + diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index dc062c827a..d08914073f 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -4,7 +4,7 @@ * CIGI - http://cigi.sourceforge.net/ * Copyright (c) 2005 The Boeing Company * - * $Id: README.developer 15753 2005-09-10 19:43:41Z guy $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-dcp.h b/epan/dissectors/packet-dcp.h index 77010a00b9..2f66bf3bc6 100644 --- a/epan/dissectors/packet-dcp.h +++ b/epan/dissectors/packet-dcp.h @@ -6,7 +6,7 @@ * * Francesco Fondelli <francesco dot fondelli, gmail dot com> * - * $Id: README.developer 11973 2004-09-11 23:10:14Z guy $ + * $Id$ * * template taken from packet-udp.c * diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 52b8de0793..daeee6b105 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -3,7 +3,7 @@ * * metatech <metatech@flashmail.com> * - * $Id: packet-drda.c 18196 2006-05-21 04:49:01Z sahlberg $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 085e89b70c..69a01b9202 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1,6 +1,8 @@ /* packet-erf.c * Routines for ERF encapsulation dissection * + * $Id$ + * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 72e3d44bce..0eb319b747 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -4,7 +4,7 @@ * Greg Morris <gmorris@novell.com> * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ncp-sss.c,v 1.00 2003/06/26 11:36:14 guy Exp $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-ncp-sss.h b/epan/dissectors/packet-ncp-sss.h index a88edd8506..b0f261791e 100644 --- a/epan/dissectors/packet-ncp-sss.h +++ b/epan/dissectors/packet-ncp-sss.h @@ -3,7 +3,7 @@ * Greg Morris <gmorris@novell.com> * Copyright (c) Novell, Inc. 2002-2004 * - * $Id: packet-ncp-sss.h,v 1.0 2004/02/29 08:01:22 guy Exp $ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 309c29e7ee..653660e5f0 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -1,7 +1,7 @@ /* packet-telkonet.c * Routines for ethertype 0x88A1 tunneling dissection * - * $Id: packet-telkonet.c 18196 2006-05-21 04:49:01Z sahlberg $ + * $Id$ * * Copyright 2006 Joerg Mayer (see AUTHORS file) * |