E1AP: Add .h file needed for private IE dissection.

Change-Id: I04569b89a6fe55e4d988978bd8f1538bc62444e5
Reviewed-on: https://code.wireshark.org/review/34514
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2019-09-12 16:54:12 +02:00 committed by Anders Broman
parent 3bff8f372e
commit 6d6a5262aa
6 changed files with 98 additions and 21 deletions

View File

@ -327,6 +327,7 @@ set(DISSECTOR_PUBLIC_HEADERS
packet-dtls.h
packet-dtn.h
packet-dvbci.h
packet-e1ap.h
packet-enip.h
packet-erf.h
packet-e164.h

View File

@ -30,6 +30,7 @@ set( ASN_FILE_LIST
set( EXTRA_DIST
${ASN_FILE_LIST}
packet-${PROTOCOL_NAME}-template.c
packet-${PROTOCOL_NAME}-template.h
${PROTOCOL_NAME}.cnf
)

View File

@ -19,6 +19,7 @@
#include <epan/sctpppids.h>
#include <epan/proto_data.h>
#include "packet-e1ap.h"
#include "packet-per.h"
#include "packet-e212.h"
#include "packet-ntp.h"
@ -60,13 +61,6 @@ typedef struct {
const char *obj_id;
} e1ap_private_data_t;
typedef struct {
guint32 message_type;
guint32 ProcedureCode;
guint32 ProtocolIE_ID;
guint32 ProtocolExtensionID;
} e1ap_ctx_t;
/* Global variables */
static dissector_handle_t e1ap_handle;

View File

@ -0,0 +1,37 @@
/* packet-e1ap.h
* Routines for E-UTRAN E1 Application Protocol (E1AP) packet dissection
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_E1AP_H
#define PACKET_E1AP_H
typedef struct {
guint32 message_type;
guint32 ProcedureCode;
guint32 ProtocolIE_ID;
guint32 ProtocolExtensionID;
} e1ap_ctx_t;
#include "packet-e1ap-exp.h"
#endif /* PACKET_E1AP_H */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/

View File

@ -27,6 +27,7 @@
#include <epan/sctpppids.h>
#include <epan/proto_data.h>
#include "packet-e1ap.h"
#include "packet-per.h"
#include "packet-e212.h"
#include "packet-ntp.h"
@ -169,7 +170,7 @@ typedef enum _ProtocolIE_ID_enum {
} ProtocolIE_ID_enum;
/*--- End of included file: packet-e1ap-val.h ---*/
#line 36 "./asn1/e1ap/packet-e1ap-template.c"
#line 37 "./asn1/e1ap/packet-e1ap-template.c"
/* Initialize the protocol and registered fields */
static int proto_e1ap = -1;
@ -610,7 +611,7 @@ static int hf_e1ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */
static int hf_e1ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */
/*--- End of included file: packet-e1ap-hf.c ---*/
#line 43 "./asn1/e1ap/packet-e1ap-template.c"
#line 44 "./asn1/e1ap/packet-e1ap-template.c"
/* Initialize the subtree pointers */
static gint ett_e1ap = -1;
@ -854,7 +855,7 @@ static gint ett_e1ap_SuccessfulOutcome = -1;
static gint ett_e1ap_UnsuccessfulOutcome = -1;
/*--- End of included file: packet-e1ap-ett.c ---*/
#line 49 "./asn1/e1ap/packet-e1ap-template.c"
#line 50 "./asn1/e1ap/packet-e1ap-template.c"
enum{
INITIATING_MESSAGE,
@ -869,13 +870,6 @@ typedef struct {
const char *obj_id;
} e1ap_private_data_t;
typedef struct {
guint32 message_type;
guint32 ProcedureCode;
guint32 ProtocolIE_ID;
guint32 ProtocolExtensionID;
} e1ap_ctx_t;
/* Global variables */
static dissector_handle_t e1ap_handle;
@ -7634,7 +7628,7 @@ static int dissect_E1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-e1ap-fn.c ---*/
#line 110 "./asn1/e1ap/packet-e1ap-template.c"
#line 104 "./asn1/e1ap/packet-e1ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
@ -9434,7 +9428,7 @@ void proto_register_e1ap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-e1ap-hfarr.c ---*/
#line 189 "./asn1/e1ap/packet-e1ap-template.c"
#line 183 "./asn1/e1ap/packet-e1ap-template.c"
};
/* List of subtrees */
@ -9680,7 +9674,7 @@ void proto_register_e1ap(void) {
&ett_e1ap_UnsuccessfulOutcome,
/*--- End of included file: packet-e1ap-ettarr.c ---*/
#line 197 "./asn1/e1ap/packet-e1ap-template.c"
#line 191 "./asn1/e1ap/packet-e1ap-template.c"
};
/* Register protocol */
@ -9828,7 +9822,7 @@ proto_reg_handoff_e1ap(void)
/*--- End of included file: packet-e1ap-dis-tab.c ---*/
#line 222 "./asn1/e1ap/packet-e1ap-template.c"
#line 216 "./asn1/e1ap/packet-e1ap-template.c"
}
/*

View File

@ -0,0 +1,50 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-e1ap.h */
/* asn2wrs.py -p e1ap -c ./e1ap.cnf -s ./packet-e1ap-template -D . -O ../.. E1AP-CommonDataTypes.asn E1AP-Constants.asn E1AP-Containers.asn E1AP-IEs.asn E1AP-PDU-Contents.asn E1AP-PDU-Descriptions.asn */
/* Input file: packet-e1ap-template.h */
#line 1 "./asn1/e1ap/packet-e1ap-template.h"
/* packet-e1ap.h
* Routines for E-UTRAN E1 Application Protocol (E1AP) packet dissection
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef PACKET_E1AP_H
#define PACKET_E1AP_H
typedef struct {
guint32 message_type;
guint32 ProcedureCode;
guint32 ProtocolIE_ID;
guint32 ProtocolExtensionID;
} e1ap_ctx_t;
/*--- Included file: packet-e1ap-exp.h ---*/
#line 1 "./asn1/e1ap/packet-e1ap-exp.h"
/*--- End of included file: packet-e1ap-exp.h ---*/
#line 23 "./asn1/e1ap/packet-e1ap-template.h"
#endif /* PACKET_E1AP_H */
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/