diff options
117 files changed, 356 insertions, 487 deletions
diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index 4a56031005..fbebda0f06 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <epan/oids.h> diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index 984e488cf4..56bf81ee4d 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -41,7 +41,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/emem.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index e70564978d..efa8795cc2 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -91,9 +91,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/tap.h> -#include <epan/emem.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 2814c6a0c5..a94f0dce74 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/tap.h> #include <epan/asn1.h> diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index fb91f449e8..c928a4580f 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index ee82ee539a..7332d4615e 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index fa5d009dce..49eed99651 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index 1198f52142..ea6735d08c 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 78839bf604..78ea068e28 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index b8d716a582..aeb5d3c86a 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 11cfdedeb1..2327d14c69 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c index d38e6a540b..add0f923f8 100644 --- a/asn1/gnm/packet-gnm-template.c +++ b/asn1/gnm/packet-gnm-template.c @@ -33,7 +33,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index 98ee9d6e50..f65279b331 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -51,7 +51,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/tap.h> #include <epan/emem.h> #include <epan/oids.h> diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index ad4b2d5385..609265e156 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 367ae70494..b5c822eda7 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/strutil.h> #include <stdio.h> diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c index e21be6e5f1..50ef022aae 100644 --- a/asn1/h282/packet-h282-template.c +++ b/asn1/h282/packet-h282-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c index 2a7fe32ef4..c353829501 100644 --- a/asn1/h283/packet-h283-template.c +++ b/asn1/h283/packet-h283-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c index f5fbe75ae3..24256a2651 100644 --- a/asn1/h323/packet-h323-template.c +++ b/asn1/h323/packet-h323-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index 5905bc1079..88ffc9c1a8 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c index 48ed47271b..76b4f230e3 100644 --- a/asn1/h460/packet-h460-template.c +++ b/asn1/h460/packet-h460-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c index 9c237d892c..b05328da92 100644 --- a/asn1/h501/packet-h501-template.c +++ b/asn1/h501/packet-h501-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 0bd49a7d4e..55aeb4f8fd 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include "epan/expert.h" #include <epan/asn1.h> diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index d6076779fd..ae6282c7c6 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index ac1841f2ca..c0f034fd91 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -31,7 +31,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c index 938ffd639b..1ed04ecaad 100644 --- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c +++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c index 7d358d91be..d15773c0f0 100644 --- a/asn1/p7/packet-p7-template.c +++ b/asn1/p7/packet-p7-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c index a2a1807479..5c4ba42ad6 100644 --- a/asn1/pcap/packet-pcap-template.c +++ b/asn1/pcap/packet-pcap-template.c @@ -35,11 +35,9 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> -#include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index e543fb294d..e35d272f93 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 49472ba5d4..d9a5e5103e 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c index fddcf1fda5..d20b1d7960 100644 --- a/asn1/pkinit/packet-pkinit-template.c +++ b/asn1/pkinit/packet-pkinit-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c index b073ee9db5..811091fa04 100644 --- a/asn1/pkix1explicit/packet-pkix1explicit-template.c +++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <epan/oids.h> #include <epan/afn.h> diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c index 931290e3c4..8a44fd4263 100644 --- a/asn1/pkix1implicit/packet-pkix1implicit-template.c +++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c @@ -28,7 +28,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c index 79a9ba43cd..be9606a3b9 100644 --- a/asn1/pkixcmp/packet-cmp-template.c +++ b/asn1/pkixcmp/packet-cmp-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -44,7 +43,6 @@ #include "packet-crmf.h" #include "packet-pkix1explicit.h" #include "packet-pkix1implicit.h" -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-http.h" #include <epan/prefs.h> diff --git a/asn1/pkixcrmf/packet-crmf-template.c b/asn1/pkixcrmf/packet-crmf-template.c index 5e5966dfe5..471729e1ac 100644 --- a/asn1/pkixcrmf/packet-crmf-template.c +++ b/asn1/pkixcrmf/packet-crmf-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c index 1d669c2b0a..ab365273bb 100644 --- a/asn1/pkixqualified/packet-pkixqualified-template.c +++ b/asn1/pkixqualified/packet-pkixqualified-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index b9dbe55072..b69732ac29 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -29,7 +29,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index 3e9f984f7f..612aa29d90 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -29,7 +29,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 657ba60b6b..f723e89691 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -31,7 +31,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index 9cbe2d2e23..c9c4dfb855 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index 36feaa0260..1948fc8293 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -33,7 +33,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c index 415954d28a..8c5a16ca3e 100644 --- a/asn1/rrlp/packet-rrlp-template.c +++ b/asn1/rrlp/packet-rrlp-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 92042cf534..329ddc9c1f 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -33,12 +33,10 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> #include <ctype.h> -#include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c index f5e76e4a8c..dcd1593997 100644 --- a/asn1/s4406/packet-s4406-template.c +++ b/asn1/s4406/packet-s4406-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index 6b63b324ea..e1af315e7a 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -31,13 +31,11 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> #include <epan/asn1.h> -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-per.h" diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c index 8b1e26a8cd..d488f339d2 100644 --- a/asn1/smrse/packet-smrse-template.c +++ b/asn1/smrse/packet-smrse-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index a87ab9bfe2..1a60cf1a67 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -30,12 +30,10 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 84953d30cb..8e4a80b09a 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -34,7 +34,6 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/oids.h> -#include <epan/emem.h> #include <epan/asn1.h> #include <epan/strutil.h> diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index 5e780729df..1dbfb4e48f 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/prefs.h> #include <epan/asn1.h> @@ -40,7 +39,6 @@ #include <string.h> #include "packet-per.h" -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-gsm_map.h" diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c index fe672c05c3..f6b8373247 100644 --- a/asn1/wlancertextn/packet-wlancertextn-template.c +++ b/asn1/wlancertextn/packet-wlancertextn-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index bac91e9b85..1cade44a18 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index f38d31e34f..4f551e1078 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c index c81766c7fb..80352ebb25 100644 --- a/asn1/x420/packet-x420-template.c +++ b/asn1/x420/packet-x420-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 082455826f..ff38e3696d 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index 30480ffa78..443a051c38 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index 37ad9a67cb..0cc50c0271 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 748d61bc34..20055ca44b 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 8fc4e422fb..5d8de981de 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <epan/oids.h> @@ -144,7 +143,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1; static int hf_acp133_OnSupported_acp127_tn = -1; /*--- End of included file: packet-acp133-hf.c ---*/ -#line 57 "packet-acp133-template.c" +#line 56 "packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; @@ -172,7 +171,7 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 61 "packet-acp133-template.c" +#line 60 "packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ @@ -1020,7 +1019,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-acp133-fn.c ---*/ -#line 63 "packet-acp133-template.c" +#line 62 "packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1342,7 +1341,7 @@ void proto_register_acp133(void) { "", HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 72 "packet-acp133-template.c" +#line 71 "packet-acp133-template.c" }; /* List of subtrees */ @@ -1372,7 +1371,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 78 "packet-acp133-template.c" +#line 77 "packet-acp133-template.c" }; /* Register protocol */ @@ -1433,7 +1432,7 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 94 "packet-acp133-template.c" +#line 93 "packet-acp133-template.c" /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index a09ad32f7a..56d17123da 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -49,7 +49,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/emem.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -183,7 +182,7 @@ static int hf_acse_ACSE_requirements_higher_level_association = -1; static int hf_acse_ACSE_requirements_nested_association = -1; /*--- End of included file: packet-acse-hf.c ---*/ -#line 66 "packet-acse-template.c" +#line 65 "packet-acse-template.c" /* Initialize the subtree pointers */ static gint ett_acse = -1; @@ -227,7 +226,7 @@ static gint ett_acse_Authentication_value_other = -1; static gint ett_acse_Authentication_value = -1; /*--- End of included file: packet-acse-ett.c ---*/ -#line 70 "packet-acse-template.c" +#line 69 "packet-acse-template.c" static struct SESSION_DATA_STRUCTURE* session = NULL; @@ -1645,7 +1644,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ /*--- End of included file: packet-acse-fn.c ---*/ -#line 146 "packet-acse-template.c" +#line 145 "packet-acse-template.c" /* @@ -2184,7 +2183,7 @@ void proto_register_acse(void) { "", HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 252 "packet-acse-template.c" +#line 251 "packet-acse-template.c" }; /* List of subtrees */ @@ -2230,7 +2229,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 258 "packet-acse-template.c" +#line 257 "packet-acse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index b6f5f3a9cf..b2a36b1801 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -99,9 +99,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/tap.h> -#include <epan/emem.h> #include <epan/asn1.h> #include <stdio.h> @@ -871,7 +869,7 @@ static int hf_ansi_map_checkMEIDRes = -1; /* CheckMEIDRes */ static int hf_ansi_map_statusRequestRes = -1; /* StatusRequestRes */ /*--- End of included file: packet-ansi_map-hf.c ---*/ -#line 325 "packet-ansi_map-template.c" +#line 323 "packet-ansi_map-template.c" /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; @@ -1124,7 +1122,7 @@ static gint ett_ansi_map_InvokeData = -1; static gint ett_ansi_map_ReturnData = -1; /*--- End of included file: packet-ansi_map-ett.c ---*/ -#line 357 "packet-ansi_map-template.c" +#line 355 "packet-ansi_map-template.c" /* Global variables */ static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */ @@ -15166,7 +15164,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3638 "packet-ansi_map-template.c" +#line 3636 "packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -18913,7 +18911,7 @@ void proto_register_ansi_map(void) { "ansi_map.StatusRequestRes", HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5232 "packet-ansi_map-template.c" +#line 5230 "packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19167,7 +19165,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5265 "packet-ansi_map-template.c" +#line 5263 "packet-ansi_map-template.c" }; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 418092186c..8ef30e8d57 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -48,7 +48,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/tap.h> #include <epan/asn1.h> @@ -589,7 +588,7 @@ static int hf_camel_present = -1; /* INTEGER */ static int hf_camel_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-camel-hf.c ---*/ -#line 112 "packet-camel-template.c" +#line 111 "packet-camel-template.c" static struct camelsrt_info_t * gp_camelsrt_info; @@ -803,7 +802,7 @@ static gint ett_camel_T_problem = -1; static gint ett_camel_InvokeId = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 136 "packet-camel-template.c" +#line 135 "packet-camel-template.c" /* Preference settings default */ @@ -1122,7 +1121,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = { #define noInvokeId NULL /*--- End of included file: packet-camel-val.h ---*/ -#line 270 "packet-camel-template.c" +#line 269 "packet-camel-template.c" /*--- Included file: packet-camel-table.c ---*/ @@ -1212,7 +1211,7 @@ static const value_string camel_err_code_string_vals[] = { /*--- End of included file: packet-camel-table.c ---*/ -#line 272 "packet-camel-template.c" +#line 271 "packet-camel-template.c" static char camel_number_to_char(int number) { @@ -6757,7 +6756,7 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-camel-fn.c ---*/ -#line 317 "packet-camel-template.c" +#line 316 "packet-camel-template.c" /*--- Included file: packet-camel-table2.c ---*/ @@ -6965,7 +6964,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-camel-table2.c ---*/ -#line 319 "packet-camel-template.c" +#line 318 "packet-camel-template.c" /*--- Included file: packet-camel-table11.c ---*/ @@ -7036,7 +7035,7 @@ static const camel_op_t camel_op_tab[] = { /*--- End of included file: packet-camel-table11.c ---*/ -#line 321 "packet-camel-template.c" +#line 320 "packet-camel-template.c" /*--- Included file: packet-camel-table21.c ---*/ #line 1 "packet-camel-table21.c" @@ -7068,7 +7067,7 @@ static const camel_err_t camel_err_tab[] = { /*--- End of included file: packet-camel-table21.c ---*/ -#line 322 "packet-camel-template.c" +#line 321 "packet-camel-template.c" static guint8 camel_pdu_type = 0; static guint8 camel_pdu_size = 0; @@ -7279,7 +7278,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 525 "packet-camel-template.c" +#line 524 "packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -9329,7 +9328,7 @@ void proto_register_camel(void) { "camel.InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 698 "packet-camel-template.c" +#line 697 "packet-camel-template.c" }; /* List of subtrees */ @@ -9532,7 +9531,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 711 "packet-camel-template.c" +#line 710 "packet-camel-template.c" }; /* Register protocol */ proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index fd875a4364..4da5a9c2a6 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -348,7 +347,7 @@ static int hf_cmip_T_daysOfWeek_friday = -1; static int hf_cmip_T_daysOfWeek_saturday = -1; /*--- End of included file: packet-cmip-hf.c ---*/ -#line 63 "packet-cmip-template.c" +#line 62 "packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; @@ -478,7 +477,7 @@ static gint ett_cmip_T_modificationList = -1; static gint ett_cmip_T_modificationList_item = -1; /*--- End of included file: packet-cmip-ett.c ---*/ -#line 67 "packet-cmip-template.c" +#line 66 "packet-cmip-template.c" static guint32 opcode; @@ -534,7 +533,7 @@ static const value_string cmip_error_code_vals[] = { /*--- End of included file: packet-cmip-table.c ---*/ -#line 71 "packet-cmip-template.c" +#line 70 "packet-cmip-template.c" static int opcode_type; #define OPCODE_INVOKE 1 @@ -645,7 +644,7 @@ static const char *objectclass_identifier_id; #define noInvokeId NULL /*--- End of included file: packet-cmip-val.h ---*/ -#line 93 "packet-cmip-template.c" +#line 92 "packet-cmip-template.c" /*--- Included file: packet-cmip-fn.c ---*/ #line 1 "packet-cmip-fn.c" @@ -4386,7 +4385,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-cmip-fn.c ---*/ -#line 94 "packet-cmip-template.c" +#line 93 "packet-cmip-template.c" @@ -5591,7 +5590,7 @@ void proto_register_cmip(void) { "", HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 194 "packet-cmip-template.c" +#line 193 "packet-cmip-template.c" }; /* List of subtrees */ @@ -5723,7 +5722,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 200 "packet-cmip-template.c" +#line 199 "packet-cmip-template.c" }; /* Register protocol */ @@ -5808,7 +5807,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 209 "packet-cmip-template.c" +#line 208 "packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); } diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 0a2b20d3c0..cb4df8ad26 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -52,7 +51,6 @@ #include "packet-crmf.h" #include "packet-pkix1explicit.h" #include "packet-pkix1implicit.h" -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-http.h" #include <epan/prefs.h> @@ -244,7 +242,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 77 "packet-cmp-template.c" +#line 75 "packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -300,7 +298,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 81 "packet-cmp-template.c" +#line 79 "packet-cmp-template.c" static const char *object_identifier_id; @@ -1468,7 +1466,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-cmp-fn.c ---*/ -#line 86 "packet-cmp-template.c" +#line 84 "packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -2369,7 +2367,7 @@ void proto_register_cmp(void) { "", HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 354 "packet-cmp-template.c" +#line 352 "packet-cmp-template.c" }; /* List of subtrees */ @@ -2427,7 +2425,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 360 "packet-cmp-template.c" +#line 358 "packet-cmp-template.c" }; module_t *cmp_module; @@ -2521,7 +2519,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 432 "packet-cmp-template.c" +#line 430 "packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 0b972e8b8d..5719964d20 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -164,7 +163,7 @@ static int hf_cms_rc2WrapParameter = -1; /* RC2WrapParameter */ static int hf_cms_rc2CBCParameter = -1; /* RC2CBCParameter */ /*--- End of included file: packet-cms-hf.c ---*/ -#line 56 "packet-cms-template.c" +#line 55 "packet-cms-template.c" /* Initialize the subtree pointers */ @@ -218,7 +217,7 @@ static gint ett_cms_SMIMEEncryptionKeyPreference = -1; static gint ett_cms_RC2CBCParameters = -1; /*--- End of included file: packet-cms-ett.c ---*/ -#line 59 "packet-cms-template.c" +#line 58 "packet-cms-template.c" static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ @@ -1581,7 +1580,7 @@ static void dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-cms-fn.c ---*/ -#line 137 "packet-cms-template.c" +#line 136 "packet-cms-template.c" /*--- proto_register_cms ----------------------------------------------*/ void proto_register_cms(void) { @@ -1993,7 +1992,7 @@ void proto_register_cms(void) { "cms.RC2CBCParameter", HFILL }}, /*--- End of included file: packet-cms-hfarr.c ---*/ -#line 148 "packet-cms-template.c" +#line 147 "packet-cms-template.c" }; /* List of subtrees */ @@ -2049,7 +2048,7 @@ void proto_register_cms(void) { &ett_cms_RC2CBCParameters, /*--- End of included file: packet-cms-ettarr.c ---*/ -#line 153 "packet-cms-template.c" +#line 152 "packet-cms-template.c" }; /* Register protocol */ @@ -2093,7 +2092,7 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 174 "packet-cms-template.c" +#line 173 "packet-cms-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 74604e11cb..224585d5af 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -137,7 +136,7 @@ static int hf_crmf_attributes = -1; /* Attributes */ static int hf_crmf_Attributes_item = -1; /* Attribute */ /*--- End of included file: packet-crmf-hf.c ---*/ -#line 52 "packet-crmf-template.c" +#line 51 "packet-crmf-template.c" /* Initialize the subtree pointers */ @@ -171,7 +170,7 @@ static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; /*--- End of included file: packet-crmf-ett.c ---*/ -#line 55 "packet-crmf-template.c" +#line 54 "packet-crmf-template.c" static const char *object_identifier_id; @@ -867,7 +866,7 @@ static void dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-crmf-fn.c ---*/ -#line 59 "packet-crmf-template.c" +#line 58 "packet-crmf-template.c" /*--- proto_register_crmf ----------------------------------------------*/ @@ -1188,7 +1187,7 @@ void proto_register_crmf(void) { "pkix1explicit.Attribute", HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 71 "packet-crmf-template.c" +#line 70 "packet-crmf-template.c" }; /* List of subtrees */ @@ -1224,7 +1223,7 @@ void proto_register_crmf(void) { &ett_crmf_Attributes, /*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 76 "packet-crmf-template.c" +#line 75 "packet-crmf-template.c" }; /* Register protocol */ @@ -1251,6 +1250,6 @@ void proto_reg_handoff_crmf(void) { /*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 91 "packet-crmf-template.c" +#line 90 "packet-crmf-template.c" } diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index d37e78d2b5..e9ef3023a4 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -475,7 +474,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 70 "packet-dap-template.c" +#line 69 "packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -653,7 +652,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 74 "packet-dap-template.c" +#line 73 "packet-dap-template.c" /*--- Included file: packet-dap-val.h ---*/ @@ -678,7 +677,7 @@ static gint ett_dap_T_signedUpdateError = -1; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 76 "packet-dap-template.c" +#line 75 "packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ @@ -716,7 +715,7 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 78 "packet-dap-template.c" +#line 77 "packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -4752,7 +4751,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 80 "packet-dap-template.c" +#line 79 "packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ @@ -4784,7 +4783,7 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 82 "packet-dap-template.c" +#line 81 "packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ #line 1 "packet-dap-table21.c" @@ -4813,7 +4812,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 83 "packet-dap-template.c" +#line 82 "packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -6417,7 +6416,7 @@ void proto_register_dap(void) { "", HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 102 "packet-dap-template.c" +#line 101 "packet-dap-template.c" }; /* List of subtrees */ @@ -6597,7 +6596,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 108 "packet-dap-template.c" +#line 107 "packet-dap-template.c" }; module_t *dap_module; diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 133a9a150a..3e93a661fa 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -189,7 +188,7 @@ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ /*--- End of included file: packet-disp-hf.c ---*/ -#line 73 "packet-disp-template.c" +#line 72 "packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; @@ -252,7 +251,7 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 77 "packet-disp-template.c" +#line 76 "packet-disp-template.c" /*--- Included file: packet-disp-fn.c ---*/ @@ -1516,7 +1515,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-disp-fn.c ---*/ -#line 79 "packet-disp-template.c" +#line 78 "packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -2080,7 +2079,7 @@ void proto_register_disp(void) { "disp.ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 210 "packet-disp-template.c" +#line 209 "packet-disp-template.c" }; /* List of subtrees */ @@ -2145,7 +2144,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 216 "packet-disp-template.c" +#line 215 "packet-disp-template.c" }; module_t *disp_module; @@ -2184,7 +2183,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 244 "packet-disp-template.c" +#line 243 "packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 395833fe13..8de4c3932b 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> @@ -270,7 +269,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 72 "packet-dop-template.c" +#line 71 "packet-dop-template.c" /* Initialize the subtree pointers */ static gint ett_dop = -1; @@ -347,7 +346,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 77 "packet-dop-template.c" +#line 76 "packet-dop-template.c" /* Dissector table */ static dissector_table_t dop_dissector_table; @@ -2050,7 +2049,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-dop-fn.c ---*/ -#line 92 "packet-dop-template.c" +#line 91 "packet-dop-template.c" static int call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *col_info) @@ -2967,7 +2966,7 @@ void proto_register_dop(void) { "", HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 252 "packet-dop-template.c" +#line 251 "packet-dop-template.c" }; /* List of subtrees */ @@ -3046,7 +3045,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 259 "packet-dop-template.c" +#line 258 "packet-dop-template.c" }; module_t *dop_module; @@ -3102,7 +3101,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 292 "packet-dop-template.c" +#line 291 "packet-dop-template.c" /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index eb3e199d8e..132d361a1f 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -205,7 +204,7 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 67 "packet-dsp-template.c" +#line 66 "packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; @@ -284,7 +283,7 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 71 "packet-dsp-template.c" +#line 70 "packet-dsp-template.c" /*--- Included file: packet-dsp-fn.c ---*/ @@ -1732,7 +1731,7 @@ static void dissect_MasterAndShadowAccessPoints_PDU(tvbuff_t *tvb _U_, packet_in /*--- End of included file: packet-dsp-fn.c ---*/ -#line 73 "packet-dsp-template.c" +#line 72 "packet-dsp-template.c" /* * Dissect X518 PDUs inside a ROS PDUs @@ -2462,7 +2461,7 @@ void proto_register_dsp(void) { "dsp.EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 282 "packet-dsp-template.c" +#line 281 "packet-dsp-template.c" }; /* List of subtrees */ @@ -2543,7 +2542,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 288 "packet-dsp-template.c" +#line 287 "packet-dsp-template.c" }; module_t *dsp_module; @@ -2586,7 +2585,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 321 "packet-dsp-template.c" +#line 320 "packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index 0102a3573d..5573fab19f 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -47,7 +47,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> -#include <epan/emem.h> /* PROTOTYPES/FORWARDS */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 41c54291fb..96a4157069 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -42,7 +42,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -486,7 +485,7 @@ static int hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; /*--- End of included file: packet-ftam-hf.c ---*/ -#line 62 "packet-ftam-template.c" +#line 61 "packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -657,7 +656,7 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 66 "packet-ftam-template.c" +#line 65 "packet-ftam-template.c" /*--- Included file: packet-ftam-fn.c ---*/ @@ -4757,7 +4756,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ftam-fn.c ---*/ -#line 68 "packet-ftam-template.c" +#line 67 "packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -6485,7 +6484,7 @@ void proto_register_ftam(void) { "", HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 135 "packet-ftam-template.c" +#line 134 "packet-ftam-template.c" }; /* List of subtrees */ @@ -6658,7 +6657,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 141 "packet-ftam-template.c" +#line 140 "packet-ftam-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index c289fb35b4..5d60c9de8b 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -41,7 +41,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -230,7 +229,7 @@ static int hf_gnm_TransmissionCharacteristics_dCME = -1; static int hf_gnm_TransmissionCharacteristics_echoControl = -1; /*--- End of included file: packet-gnm-hf.c ---*/ -#line 53 "packet-gnm-template.c" +#line 52 "packet-gnm-template.c" /* Initialize the subtree pointers */ @@ -304,7 +303,7 @@ static gint ett_gnm_TpsInGtpList = -1; static gint ett_gnm_TransmissionCharacteristics = -1; /*--- End of included file: packet-gnm-ett.c ---*/ -#line 56 "packet-gnm-template.c" +#line 55 "packet-gnm-template.c" /*--- Included file: packet-gnm-fn.c ---*/ @@ -2032,7 +2031,7 @@ static void dissect_Version_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-gnm-fn.c ---*/ -#line 58 "packet-gnm-template.c" +#line 57 "packet-gnm-template.c" @@ -2732,7 +2731,7 @@ void proto_register_gnm(void) { "", HFILL }}, /*--- End of included file: packet-gnm-hfarr.c ---*/ -#line 85 "packet-gnm-template.c" +#line 84 "packet-gnm-template.c" }; /* List of subtrees */ @@ -2808,7 +2807,7 @@ void proto_register_gnm(void) { &ett_gnm_TransmissionCharacteristics, /*--- End of included file: packet-gnm-ettarr.c ---*/ -#line 90 "packet-gnm-template.c" +#line 89 "packet-gnm-template.c" }; /* Register protocol */ @@ -2897,7 +2896,7 @@ void proto_reg_handoff_gnm(void) { /*--- End of included file: packet-gnm-dis-tab.c ---*/ -#line 105 "packet-gnm-template.c" +#line 104 "packet-gnm-template.c" /* Wrapper to call CMIP */ register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)"); register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)"); diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index ea5bf39eb9..6de47ec086 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -58,7 +58,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/tap.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-bssap.h" diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 4c18bd23e5..da15675e77 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -59,7 +59,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/tap.h> #include <epan/emem.h> #include <epan/oids.h> @@ -1373,7 +1372,7 @@ static int hf_gsm_ss_areaEventInfo = -1; /* AreaEventInfo */ static int hf_gsm_ss_qoS = -1; /* LCS_QoS */ /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 146 "packet-gsmmap-template.c" +#line 145 "packet-gsmmap-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -1939,7 +1938,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 172 "packet-gsmmap-template.c" +#line 171 "packet-gsmmap-template.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ static dissector_handle_t data_handle; @@ -15511,7 +15510,7 @@ dissect_gsm_ss_LCS_PeriodicLocationCancellationArg(gboolean implicit_tag _U_, tv /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 748 "packet-gsmmap-template.c" +#line 747 "packet-gsmmap-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -15724,7 +15723,7 @@ const value_string gsm_map_opr_code_strings[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 759 "packet-gsmmap-template.c" +#line 758 "packet-gsmmap-template.c" { 0, NULL } }; static const value_string gsm_map_err_code_string_vals[] = { @@ -15930,7 +15929,7 @@ static const value_string gsm_map_err_code_string_vals[] = { { 109, "lcs_PeriodicLocationCancellation" }, /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 763 "packet-gsmmap-template.c" +#line 762 "packet-gsmmap-template.c" { 0, NULL } }; static const true_false_string gsm_map_extension_value = { @@ -22349,7 +22348,7 @@ void proto_register_gsm_map(void) { "gsm_map_lcs.LCS_QoS", HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2446 "packet-gsmmap-template.c" +#line 2445 "packet-gsmmap-template.c" }; /* List of subtrees */ @@ -22917,7 +22916,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2474 "packet-gsmmap-template.c" +#line 2473 "packet-gsmmap-template.c" }; /* Register protocol */ @@ -22993,7 +22992,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 2492 "packet-gsmmap-template.c" +#line 2491 "packet-gsmmap-template.c" oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" ); oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2"); /*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" ); diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 7b8b4275d0..e79fe1be5e 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -168,7 +167,7 @@ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ /*--- End of included file: packet-h235-hf.c ---*/ -#line 58 "packet-h235-template.c" +#line 57 "packet-h235-template.c" /* Initialize the subtree pointers */ @@ -208,7 +207,7 @@ static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; /*--- End of included file: packet-h235-ett.c ---*/ -#line 61 "packet-h235-template.c" +#line 60 "packet-h235-template.c" static int @@ -1054,7 +1053,7 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-h235-fn.c ---*/ -#line 70 "packet-h235-template.c" +#line 69 "packet-h235-template.c" /*--- proto_register_h235 ----------------------------------------------*/ @@ -1471,7 +1470,7 @@ void proto_register_h235(void) { "h235.NULL", HFILL }}, /*--- End of included file: packet-h235-hfarr.c ---*/ -#line 78 "packet-h235-template.c" +#line 77 "packet-h235-template.c" }; /* List of subtrees */ @@ -1513,7 +1512,7 @@ void proto_register_h235(void) { &ett_h235_FecOrder, /*--- End of included file: packet-h235-ettarr.c ---*/ -#line 83 "packet-h235-template.c" +#line 82 "packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 4ed239a967..f2ae3be628 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -46,7 +46,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/strutil.h> #include <stdio.h> @@ -216,7 +215,7 @@ typedef enum _IndicationMessage_enum { } IndicationMessage_enum; /*--- End of included file: packet-h245-val.h ---*/ -#line 89 "packet-h245-template.c" +#line 88 "packet-h245-template.c" static const value_string h245_RequestMessage_short_vals[] = { { RequestMessage_nonStandard , "NSM" }, @@ -1903,7 +1902,7 @@ static int hf_h245_encrypted = -1; /* OCTET_STRING */ static int hf_h245_encryptedAlphanumeric = -1; /* EncryptedAlphanumeric */ /*--- End of included file: packet-h245-hf.c ---*/ -#line 371 "packet-h245-template.c" +#line 370 "packet-h245-template.c" /* Initialize the subtree pointers */ static int ett_h245 = -1; @@ -2404,7 +2403,7 @@ static gint ett_h245_FlowControlIndication = -1; static gint ett_h245_MobileMultilinkReconfigurationIndication = -1; /*--- End of included file: packet-h245-ett.c ---*/ -#line 376 "packet-h245-template.c" +#line 375 "packet-h245-template.c" /* Forward declarations */ static int dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -14448,7 +14447,7 @@ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-h245-fn.c ---*/ -#line 385 "packet-h245-template.c" +#line 384 "packet-h245-template.c" static void dissect_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) @@ -20131,7 +20130,7 @@ void proto_register_h245(void) { "h245.EncryptedAlphanumeric", HFILL }}, /*--- End of included file: packet-h245-hfarr.c ---*/ -#line 463 "packet-h245-template.c" +#line 462 "packet-h245-template.c" }; /* List of subtrees */ @@ -20634,7 +20633,7 @@ void proto_register_h245(void) { &ett_h245_MobileMultilinkReconfigurationIndication, /*--- End of included file: packet-h245-ettarr.c ---*/ -#line 470 "packet-h245-template.c" +#line 469 "packet-h245-template.c" }; module_t *h245_module; diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 5d54522b20..46c461981a 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -490,7 +489,7 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 48 "packet-h282-template.c" +#line 47 "packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; @@ -642,7 +641,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 52 "packet-h282-template.c" +#line 51 "packet-h282-template.c" /* Dissectors */ @@ -4401,7 +4400,7 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h282-fn.c ---*/ -#line 58 "packet-h282-template.c" +#line 57 "packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -6160,7 +6159,7 @@ void proto_register_h282(void) { "h282.NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 80 "packet-h282-template.c" +#line 79 "packet-h282-template.c" }; /* List of subtrees */ @@ -6314,7 +6313,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 86 "packet-h282-template.c" +#line 85 "packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 8f35e58351..56d6fef785 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -89,7 +88,7 @@ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ /*--- End of included file: packet-h283-hf.c ---*/ -#line 48 "packet-h283-template.c" +#line 47 "packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; @@ -112,7 +111,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 52 "packet-h283-template.c" +#line 51 "packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -570,7 +569,7 @@ static int dissect_LCTPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h283-fn.c ---*/ -#line 61 "packet-h283-template.c" +#line 60 "packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -727,7 +726,7 @@ void proto_register_h283(void) { "h283.NULL", HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 85 "packet-h283-template.c" +#line 84 "packet-h283-template.c" }; /* List of subtrees */ @@ -752,7 +751,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 91 "packet-h283-template.c" +#line 90 "packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 98808b7606..159873d511 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -134,7 +133,7 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 97 "packet-h323-template.c" +#line 96 "packet-h323-template.c" /* Initialize the subtree pointers */ @@ -155,7 +154,7 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 100 "packet-h323-template.c" +#line 99 "packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ @@ -446,7 +445,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 102 "packet-h323-template.c" +#line 101 "packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -570,7 +569,7 @@ void proto_register_h323(void) { "h323.NULL", HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 109 "packet-h323-template.c" +#line 108 "packet-h323-template.c" }; /* List of subtrees */ @@ -593,7 +592,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 114 "packet-h323-template.c" +#line 113 "packet-h323-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 2eecc42ee6..d17c82fa42 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -42,7 +42,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -450,7 +449,7 @@ static int hf_h450_12_ssMWICallbackCall = -1; /* NULL */ static int hf_h450_12_ssCISilentMonitorPermitted = -1; /* NULL */ /*--- End of included file: packet-h450-hf.c ---*/ -#line 57 "packet-h450-template.c" +#line 56 "packet-h450-template.c" /* Initialize the subtree pointers */ @@ -628,7 +627,7 @@ static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; /*--- End of included file: packet-h450-ett.c ---*/ -#line 60 "packet-h450-template.c" +#line 59 "packet-h450-template.c" static const value_string h450_str_operation[] = { @@ -731,7 +730,7 @@ static const value_string h450_str_operation[] = { { 85, "cmnInform" }, /*--- End of included file: packet-h450-table10.c ---*/ -#line 63 "packet-h450-template.c" +#line 62 "packet-h450-template.c" { 0, NULL} }; @@ -819,7 +818,7 @@ static const value_string h450_str_error[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table20.c ---*/ -#line 68 "packet-h450-template.c" +#line 67 "packet-h450-template.c" { 0, NULL} }; @@ -4484,7 +4483,7 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h450-fn.c ---*/ -#line 77 "packet-h450-template.c" +#line 76 "packet-h450-template.c" typedef struct _h450_op_t { gint32 opcode; @@ -4593,7 +4592,7 @@ static const h450_op_t h450_op_tab[] = { /* cmnInform */ { 85, dissect_h450_12_CmnArg_PDU, NULL }, /*--- End of included file: packet-h450-table11.c ---*/ -#line 86 "packet-h450-template.c" +#line 85 "packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4685,7 +4684,7 @@ static const h450_err_t h450_err_tab[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table21.c ---*/ -#line 95 "packet-h450-template.c" +#line 94 "packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -6278,7 +6277,7 @@ void proto_register_h450(void) { "h450_12.NULL", HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 255 "packet-h450-template.c" +#line 254 "packet-h450-template.c" }; /* List of subtrees */ @@ -6458,7 +6457,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 260 "packet-h450-template.c" +#line 259 "packet-h450-template.c" }; diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index cf91a3d93c..fcc39b73bd 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -260,7 +259,7 @@ static int hf_h460_21_capability = -1; /* Capability */ static int hf_h460_21_sourceAddress = -1; /* UnicastAddress */ /*--- End of included file: packet-h460-hf.c ---*/ -#line 51 "packet-h460-template.c" +#line 50 "packet-h460-template.c" /* Initialize the subtree pointers */ @@ -357,7 +356,7 @@ static gint ett_h460_21_SEQUENCE_SIZE_1_256_OF_Capability = -1; static gint ett_h460_21_TransmitCapabilities = -1; /*--- End of included file: packet-h460-ett.c ---*/ -#line 54 "packet-h460-template.c" +#line 53 "packet-h460-template.c" /* Subdissectors */ static dissector_handle_t q931_ie_handle = NULL; @@ -1968,7 +1967,7 @@ static int dissect_h460_21_CapabilityAdvertisement_PDU(tvbuff_t *tvb _U_, packet /*--- End of included file: packet-h460-fn.c ---*/ -#line 60 "packet-h460-template.c" +#line 59 "packet-h460-template.c" static int dissect_ies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -2873,7 +2872,7 @@ void proto_register_h460(void) { "h245.UnicastAddress", HFILL }}, /*--- End of included file: packet-h460-hfarr.c ---*/ -#line 250 "packet-h460-template.c" +#line 249 "packet-h460-template.c" }; /* List of subtrees */ @@ -2972,7 +2971,7 @@ void proto_register_h460(void) { &ett_h460_21_TransmitCapabilities, /*--- End of included file: packet-h460-ettarr.c ---*/ -#line 255 "packet-h460-template.c" +#line 254 "packet-h460-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index 9fa65d5a14..b3d49f9dd2 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -311,7 +310,7 @@ static int hf_h501_releaseCompleteReason = -1; /* ReleaseCompleteReason */ static int hf_h501_causeIE = -1; /* INTEGER_1_65535 */ /*--- End of included file: packet-h501-hf.c ---*/ -#line 52 "packet-h501-template.c" +#line 51 "packet-h501-template.c" /* Initialize the subtree pointers */ static int ett_h501 = -1; @@ -419,7 +418,7 @@ static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; /*--- End of included file: packet-h501-ett.c ---*/ -#line 56 "packet-h501-template.c" +#line 55 "packet-h501-template.c" /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -2521,7 +2520,7 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-h501-fn.c ---*/ -#line 68 "packet-h501-template.c" +#line 67 "packet-h501-template.c" static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -3563,7 +3562,7 @@ void proto_register_h501(void) { "h501.INTEGER_1_65535", HFILL }}, /*--- End of included file: packet-h501-hfarr.c ---*/ -#line 105 "packet-h501-template.c" +#line 104 "packet-h501-template.c" }; /* List of subtrees */ @@ -3673,7 +3672,7 @@ void proto_register_h501(void) { &ett_h501_TerminationCause, /*--- End of included file: packet-h501-ettarr.c ---*/ -#line 111 "packet-h501-template.c" +#line 110 "packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index b1e2a38c5a..d1a7d75b78 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include "epan/expert.h" #include <epan/asn1.h> @@ -442,7 +441,7 @@ int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 59 "packet-inap-template.c" +#line 58 "packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ @@ -997,7 +996,7 @@ static int hf_inap_present = -1; /* INTEGER */ static int hf_inap_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-inap-hf.c ---*/ -#line 61 "packet-inap-template.c" +#line 60 "packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1255,7 +1254,7 @@ static gint ett_inap_T_problem = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 81 "packet-inap-template.c" +#line 80 "packet-inap-template.c" /*--- Included file: packet-inap-table.c ---*/ @@ -1363,7 +1362,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 83 "packet-inap-template.c" +#line 82 "packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -8783,7 +8782,7 @@ static int dissect_SRFCallGapArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-inap-fn.c ---*/ -#line 97 "packet-inap-template.c" +#line 96 "packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9122,7 +9121,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 118 "packet-inap-template.c" +#line 117 "packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -11398,7 +11397,7 @@ void proto_register_inap(void) { "inap.InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 197 "packet-inap-template.c" +#line 196 "packet-inap-template.c" }; @@ -11648,7 +11647,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 209 "packet-inap-template.c" +#line 208 "packet-inap-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 4ef5fc572a..28ccd8ab2f 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -44,7 +44,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> /* magic num used for heuristic */ static const guint8 lanforge_magic[] = { 0x1a, 0x2b, 0x3c, 0x4d }; diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index c33b08a878..54c183df68 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -90,7 +89,7 @@ static dissector_handle_t nas_eps_handle = NULL; #define maxReestabInfo 32 /*--- End of included file: packet-lte-rrc-val.h ---*/ -#line 53 "packet-lte-rrc-template.c" +#line 52 "packet-lte-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_lte_rrc = -1; @@ -1179,7 +1178,7 @@ static int hf_lte_rrc_key_eNodeB_Star = -1; /* Key_eNodeB_Star */ static int hf_lte_rrc_ue_InactiveTime = -1; /* T_ue_InactiveTime */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ -#line 58 "packet-lte-rrc-template.c" +#line 57 "packet-lte-rrc-template.c" /* Initialize the subtree pointers */ static int ett_lte_rrc = -1; @@ -1775,7 +1774,7 @@ static gint ett_lte_rrc_AdditionalReestabInfoList_item = -1; static gint ett_lte_rrc_RRM_Configuration = -1; /*--- End of included file: packet-lte-rrc-ett.c ---*/ -#line 63 "packet-lte-rrc-template.c" +#line 62 "packet-lte-rrc-template.c" /* Global variables */ static proto_tree *top_tree; @@ -16816,7 +16815,7 @@ static int dissect_UECapabilityInformation_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 70 "packet-lte-rrc-template.c" +#line 69 "packet-lte-rrc-template.c" /*--- proto_register_rrc -------------------------------------------*/ void proto_register_lte_rrc(void) { @@ -21145,7 +21144,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_ue_InactiveTime", HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 78 "packet-lte-rrc-template.c" +#line 77 "packet-lte-rrc-template.c" }; /* List of subtrees */ @@ -21742,7 +21741,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_RRM_Configuration, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 84 "packet-lte-rrc-template.c" +#line 83 "packet-lte-rrc-template.c" }; @@ -21766,7 +21765,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 95 "packet-lte-rrc-template.c" +#line 94 "packet-lte-rrc-template.c" } diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 93dd0f540d..a49f9f74d4 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -39,7 +39,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -1180,7 +1179,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-nbap-val.h ---*/ -#line 53 "packet-nbap-template.c" +#line 52 "packet-nbap-template.c" /* Initialize the protocol and registered fields */ static int proto_nbap = -1; @@ -4201,7 +4200,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1; static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-nbap-hf.c ---*/ -#line 58 "packet-nbap-template.c" +#line 57 "packet-nbap-template.c" /* Initialize the subtree pointers */ static int ett_nbap = -1; @@ -5700,7 +5699,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1; static gint ett_nbap_Outcome = -1; /*--- End of included file: packet-nbap-ett.c ---*/ -#line 63 "packet-nbap-template.c" +#line 62 "packet-nbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -47738,7 +47737,7 @@ static void dissect_NBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-nbap-fn.c ---*/ -#line 84 "packet-nbap-template.c" +#line 83 "packet-nbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -59836,7 +59835,7 @@ void proto_register_nbap(void) { "", HFILL }}, /*--- End of included file: packet-nbap-hfarr.c ---*/ -#line 137 "packet-nbap-template.c" +#line 136 "packet-nbap-template.c" }; /* List of subtrees */ @@ -61336,7 +61335,7 @@ void proto_register_nbap(void) { &ett_nbap_Outcome, /*--- End of included file: packet-nbap-ettarr.c ---*/ -#line 143 "packet-nbap-template.c" +#line 142 "packet-nbap-template.c" }; @@ -62360,7 +62359,7 @@ proto_reg_handoff_nbap(void) /*--- End of included file: packet-nbap-dis-tab.c ---*/ -#line 176 "packet-nbap-template.c" +#line 175 "packet-nbap-template.c" } diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 1d800258e2..a5c87f21af 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -67,7 +66,7 @@ static int hf_ns_cert_exts_CertType_server = -1; static int hf_ns_cert_exts_CertType_ca = -1; /*--- End of included file: packet-ns_cert_exts-hf.c ---*/ -#line 46 "packet-ns_cert_exts-template.c" +#line 45 "packet-ns_cert_exts-template.c" /* Initialize the subtree pointers */ @@ -76,7 +75,7 @@ static int hf_ns_cert_exts_CertType_ca = -1; static gint ett_ns_cert_exts_CertType = -1; /*--- End of included file: packet-ns_cert_exts-ett.c ---*/ -#line 49 "packet-ns_cert_exts-template.c" +#line 48 "packet-ns_cert_exts-template.c" /*--- Included file: packet-ns_cert_exts-fn.c ---*/ @@ -220,7 +219,7 @@ static void dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ns_cert_exts-fn.c ---*/ -#line 51 "packet-ns_cert_exts-template.c" +#line 50 "packet-ns_cert_exts-template.c" /*--- proto_register_ns_cert_exts -------------------------------------------*/ @@ -277,7 +276,7 @@ void proto_register_ns_cert_exts(void) { "", HFILL }}, /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 59 "packet-ns_cert_exts-template.c" +#line 58 "packet-ns_cert_exts-template.c" }; /* List of subtrees */ @@ -288,7 +287,7 @@ void proto_register_ns_cert_exts(void) { &ett_ns_cert_exts_CertType, /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 64 "packet-ns_cert_exts-template.c" +#line 63 "packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -317,6 +316,6 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 79 "packet-ns_cert_exts-template.c" +#line 78 "packet-ns_cert_exts-template.c" } diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index f0e9d57bea..2c6016b6bf 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -438,7 +437,7 @@ static int hf_p7_T_entry_class_problem_entry_class_not_subscribed = -1; static int hf_p7_T_entry_class_problem_inappropriate_entry_class = -1; /*--- End of included file: packet-p7-hf.c ---*/ -#line 64 "packet-p7-template.c" +#line 63 "packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; @@ -580,7 +579,7 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 68 "packet-p7-template.c" +#line 67 "packet-p7-template.c" /*--- Included file: packet-p7-val.h ---*/ @@ -612,7 +611,7 @@ static gint ett_p7_RTABapdu = -1; #define err_entry_class_error 34 /*--- End of included file: packet-p7-val.h ---*/ -#line 70 "packet-p7-template.c" +#line 69 "packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ @@ -655,7 +654,7 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 72 "packet-p7-template.c" +#line 71 "packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ @@ -4057,7 +4056,7 @@ static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-p7-fn.c ---*/ -#line 74 "packet-p7-template.c" +#line 73 "packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ @@ -4089,7 +4088,7 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 76 "packet-p7-template.c" +#line 75 "packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ #line 1 "packet-p7-table21.c" @@ -4128,7 +4127,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 77 "packet-p7-template.c" +#line 76 "packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -5608,7 +5607,7 @@ void proto_register_p7(void) { "", HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 96 "packet-p7-template.c" +#line 95 "packet-p7-template.c" }; /* List of subtrees */ @@ -5752,7 +5751,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 102 "packet-p7-template.c" +#line 101 "packet-p7-template.c" }; module_t *p7_module; @@ -5811,7 +5810,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 128 "packet-p7-template.c" +#line 127 "packet-p7-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 5183a3b5e8..6729bae3ac 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -43,11 +43,9 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> -#include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -208,7 +206,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ -#line 65 "packet-pcap-template.c" +#line 63 "packet-pcap-template.c" static dissector_handle_t pcap_handle = NULL; @@ -1075,7 +1073,7 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-pcap-hf.c ---*/ -#line 72 "packet-pcap-template.c" +#line 70 "packet-pcap-template.c" /* Initialize the subtree pointers */ static int ett_pcap = -1; @@ -1407,7 +1405,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; /*--- End of included file: packet-pcap-ett.c ---*/ -#line 77 "packet-pcap-template.c" +#line 75 "packet-pcap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -11048,7 +11046,7 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pcap-fn.c ---*/ -#line 101 "packet-pcap-template.c" +#line 99 "packet-pcap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -11216,7 +11214,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 176 "packet-pcap-template.c" +#line 174 "packet-pcap-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -14653,7 +14651,7 @@ void proto_register_pcap(void) { "", HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 192 "packet-pcap-template.c" +#line 190 "packet-pcap-template.c" }; /* List of subtrees */ @@ -14986,7 +14984,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 198 "packet-pcap-template.c" +#line 196 "packet-pcap-template.c" }; module_t *pcap_module; diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 82ed6dca48..c7c677c611 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -69,7 +68,7 @@ static int hf_pkcs1_digestAlgorithm = -1; /* DigestAlgorithmIdentifier * static int hf_pkcs1_digest = -1; /* Digest */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 49 "packet-pkcs1-template.c" +#line 48 "packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -80,7 +79,7 @@ static gint ett_pkcs1_RSAPrivateKey = -1; static gint ett_pkcs1_DigestInfo = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 52 "packet-pkcs1-template.c" +#line 51 "packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -178,7 +177,7 @@ dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 54 "packet-pkcs1-template.c" +#line 53 "packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -234,7 +233,7 @@ void proto_register_pkcs1(void) { "pkcs1.Digest", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 61 "packet-pkcs1-template.c" +#line 60 "packet-pkcs1-template.c" }; /* List of subtrees */ @@ -247,7 +246,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_DigestInfo, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 66 "packet-pkcs1-template.c" +#line 65 "packet-pkcs1-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 5ba511390b..e46ec0f0e7 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -146,7 +145,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 83 "packet-pkcs12-template.c" +#line 82 "packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -174,7 +173,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 86 "packet-pkcs12-template.c" +#line 85 "packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1130,7 +1129,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 387 "packet-pkcs12-template.c" +#line 386 "packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1418,7 +1417,7 @@ void proto_register_pkcs12(void) { "x509af.AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 454 "packet-pkcs12-template.c" +#line 453 "packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1449,7 +1448,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 460 "packet-pkcs12-template.c" +#line 459 "packet-pkcs12-template.c" }; module_t *pkcs12_module; @@ -1510,7 +1509,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 492 "packet-pkcs12-template.c" +#line 491 "packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index f99e824b71..d8de5d3199 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -81,7 +80,7 @@ static int hf_pkinit_dhNonce = -1; /* INTEGER */ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- End of included file: packet-pkinit-hf.c ---*/ -#line 51 "packet-pkinit-template.c" +#line 50 "packet-pkinit-template.c" /* Initialize the subtree pointers */ @@ -97,7 +96,7 @@ static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; /*--- End of included file: packet-pkinit-ett.c ---*/ -#line 54 "packet-pkinit-template.c" +#line 53 "packet-pkinit-template.c" static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); @@ -286,7 +285,7 @@ static void dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkinit-fn.c ---*/ -#line 59 "packet-pkinit-template.c" +#line 58 "packet-pkinit-template.c" int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { @@ -407,7 +406,7 @@ void proto_register_pkinit(void) { "KerberosV5Spec2.KerberosTime", HFILL }}, /*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 91 "packet-pkinit-template.c" +#line 90 "packet-pkinit-template.c" }; /* List of subtrees */ @@ -425,7 +424,7 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, /*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 96 "packet-pkinit-template.c" +#line 95 "packet-pkinit-template.c" }; /* Register protocol */ @@ -448,6 +447,6 @@ void proto_reg_handoff_pkinit(void) { /*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 111 "packet-pkinit-template.c" +#line 110 "packet-pkinit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 2d2632f293..9ad8f69d7b 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <epan/oids.h> #include <epan/afn.h> @@ -112,7 +111,7 @@ static int hf_pkix1explicit_min_01 = -1; /* ASId */ static int hf_pkix1explicit_max_01 = -1; /* ASId */ /*--- End of included file: packet-pkix1explicit-hf.c ---*/ -#line 60 "packet-pkix1explicit-template.c" +#line 59 "packet-pkix1explicit-template.c" /* Initialize the subtree pointers */ @@ -142,7 +141,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; /*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 63 "packet-pkix1explicit-template.c" +#line 62 "packet-pkix1explicit-template.c" static const char *object_identifier_id; @@ -815,7 +814,7 @@ static void dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 107 "packet-pkix1explicit-template.c" +#line 106 "packet-pkix1explicit-template.c" /*--- proto_register_pkix1explicit ----------------------------------------------*/ @@ -1011,7 +1010,7 @@ void proto_register_pkix1explicit(void) { "pkix1explicit.ASId", HFILL }}, /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 126 "packet-pkix1explicit-template.c" +#line 125 "packet-pkix1explicit-template.c" }; /* List of subtrees */ @@ -1044,7 +1043,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_ASRange, /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 132 "packet-pkix1explicit-template.c" +#line 131 "packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1070,6 +1069,6 @@ void proto_reg_handoff_pkix1explicit(void) { /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 148 "packet-pkix1explicit-template.c" +#line 147 "packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 054c72cafb..51d3eeadbe 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -36,7 +36,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -71,7 +70,7 @@ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 49 "packet-pkix1implicit-template.c" +#line 48 "packet-pkix1implicit-template.c" /* Initialize the subtree pointers */ @@ -85,7 +84,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 52 "packet-pkix1implicit-template.c" +#line 51 "packet-pkix1implicit-template.c" int @@ -285,7 +284,7 @@ static void dissect_AuthorityInfoAccessSyntax_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 68 "packet-pkix1implicit-template.c" +#line 67 "packet-pkix1implicit-template.c" /*--- proto_register_pkix1implicit ----------------------------------------------*/ @@ -350,7 +349,7 @@ void proto_register_pkix1implicit(void) { "pkix1implicit.UTF8String", HFILL }}, /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 76 "packet-pkix1implicit-template.c" +#line 75 "packet-pkix1implicit-template.c" }; /* List of subtrees */ @@ -366,7 +365,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 81 "packet-pkix1implicit-template.c" +#line 80 "packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -421,6 +420,6 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 96 "packet-pkix1implicit-template.c" +#line 95 "packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 22dd3e772a..260c4eecbb 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -80,7 +79,7 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrati static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ /*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 51 "packet-pkixqualified-template.c" +#line 50 "packet-pkixqualified-template.c" /* Initialize the subtree pointers */ @@ -95,7 +94,7 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 54 "packet-pkixqualified-template.c" +#line 53 "packet-pkixqualified-template.c" static const char *object_identifier_id; @@ -357,7 +356,7 @@ static void dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 58 "packet-pkixqualified-template.c" +#line 57 "packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -450,7 +449,7 @@ void proto_register_pkixqualified(void) { "x509ce.GeneralName", HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 66 "packet-pkixqualified-template.c" +#line 65 "packet-pkixqualified-template.c" }; /* List of subtrees */ @@ -467,7 +466,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 71 "packet-pkixqualified-template.c" +#line 70 "packet-pkixqualified-template.c" }; /* Register protocol */ @@ -498,6 +497,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 86 "packet-pkixqualified-template.c" +#line 85 "packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index c9321c0634..7b6d2aed45 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -37,7 +37,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -96,7 +95,7 @@ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ /*--- End of included file: packet-q932-hf.c ---*/ -#line 50 "packet-q932-template.c" +#line 49 "packet-q932-template.c" /* Initialize the subtree pointers */ static gint ett_q932 = -1; @@ -119,7 +118,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; /*--- End of included file: packet-q932-ett.c ---*/ -#line 55 "packet-q932-template.c" +#line 54 "packet-q932-template.c" /* Preferences */ @@ -635,7 +634,7 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info * /*--- End of included file: packet-q932-fn.c ---*/ -#line 125 "packet-q932-template.c" +#line 124 "packet-q932-template.c" /*--- dissect_q932_facility_ie -------------------------------------------------------*/ /*static*/ void @@ -957,7 +956,7 @@ void proto_register_q932(void) { "q932.AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 294 "packet-q932-template.c" +#line 293 "packet-q932-template.c" }; /* List of subtrees */ @@ -982,7 +981,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 301 "packet-q932-template.c" +#line 300 "packet-q932-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index bd3e978eeb..938b0b4bea 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -37,7 +37,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -486,7 +485,7 @@ static const value_string qsig_str_operation[] = { { 120, "mIDMailboxID" }, /*--- End of included file: packet-qsig-table10.c ---*/ -#line 273 "packet-qsig-template.c" +#line 272 "packet-qsig-template.c" { 0, NULL} }; @@ -663,7 +662,7 @@ static const value_string qsig_str_error[] = { { 1008, "unspecified" }, /*--- End of included file: packet-qsig-table20.c ---*/ -#line 278 "packet-qsig-template.c" +#line 277 "packet-qsig-template.c" { 0, NULL} }; @@ -1558,7 +1557,7 @@ static int hf_qsig_mid_multipleExtension = -1; /* SEQUENCE_OF_Extension */ static int hf_qsig_mid_multipleExtension_item = -1; /* Extension */ /*--- End of included file: packet-qsig-hf.c ---*/ -#line 294 "packet-qsig-template.c" +#line 293 "packet-qsig-template.c" static int *hf_qsig_ie_type_arr[] = { NULL, @@ -2018,7 +2017,7 @@ static gint ett_qsig_mid_MIDExtensions = -1; static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1; /*--- End of included file: packet-qsig-ett.c ---*/ -#line 311 "packet-qsig-template.c" +#line 310 "packet-qsig-template.c" /* Preferences */ @@ -11895,7 +11894,7 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-qsig-fn.c ---*/ -#line 321 "packet-qsig-template.c" +#line 320 "packet-qsig-template.c" typedef struct _qsig_op_t { gint32 opcode; @@ -12113,7 +12112,7 @@ static const qsig_op_t qsig_op_tab[] = { /* mIDMailboxID */ { 120, dissect_qsig_mid_MIDMailboxIDArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU }, /*--- End of included file: packet-qsig-table11.c ---*/ -#line 330 "packet-qsig-template.c" +#line 329 "packet-qsig-template.c" }; typedef struct _qsig_err_t { @@ -12294,7 +12293,7 @@ static const qsig_err_t qsig_err_tab[] = { /* unspecified */ { 1008, dissect_qsig_mid_Extension_PDU }, /*--- End of included file: packet-qsig-table21.c ---*/ -#line 339 "packet-qsig-template.c" +#line 338 "packet-qsig-template.c" }; static const qsig_op_t *get_op(gint32 opcode) { @@ -15809,7 +15808,7 @@ void proto_register_qsig(void) { "qsig.Extension", HFILL }}, /*--- End of included file: packet-qsig-hfarr.c ---*/ -#line 616 "packet-qsig-template.c" +#line 615 "packet-qsig-template.c" }; /* List of subtrees */ @@ -16260,7 +16259,7 @@ void proto_register_qsig(void) { &ett_qsig_mid_SEQUENCE_OF_Extension, /*--- End of included file: packet-qsig-ettarr.c ---*/ -#line 624 "packet-qsig-template.c" +#line 623 "packet-qsig-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 0e3c7c8348..15addc31d4 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -39,7 +39,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -344,7 +343,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 62 "packet-ranap-template.c" +#line 61 "packet-ranap-template.c" /* Initialize the protocol and registered fields */ static int proto_ranap = -1; @@ -942,7 +941,7 @@ static int hf_ranap_value_02 = -1; /* T_value_02 */ static int hf_ranap_value_03 = -1; /* T_value_03 */ /*--- End of included file: packet-ranap-hf.c ---*/ -#line 68 "packet-ranap-template.c" +#line 67 "packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1229,7 +1228,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 73 "packet-ranap-template.c" +#line 72 "packet-ranap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -10867,7 +10866,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ranap-fn.c ---*/ -#line 121 "packet-ranap-template.c" +#line 120 "packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -13320,7 +13319,7 @@ void proto_register_ranap(void) { "ranap.T_value_03", HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 221 "packet-ranap-template.c" +#line 220 "packet-ranap-template.c" }; /* List of subtrees */ @@ -13608,7 +13607,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 227 "packet-ranap-template.c" +#line 226 "packet-ranap-template.c" }; @@ -13931,7 +13930,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 270 "packet-ranap-template.c" +#line 269 "packet-ranap-template.c" } else { dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 315ab405a8..0041940087 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -42,7 +42,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -815,7 +814,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ -#line 58 "packet-rnsap-template.c" +#line 57 "packet-rnsap-template.c" static dissector_handle_t rrc_dl_dcch_handle = NULL; @@ -2982,7 +2981,7 @@ static int hf_rnsap_value_04 = -1; /* UnsuccessfulOutcome_value * static int hf_rnsap_value_05 = -1; /* Outcome_value */ /*--- End of included file: packet-rnsap-hf.c ---*/ -#line 65 "packet-rnsap-template.c" +#line 64 "packet-rnsap-template.c" /* Initialize the subtree pointers */ static int ett_rnsap = -1; @@ -4045,7 +4044,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; /*--- End of included file: packet-rnsap-ett.c ---*/ -#line 70 "packet-rnsap-template.c" +#line 69 "packet-rnsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -35592,7 +35591,7 @@ static void dissect_RNSAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-rnsap-fn.c ---*/ -#line 91 "packet-rnsap-template.c" +#line 90 "packet-rnsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -44270,7 +44269,7 @@ void proto_register_rnsap(void) { "rnsap.Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 144 "packet-rnsap-template.c" +#line 143 "packet-rnsap-template.c" }; /* List of subtrees */ @@ -45334,7 +45333,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 150 "packet-rnsap-template.c" +#line 149 "packet-rnsap-template.c" }; @@ -46044,7 +46043,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 189 "packet-rnsap-template.c" +#line 188 "packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 4d1236133d..6e712ad08e 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -41,7 +41,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -190,7 +189,7 @@ static dissector_handle_t rrc_ue_radio_access_cap_info_handle=NULL; #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 61 "packet-rrc-template.c" +#line 60 "packet-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_rrc = -1; @@ -6999,7 +6998,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1; static int hf_rrc_GsmSecurityCapability_a5_1 = -1; /*--- End of included file: packet-rrc-hf.c ---*/ -#line 66 "packet-rrc-template.c" +#line 65 "packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -11258,7 +11257,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1; static gint ett_rrc_UL_RFC3095_Context = -1; /*--- End of included file: packet-rrc-ett.c ---*/ -#line 71 "packet-rrc-template.c" +#line 70 "packet-rrc-template.c" /* Global variables */ static proto_tree *top_tree; @@ -99255,7 +99254,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 76 "packet-rrc-template.c" +#line 75 "packet-rrc-template.c" /* TODO: Remove the dummy function when these functions are taken into use @@ -126504,7 +126503,7 @@ void proto_register_rrc(void) { "", HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 128 "packet-rrc-template.c" +#line 127 "packet-rrc-template.c" }; /* List of subtrees */ @@ -130764,7 +130763,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 134 "packet-rrc-template.c" +#line 133 "packet-rrc-template.c" }; @@ -130835,7 +130834,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 146 "packet-rrc-template.c" +#line 145 "packet-rrc-template.c" } diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 7d728fe238..e041324437 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -502,7 +501,7 @@ static int hf_rrlp_PositionData_gps = -1; static int hf_rrlp_PositionData_galileo = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 62 "packet-rrlp-template.c" +#line 61 "packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; @@ -666,7 +665,7 @@ static gint ett_rrlp_GANSS_SgnElement = -1; static gint ett_rrlp_Rel7_AssistanceData_Extension = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 66 "packet-rrlp-template.c" +#line 65 "packet-rrlp-template.c" /* Include constants */ @@ -678,7 +677,7 @@ static gint ett_rrlp_Rel7_AssistanceData_Extension = -1; #define maxGANSSAssistanceData 40 /*--- End of included file: packet-rrlp-val.h ---*/ -#line 69 "packet-rrlp-template.c" +#line 68 "packet-rrlp-template.c" @@ -4578,7 +4577,7 @@ static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rrlp-fn.c ---*/ -#line 72 "packet-rrlp-template.c" +#line 71 "packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -6312,7 +6311,7 @@ void proto_register_rrlp(void) { "", HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 81 "packet-rrlp-template.c" +#line 80 "packet-rrlp-template.c" }; /* List of subtrees */ @@ -6478,7 +6477,7 @@ void proto_register_rrlp(void) { &ett_rrlp_Rel7_AssistanceData_Extension, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 87 "packet-rrlp-template.c" +#line 86 "packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index f9b0a992c3..a1e27154a5 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -41,12 +41,10 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> #include <ctype.h> -#include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -257,7 +255,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 66 "packet-s1ap-template.c" +#line 64 "packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -602,7 +600,7 @@ static int hf_s1ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_s1ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-s1ap-hf.c ---*/ -#line 71 "packet-s1ap-template.c" +#line 69 "packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -790,7 +788,7 @@ static gint ett_s1ap_SuccessfulOutcome = -1; static gint ett_s1ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 76 "packet-s1ap-template.c" +#line 74 "packet-s1ap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -6451,7 +6449,7 @@ static int dissect_S1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 103 "packet-s1ap-template.c" +#line 101 "packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -6693,7 +6691,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 172 "packet-s1ap-template.c" +#line 170 "packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete("sctp.port", SctpPort, s1ap_handle); @@ -8058,7 +8056,7 @@ void proto_register_s1ap(void) { "s1ap.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 192 "packet-s1ap-template.c" +#line 190 "packet-s1ap-template.c" }; /* List of subtrees */ @@ -8247,7 +8245,7 @@ void proto_register_s1ap(void) { &ett_s1ap_UnsuccessfulOutcome, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 198 "packet-s1ap-template.c" +#line 196 "packet-s1ap-template.c" }; module_t *s1ap_module; diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index 2859115f04..1df419e167 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -122,7 +121,7 @@ static int hf_s4406_Acp127NotificationType_positive = -1; static int hf_s4406_Acp127NotificationType_transfer = -1; /*--- End of included file: packet-s4406-hf.c ---*/ -#line 54 "packet-s4406-template.c" +#line 53 "packet-s4406-template.c" /* Initialize the subtree pointers */ static gint ett_s4406 = -1; @@ -152,7 +151,7 @@ static gint ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel = -1; static gint ett_s4406_BodyPartSecurityLabel = -1; /*--- End of included file: packet-s4406-ett.c ---*/ -#line 58 "packet-s4406-template.c" +#line 57 "packet-s4406-template.c" /*--- Included file: packet-s4406-fn.c ---*/ @@ -874,7 +873,7 @@ static void dissect_PriorityLevelQualifier_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-s4406-fn.c ---*/ -#line 60 "packet-s4406-template.c" +#line 59 "packet-s4406-template.c" /* @@ -1147,7 +1146,7 @@ void proto_register_s4406(void) { "", HFILL }}, /*--- End of included file: packet-s4406-hfarr.c ---*/ -#line 96 "packet-s4406-template.c" +#line 95 "packet-s4406-template.c" }; /* List of subtrees */ @@ -1179,7 +1178,7 @@ void proto_register_s4406(void) { &ett_s4406_BodyPartSecurityLabel, /*--- End of included file: packet-s4406-ettarr.c ---*/ -#line 102 "packet-s4406-template.c" +#line 101 "packet-s4406-template.c" }; /* Register protocol */ @@ -1221,7 +1220,7 @@ void proto_reg_handoff_s4406(void) { /*--- End of included file: packet-s4406-dis-tab.c ---*/ -#line 117 "packet-s4406-template.c" +#line 116 "packet-s4406-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_s4406, proto_s4406, "Military Message"); diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 3fb20879f5..853f521451 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -39,13 +39,11 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> #include <epan/asn1.h> -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-per.h" @@ -104,7 +102,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sabp-val.h ---*/ -#line 58 "packet-sabp-template.c" +#line 56 "packet-sabp-template.c" /* Initialize the protocol and registered fields */ static int proto_sabp = -1; @@ -190,7 +188,7 @@ static int hf_sabp_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_sabp_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-sabp-hf.c ---*/ -#line 64 "packet-sabp-template.c" +#line 62 "packet-sabp-template.c" /* Initialize the subtree pointers */ static int ett_sabp = -1; @@ -242,7 +240,7 @@ static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sabp-ett.c ---*/ -#line 72 "packet-sabp-template.c" +#line 70 "packet-sabp-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1593,7 +1591,7 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-sabp-fn.c ---*/ -#line 96 "packet-sabp-template.c" +#line 94 "packet-sabp-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -1981,7 +1979,7 @@ void proto_register_sabp(void) { "sabp.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 179 "packet-sabp-template.c" +#line 177 "packet-sabp-template.c" }; /* List of subtrees */ @@ -2034,7 +2032,7 @@ void proto_register_sabp(void) { &ett_sabp_UnsuccessfulOutcome, /*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 188 "packet-sabp-template.c" +#line 186 "packet-sabp-template.c" }; @@ -2112,7 +2110,7 @@ proto_reg_handoff_sabp(void) /*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 224 "packet-sabp-template.c" +#line 222 "packet-sabp-template.c" } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index c00dbbd891..fd9121616b 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -89,7 +88,7 @@ static int hf_smrse_sm_diag_info = -1; /* RP_UD */ static int hf_smrse_ms_address = -1; /* SMS_Address */ /*--- End of included file: packet-smrse-hf.c ---*/ -#line 54 "packet-smrse-template.c" +#line 53 "packet-smrse-template.c" /* Initialize the subtree pointers */ static gint ett_smrse = -1; @@ -109,7 +108,7 @@ static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; /*--- End of included file: packet-smrse-ett.c ---*/ -#line 58 "packet-smrse-template.c" +#line 57 "packet-smrse-template.c" @@ -485,7 +484,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-smrse-fn.c ---*/ -#line 61 "packet-smrse-template.c" +#line 60 "packet-smrse-template.c" static const value_string tag_vals[] = { { 1, "AliveTest" }, @@ -701,7 +700,7 @@ void proto_register_smrse(void) { "smrse.SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 168 "packet-smrse-template.c" +#line 167 "packet-smrse-template.c" }; /* List of subtrees */ @@ -723,7 +722,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 174 "packet-smrse-template.c" +#line 173 "packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index df52f369dd..cae65584e7 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -38,12 +38,10 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -176,7 +174,7 @@ static int hf_t125_Segmentation_begin = -1; static int hf_t125_Segmentation_end = -1; /*--- End of included file: packet-t125-hf.c ---*/ -#line 50 "packet-t125-template.c" +#line 48 "packet-t125-template.c" /* Initialize the subtree pointers */ static int ett_t125 = -1; @@ -252,7 +250,7 @@ static gint ett_t125_ConnectMCSPDU = -1; static gint ett_t125_DomainMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 54 "packet-t125-template.c" +#line 52 "packet-t125-template.c" /*--- Included file: packet-t125-fn.c ---*/ @@ -2125,7 +2123,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 56 "packet-t125-template.c" +#line 54 "packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) @@ -2635,7 +2633,7 @@ void proto_register_t125(void) { "", HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 97 "packet-t125-template.c" +#line 95 "packet-t125-template.c" }; /* List of subtrees */ @@ -2713,7 +2711,7 @@ void proto_register_t125(void) { &ett_t125_DomainMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 103 "packet-t125-template.c" +#line 101 "packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 65ddd16689..edc6721dba 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -42,7 +42,6 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/oids.h> -#include <epan/emem.h> #include <epan/asn1.h> #include <epan/strutil.h> @@ -141,7 +140,7 @@ static int hf_tcap_AARQ_protocol_version_version1 = -1; static int hf_tcap_AARE_protocol_version_version1 = -1; /*--- End of included file: packet-tcap-hf.c ---*/ -#line 65 "packet-tcap-template.c" +#line 64 "packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -196,7 +195,7 @@ static gint ett_tcap_ABRT_user_information = -1; static gint ett_tcap_Associate_source_diagnostic = -1; /*--- End of included file: packet-tcap-ett.c ---*/ -#line 81 "packet-tcap-template.c" +#line 80 "packet-tcap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1420,7 +1419,7 @@ static void dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-tcap-fn.c ---*/ -#line 144 "packet-tcap-template.c" +#line 143 "packet-tcap-template.c" @@ -1543,7 +1542,7 @@ proto_reg_handoff_tcap(void) /*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 259 "packet-tcap-template.c" +#line 258 "packet-tcap-template.c" } static void init_tcap(void); @@ -1874,7 +1873,7 @@ proto_register_tcap(void) "", HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 321 "packet-tcap-template.c" +#line 320 "packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -1923,7 +1922,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 331 "packet-tcap-template.c" +#line 330 "packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index e050bc6a19..fd78088cb6 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/prefs.h> #include <epan/asn1.h> @@ -48,7 +47,6 @@ #include <string.h> #include "packet-per.h" -#include <epan/emem.h> #include "packet-tcp.h" #include "packet-gsm_map.h" @@ -251,7 +249,7 @@ static int hf_ulp_horuncertspeed = -1; /* BIT_STRING_SIZE_8 */ static int hf_ulp_veruncertspeed = -1; /* BIT_STRING_SIZE_8 */ /*--- End of included file: packet-ulp-hf.c ---*/ -#line 68 "packet-ulp-template.c" +#line 66 "packet-ulp-template.c" /* Initialize the subtree pointers */ static gint ett_ulp = -1; @@ -318,7 +316,7 @@ static gint ett_ulp_Horveluncert = -1; static gint ett_ulp_Horandveruncert = -1; /*--- End of included file: packet-ulp-ett.c ---*/ -#line 72 "packet-ulp-template.c" +#line 70 "packet-ulp-template.c" /* Include constants */ @@ -331,7 +329,7 @@ static gint ett_ulp_Horandveruncert = -1; #define maxTS 14 /*--- End of included file: packet-ulp-val.h ---*/ -#line 75 "packet-ulp-template.c" +#line 73 "packet-ulp-template.c" @@ -2187,7 +2185,7 @@ static void dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-ulp-fn.c ---*/ -#line 78 "packet-ulp-template.c" +#line 76 "packet-ulp-template.c" static guint @@ -2913,7 +2911,7 @@ void proto_register_ulp(void) { "ulp.BIT_STRING_SIZE_8", HFILL }}, /*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 103 "packet-ulp-template.c" +#line 101 "packet-ulp-template.c" }; /* List of subtrees */ @@ -2982,7 +2980,7 @@ void proto_register_ulp(void) { &ett_ulp_Horandveruncert, /*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 109 "packet-ulp-template.c" +#line 107 "packet-ulp-template.c" }; module_t *ulp_module; diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index 6fa8c820f4..259098b97f 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -30,7 +30,6 @@ #endif #include <epan/packet.h> -#include <epan/emem.h> #include <epan/ptvcursor.h> /* registration object IDs */ diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index 0db911b5b9..21d76fd458 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -63,7 +62,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1; /* SSIDList */ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ /*--- End of included file: packet-wlancertextn-hf.c ---*/ -#line 52 "packet-wlancertextn-template.c" +#line 51 "packet-wlancertextn-template.c" /* Initialize the subtree pointers */ @@ -72,7 +71,7 @@ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ static gint ett_wlancertextn_SSIDList = -1; /*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 55 "packet-wlancertextn-template.c" +#line 54 "packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ @@ -110,7 +109,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 57 "packet-wlancertextn-template.c" +#line 56 "packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -131,7 +130,7 @@ void proto_register_wlancertextn(void) { "wlancertextn.SSID", HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 65 "packet-wlancertextn-template.c" +#line 64 "packet-wlancertextn-template.c" }; /* List of subtrees */ @@ -142,7 +141,7 @@ void proto_register_wlancertextn(void) { &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 70 "packet-wlancertextn-template.c" +#line 69 "packet-wlancertextn-template.c" }; /* Register protocol */ @@ -165,7 +164,7 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 85 "packet-wlancertextn-template.c" +#line 84 "packet-wlancertextn-template.c" oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13"); oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14"); } diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 2ba561c5da..b2a8e5d5a7 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -42,7 +42,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <stdio.h> #include <string.h> @@ -136,7 +135,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ -#line 58 "packet-x2ap-template.c" +#line 57 "packet-x2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; @@ -322,7 +321,7 @@ static int hf_x2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_x2ap_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-x2ap-hf.c ---*/ -#line 63 "packet-x2ap-template.c" +#line 62 "packet-x2ap-template.c" /* Initialize the subtree pointers */ static int ett_x2ap = -1; @@ -414,7 +413,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-x2ap-ett.c ---*/ -#line 68 "packet-x2ap-template.c" +#line 67 "packet-x2ap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -2954,7 +2953,7 @@ static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-x2ap-fn.c ---*/ -#line 88 "packet-x2ap-template.c" +#line 87 "packet-x2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -3716,7 +3715,7 @@ void proto_register_x2ap(void) { "x2ap.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 141 "packet-x2ap-template.c" +#line 140 "packet-x2ap-template.c" }; /* List of subtrees */ @@ -3809,7 +3808,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 147 "packet-x2ap-template.c" +#line 146 "packet-x2ap-template.c" }; @@ -3903,7 +3902,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 179 "packet-x2ap-template.c" +#line 178 "packet-x2ap-template.c" } diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index ad9c0cdfc7..4c2a2bbf65 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/expert.h> @@ -608,7 +607,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1; static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-x411-hf.c ---*/ -#line 86 "packet-x411-template.c" +#line 85 "packet-x411-template.c" /* Initialize the subtree pointers */ static gint ett_x411 = -1; @@ -786,7 +785,7 @@ static gint ett_x411_SecurityCategories = -1; static gint ett_x411_SecurityCategory = -1; /*--- End of included file: packet-x411-ett.c ---*/ -#line 96 "packet-x411-template.c" +#line 95 "packet-x411-template.c" /* Dissector tables */ static dissector_table_t x411_extension_dissector_table; @@ -6975,7 +6974,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-x411-fn.c ---*/ -#line 104 "packet-x411-template.c" +#line 103 "packet-x411-template.c" char* x411_get_last_oraddress() { return oraddress; } @@ -9163,7 +9162,7 @@ void proto_register_x411(void) { "", HFILL }}, /*--- End of included file: packet-x411-hfarr.c ---*/ -#line 239 "packet-x411-template.c" +#line 238 "packet-x411-template.c" }; /* List of subtrees */ @@ -9343,7 +9342,7 @@ void proto_register_x411(void) { &ett_x411_SecurityCategory, /*--- End of included file: packet-x411-ettarr.c ---*/ -#line 251 "packet-x411-template.c" +#line 250 "packet-x411-template.c" }; module_t *x411_module; @@ -9533,7 +9532,7 @@ void proto_reg_handoff_x411(void) { /*--- End of included file: packet-x411-dis-tab.c ---*/ -#line 283 "packet-x411-template.c" +#line 282 "packet-x411-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 7e189ea79b..179e656c51 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -477,7 +476,7 @@ static int hf_x420_RecipientSecurityRequest_ipn_non_repudiation = -1; static int hf_x420_RecipientSecurityRequest_ipn_proof = -1; /*--- End of included file: packet-x420-hf.c ---*/ -#line 90 "packet-x420-template.c" +#line 89 "packet-x420-template.c" /* Initialize the subtree pointers */ static gint ett_x420 = -1; @@ -611,7 +610,7 @@ static gint ett_x420_T_body_part_token_choice = -1; static gint ett_x420_T_choice = -1; /*--- End of included file: packet-x420-ett.c ---*/ -#line 94 "packet-x420-template.c" +#line 93 "packet-x420-template.c" /*--- Included file: packet-x420-fn.c ---*/ @@ -4280,7 +4279,7 @@ static void dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-x420-fn.c ---*/ -#line 96 "packet-x420-template.c" +#line 95 "packet-x420-template.c" /* * Dissect X420 PDUs inside a PPDU. @@ -5827,7 +5826,7 @@ void proto_register_x420(void) { "", HFILL }}, /*--- End of included file: packet-x420-hfarr.c ---*/ -#line 130 "packet-x420-template.c" +#line 129 "packet-x420-template.c" }; /* List of subtrees */ @@ -5963,7 +5962,7 @@ void proto_register_x420(void) { &ett_x420_T_choice, /*--- End of included file: packet-x420-ettarr.c ---*/ -#line 136 "packet-x420-template.c" +#line 135 "packet-x420-template.c" }; /* Register protocol */ @@ -6083,7 +6082,7 @@ void proto_reg_handoff_x420(void) { /*--- End of included file: packet-x420-dis-tab.c ---*/ -#line 152 "packet-x420-template.c" +#line 151 "packet-x420-template.c" register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)"); diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index ad243364c7..6769f9630d 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -138,7 +137,7 @@ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ /*--- End of included file: packet-x509af-hf.c ---*/ -#line 55 "packet-x509af-template.c" +#line 54 "packet-x509af-template.c" /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; @@ -179,7 +178,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1; static gint ett_x509af_DSS_Params = -1; /*--- End of included file: packet-x509af-ett.c ---*/ -#line 59 "packet-x509af-template.c" +#line 58 "packet-x509af-template.c" static const char *algorithm_id; static const char *extension_id; @@ -893,7 +892,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-x509af-fn.c ---*/ -#line 64 "packet-x509af-template.c" +#line 63 "packet-x509af-template.c" const char *x509af_get_last_algorithm_id(void) { return algorithm_id; @@ -1240,7 +1239,7 @@ void proto_register_x509af(void) { "x509af.INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 110 "packet-x509af-template.c" +#line 109 "packet-x509af-template.c" }; /* List of subtrees */ @@ -1283,7 +1282,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 116 "packet-x509af-template.c" +#line 115 "packet-x509af-template.c" }; /* Register protocol */ @@ -1317,7 +1316,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 136 "packet-x509af-template.c" +#line 135 "packet-x509af-template.c" /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index de84f3a013..e62ec176b8 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -248,7 +247,7 @@ static int hf_x509ce_ReasonFlags_privilegeWithdrawn = -1; static int hf_x509ce_ReasonFlags_aACompromise = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 56 "packet-x509ce-template.c" +#line 55 "packet-x509ce-template.c" /* Initialize the subtree pointers */ @@ -313,7 +312,7 @@ static gint ett_x509ce_AltName = -1; static gint ett_x509ce_CertificateTemplate = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 59 "packet-x509ce-template.c" +#line 58 "packet-x509ce-template.c" static const char *object_identifier_id; @@ -1756,7 +1755,7 @@ static void dissect_CertificateTemplate_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 63 "packet-x509ce-template.c" +#line 62 "packet-x509ce-template.c" static void @@ -2529,7 +2528,7 @@ void proto_register_x509ce(void) { "", HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 103 "packet-x509ce-template.c" +#line 102 "packet-x509ce-template.c" }; /* List of subtrees */ @@ -2596,7 +2595,7 @@ void proto_register_x509ce(void) { &ett_x509ce_CertificateTemplate, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 108 "packet-x509ce-template.c" +#line 107 "packet-x509ce-template.c" }; /* Register protocol */ @@ -2657,7 +2656,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 123 "packet-x509ce-template.c" +#line 122 "packet-x509ce-template.c" register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index e0a3b582b2..632222a2f0 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -219,7 +218,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 55 "packet-x509if-template.c" +#line 54 "packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -300,7 +299,7 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 58 "packet-x509if-template.c" +#line 57 "packet-x509if-template.c" static const char *object_identifier_id; static proto_tree *top_of_dn = NULL; @@ -2085,7 +2084,7 @@ static void dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-x509if-fn.c ---*/ -#line 81 "packet-x509if-template.c" +#line 80 "packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2751,7 +2750,7 @@ void proto_register_x509if(void) { "", HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 126 "packet-x509if-template.c" +#line 125 "packet-x509if-template.c" }; /* List of subtrees */ @@ -2834,7 +2833,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 131 "packet-x509if-template.c" +#line 130 "packet-x509if-template.c" }; /* Register protocol */ @@ -2890,6 +2889,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 150 "packet-x509if-template.c" +#line 149 "packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 16d885cc0e..49de976ef7 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -218,7 +217,7 @@ static int hf_x509sat_T_bitNamedDays_friday = -1; static int hf_x509sat_T_bitNamedDays_saturday = -1; /*--- End of included file: packet-x509sat-hf.c ---*/ -#line 51 "packet-x509sat-template.c" +#line 50 "packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -273,7 +272,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 54 "packet-x509sat-template.c" +#line 53 "packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -1730,7 +1729,7 @@ static void dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 56 "packet-x509sat-template.c" +#line 55 "packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2371,7 +2370,7 @@ void proto_register_x509sat(void) { "", HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 64 "packet-x509sat-template.c" +#line 63 "packet-x509sat-template.c" }; /* List of subtrees */ @@ -2428,7 +2427,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 69 "packet-x509sat-template.c" +#line 68 "packet-x509sat-template.c" }; /* Register protocol */ @@ -2595,7 +2594,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 84 "packet-x509sat-template.c" +#line 83 "packet-x509sat-template.c" /* OBJECT CLASSES */ diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index d901f8e5ea..db223ae3a8 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -33,7 +33,6 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> #include "packet-tcp.h" #include <epan/prefs.h> |