checkAPIs.pl: support for new-style dissectors in check_hf_entries

[metze/wireshark/wip.git] / epan / diam_dict.h

diff --git a/epan/diam_dict.h b/epan/diam_dict.h
index 8e49bd9b26322c6e81bf83d0851dcfdbfdb7a3e2..a67bb0137d8b304b3031621f47753b6814325995 100644 (file)
--- a/epan/diam_dict.h
+++ b/epan/diam_dict.h
@@ -2,24 +2,9 @@
  ** diam_dict.h
  ** Diameter Dictionary Import Routines
  **
- ** $Id$
+ ** (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
  **
- ** (c) 2007, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
- **
- ** This library is free software; you can redistribute it and/or
- ** modify it under the terms of the GNU Library General Public
- ** License as published by the Free Software Foundation; either
- ** version 2 of the License, or (at your option) any later version.
- **
- ** This library 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
- ** Library General Public License for more details.
- **
- ** You should have received a copy of the GNU Library General Public
- ** License along with this library; if not, write to the
- ** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- ** Boston, MA  02111-1307, USA.
+ ** SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef _DIAM_DICT_H_
@@ -27,8 +12,8 @@
 
 struct _ddict_namecode_t {
        char* name;
-       unsigned code;
-       struct _ddict_namecode_t* next; 
+       guint code;
+       struct _ddict_namecode_t* next;
 };
 
 typedef struct _ddict_namecode_t ddict_gavp_t;
@@ -38,8 +23,8 @@ typedef struct _ddict_namecode_t ddict_application_t;
 typedef struct _ddict_vendor_t {
        char* name;
        char* desc;
-       unsigned code;
-       struct _ddict_vendor_t* next;   
+       guint code;
+       struct _ddict_vendor_t* next;
 } ddict_vendor_t;
 
 typedef struct _ddict_avp_t {
@@ -47,7 +32,7 @@ typedef struct _ddict_avp_t {
        char* description;
        char* vendor;
        char* type;
-       unsigned code;
+       guint code;
        ddict_gavp_t* gavps;
        ddict_enum_t* enums;
        struct _ddict_avp_t* next;
@@ -62,20 +47,28 @@ typedef struct _ddict_typedefn_t {
 typedef struct _ddict_cmd_t {
        char* name;
        char* vendor;
-       unsigned code;
+       guint code;
        struct _ddict_cmd_t* next;
 } ddict_cmd_t;
 
+typedef struct _ddict_xmlpi_t {
+       char* name;
+       char* key;
+       char* value;
+       struct _ddict_xmlpi_t* next;
+} ddict_xmlpi_t;
+
 typedef struct _ddict_t {
        ddict_application_t* applications;
        ddict_vendor_t* vendors;
        ddict_cmd_t* cmds;
        ddict_typedefn_t* typedefns;
        ddict_avp_t* avps;
+       ddict_xmlpi_t* xmlpis;
 } ddict_t;
 
 extern void ddict_print(FILE* fh, ddict_t* d);
-extern ddict_t* ddict_scan(const char* directory, const char* filename);
+extern ddict_t* ddict_scan(const char* directory, const char* filename, int dbg);
 extern void ddict_free(ddict_t* d);
 
 #endif