aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-skinny.h
diff options
context:
space:
mode:
authorDiederik de Groot <ddegroot@talon.nl>2014-08-25 19:00:05 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-08-25 19:53:40 +0000
commitbfe9332f98dc1123926a0713684f38126a72b018 (patch)
treefb7810ce01b1ad4e506642c060cccec86832e568 /epan/dissectors/packet-skinny.h
parentab33c4003bb8a2ec7698dad13b9713e2654c567a (diff)
SKINNY: Fix some warning
Fix: cog [[[END]]] in packet-skinny.h.in Fix: error: expression which evaluates to zero treated as a null pointer constant of type 'const gchar *' (aka 'const char *') [-Werror,-Wnon-literal-null-conversion] (Reported by Alexis La Goutte and found by Clang 3.6) Change-Id: Ic354f349eef8a12a7e18e841b517ea4f72ba86f2 Reviewed-on: https://code.wireshark.org/review/3842 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-skinny.h')
-rw-r--r--epan/dissectors/packet-skinny.h24
1 files changed, 20 insertions, 4 deletions
diff --git a/epan/dissectors/packet-skinny.h b/epan/dissectors/packet-skinny.h
index aa75633ab6..89c6420c95 100644
--- a/epan/dissectors/packet-skinny.h
+++ b/epan/dissectors/packet-skinny.h
@@ -1,9 +1,21 @@
+/* Do not modify this file. Changes will be overwritten */
+/* Generated Automatically */
+/* packet-skinny.h */
+
/* packet-skinny.h
- * Routines for skinny packet disassembly
+ * Dissector for the Skinny Client Control Protocol
+ * (The "D-Channel"-Protocol for Cisco Systems' IP-Phones)
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
+ * Author: Diederik de Groot <ddegroot@user.sf.net>, Copyright 2014
+ * Rewritten to support newer skinny protocolversions (V0-V22)
+ * Based on previous versions/contributions:
+ * - Joerg Mayer <jmayer@loplof.de>, Copyright 2001
+ * - Paul E. Erkkila (pee@erkkila.org) - fleshed out the decode
+ * skeleton to report values for most message/message fields.
+ * Much help from Guy Harris on figuring out the wireshark api.
+ * - packet-aim.c by Ralf Hoelzer <ralf@well.com>, Copyright 2000
+ * - Wireshark - Network traffic analyzer,
+ * By Gerald Combs <gerald@wireshark.org>, Copyright 1998
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -20,6 +32,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+/*
+ * Generated Automatically Using (from wireshark base directory):
+ * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in
+ */
/* Container for tapping relevant data */
typedef struct _skinny_info_t