aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-02-28 00:09:26 +0000
committerGuy Harris <guy@alum.mit.edu>2013-02-28 00:09:26 +0000
commitc522bb09c23d3cdafcafd985266538a73f128d5d (patch)
tree4aee65ab9115dae1dfc7a9e42f4bf6479ef61625
parent7fdbff482203edab445e93470b4ca3d8af74df33 (diff)
The LDAP dissector uses register_frame_end_routine(), so it needs to
include packet-frame.h. svn path=/trunk/; revision=47928
-rw-r--r--asn1/ldap/packet-ldap-template.c1
-rw-r--r--epan/dissectors/packet-ldap.c13
2 files changed, 8 insertions, 6 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 4c4d151de8..70a28971fe 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -97,6 +97,7 @@
#include <epan/oids.h>
#include <epan/strutil.h>
#include <epan/show_exception.h>
+#include <epan/dissectors/packet-frame.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/dissectors/packet-windows-common.h>
#include <epan/dissectors/packet-dcerpc.h>
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 0692da7f05..8bc979049d 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -105,6 +105,7 @@
#include <epan/oids.h>
#include <epan/strutil.h>
#include <epan/show_exception.h>
+#include <epan/dissectors/packet-frame.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/dissectors/packet-windows-common.h>
#include <epan/dissectors/packet-dcerpc.h>
@@ -340,7 +341,7 @@ static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */
static int hf_ldap_error = -1; /* T_error */
/*--- End of included file: packet-ldap-hf.c ---*/
-#line 187 "../../asn1/ldap/packet-ldap-template.c"
+#line 188 "../../asn1/ldap/packet-ldap-template.c"
/* Initialize the subtree pointers */
static gint ett_ldap = -1;
@@ -413,7 +414,7 @@ static gint ett_ldap_PasswordPolicyResponseValue = -1;
static gint ett_ldap_T_warning = -1;
/*--- End of included file: packet-ldap-ett.c ---*/
-#line 198 "../../asn1/ldap/packet-ldap-template.c"
+#line 199 "../../asn1/ldap/packet-ldap-template.c"
static dissector_table_t ldap_name_dissector_table=NULL;
static const char *object_identifier_id = NULL; /* LDAP OID */
@@ -3835,7 +3836,7 @@ static void dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_in
/*--- End of included file: packet-ldap-fn.c ---*/
-#line 876 "../../asn1/ldap/packet-ldap-template.c"
+#line 877 "../../asn1/ldap/packet-ldap-template.c"
static void
dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo,
@@ -5770,7 +5771,7 @@ void proto_register_ldap(void) {
NULL, HFILL }},
/*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2230 "../../asn1/ldap/packet-ldap-template.c"
+#line 2231 "../../asn1/ldap/packet-ldap-template.c"
};
/* List of subtrees */
@@ -5845,7 +5846,7 @@ void proto_register_ldap(void) {
&ett_ldap_T_warning,
/*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2243 "../../asn1/ldap/packet-ldap-template.c"
+#line 2244 "../../asn1/ldap/packet-ldap-template.c"
};
/* UAT for header fields */
static uat_field_t custom_attribute_types_uat_fields[] = {
@@ -6004,7 +6005,7 @@ proto_reg_handoff_ldap(void)
/*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2385 "../../asn1/ldap/packet-ldap-template.c"
+#line 2386 "../../asn1/ldap/packet-ldap-template.c"
}