summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorDarien Spencer <cusneud@mail.com>2017-06-17 13:27:33 -0700
committerAnders Broman <a.broman58@gmail.com>2017-06-17 18:48:59 +0000
commit8775b0b1b2c24b271e4fed76fdc926fa32f84d05 (patch)
tree950f7c2bfa84914513deaf1108d05bac6c7d1157 /epan
parent553b1e0215ad5826906aafbe0e38c1e44cf9e1c3 (diff)
downloadwireshark-8775b0b1b2c24b271e4fed76fdc926fa32f84d05.tar.gz
[UMTS RLC] Renaming dissector files to fit FP/MAC
Currently the UMTS FP & MAC dissector's are named packet-umts_X. This commit renames the UMTS RLC's files to show their relation. Change-Id: I9e37be95f7c7d08278075a49b8abc2b480a13d64 Reviewed-on: https://code.wireshark.org/review/22188 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/CMakeLists.txt2
-rw-r--r--epan/dissectors/Makefile.am4
-rw-r--r--epan/dissectors/asn1/nbap/packet-nbap-template.c2
-rw-r--r--epan/dissectors/asn1/nbap/packet-nbap-template.h2
-rw-r--r--epan/dissectors/asn1/rrc/packet-rrc-template.c2
-rw-r--r--epan/dissectors/packet-catapult-dct2000.c2
-rw-r--r--epan/dissectors/packet-fp_hint.c2
-rw-r--r--epan/dissectors/packet-nbap.c2
-rw-r--r--epan/dissectors/packet-nbap.h2
-rw-r--r--epan/dissectors/packet-rrc.c2
-rw-r--r--epan/dissectors/packet-umts_rlc.c (renamed from epan/dissectors/packet-rlc.c)4
-rw-r--r--epan/dissectors/packet-umts_rlc.h (renamed from epan/dissectors/packet-rlc.h)2
12 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index f5fda870d8..6f5469ff78 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1123,7 +1123,6 @@ set(DISSECTOR_SRC
packet-rip.c
packet-ripng.c
packet-rlc-lte.c
- packet-rlc.c
packet-rlm.c
packet-rlogin.c
packet-rmcp.c
@@ -1314,6 +1313,7 @@ set(DISSECTOR_SRC
packet-uma.c
packet-umts_fp.c
packet-umts_mac.c
+ packet-umts_rlc.c
packet-usb-audio.c
packet-usb-ccid.c
packet-usb-com.c
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index e24bcc4773..3f4d998c89 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -1145,7 +1145,6 @@ DISSECTOR_SRC = \
packet-rip.c \
packet-ripng.c \
packet-rlc-lte.c \
- packet-rlc.c \
packet-rlm.c \
packet-rlogin.c \
packet-rmcp.c \
@@ -1336,6 +1335,7 @@ DISSECTOR_SRC = \
packet-uma.c \
packet-umts_fp.c \
packet-umts_mac.c \
+ packet-umts_rlc.c \
packet-usb-audio.c \
packet-usb-ccid.c \
packet-usb-com.c \
@@ -1713,7 +1713,6 @@ DISSECTOR_INCLUDES = \
packet-rdm.h \
packet-rdt.h \
packet-reload.h \
- packet-rlc.h \
packet-rlc-lte.h \
packet-rmi.h \
packet-rmt-common.h \
@@ -1788,6 +1787,7 @@ DISSECTOR_INCLUDES = \
packet-udp.h \
packet-umts_fp.h \
packet-umts_mac.h \
+ packet-umts_rlc.h \
packet-usb.h \
packet-usb-hid.h \
packet-usbip.h \
diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c
index 97bd0999f1..7034da1ef7 100644
--- a/epan/dissectors/asn1/nbap/packet-nbap-template.c
+++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c
@@ -38,7 +38,7 @@
#include "packet-umts_fp.h"
#include "packet-umts_mac.h"
#include "packet-rrc.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-nbap.h"
#ifdef _MSC_VER
diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.h b/epan/dissectors/asn1/nbap/packet-nbap-template.h
index 10fdc75b15..57686e66e1 100644
--- a/epan/dissectors/asn1/nbap/packet-nbap-template.h
+++ b/epan/dissectors/asn1/nbap/packet-nbap-template.h
@@ -22,7 +22,7 @@
#ifndef PACKET_NBAP_H
#define PACKET_NBAP_H
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-umts_mac.h"
/*
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index 1b24415209..a4f0254535 100644
--- a/epan/dissectors/asn1/rrc/packet-rrc-template.c
+++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c
@@ -46,7 +46,7 @@
#include "packet-nbap.h"
#include "packet-umts_fp.h"
#include "packet-umts_mac.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#ifdef _MSC_VER
/* disable: "warning C4049: compiler limit : terminating line number emission" */
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 6ad6f99d25..d2ad449f03 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -35,7 +35,7 @@
#include <wiretap/catapult_dct2000.h>
#include "packet-umts_fp.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-mac-lte.h"
#include "packet-rlc-lte.h"
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index 5a1f77ec48..3b99141ce3 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.c
@@ -29,7 +29,7 @@
#include <epan/proto_data.h>
#include "packet-umts_fp.h"
#include "packet-umts_mac.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
void proto_register_fp_hint(void);
void proto_reg_handoff_fp_hint(void);
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 93548ea971..c404047c80 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -46,7 +46,7 @@
#include "packet-umts_fp.h"
#include "packet-umts_mac.h"
#include "packet-rrc.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-nbap.h"
#ifdef _MSC_VER
diff --git a/epan/dissectors/packet-nbap.h b/epan/dissectors/packet-nbap.h
index 2ed7fe34c7..0264f8fc90 100644
--- a/epan/dissectors/packet-nbap.h
+++ b/epan/dissectors/packet-nbap.h
@@ -30,7 +30,7 @@
#ifndef PACKET_NBAP_H
#define PACKET_NBAP_H
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-umts_mac.h"
/*
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 3c6784330f..b8744efff1 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -54,7 +54,7 @@
#include "packet-nbap.h"
#include "packet-umts_fp.h"
#include "packet-umts_mac.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#ifdef _MSC_VER
/* disable: "warning C4049: compiler limit : terminating line number emission" */
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-umts_rlc.c
index 30010c8296..1311fad451 100644
--- a/epan/dissectors/packet-rlc.c
+++ b/epan/dissectors/packet-umts_rlc.c
@@ -1,4 +1,4 @@
-/* packet-rlc.c
+/* packet-umts_rlc.c
* Routines for UMTS RLC (Radio Link Control) v9.3.0 disassembly
* http://www.3gpp.org/ftp/Specs/archive/25_series/25.322/
*
@@ -37,7 +37,7 @@
* */
#include "packet-umts_fp.h"
-#include "packet-rlc.h"
+#include "packet-umts_rlc.h"
#include "packet-rrc.h"
/* TODO:
diff --git a/epan/dissectors/packet-rlc.h b/epan/dissectors/packet-umts_rlc.h
index 0f019a08c1..cd9c581218 100644
--- a/epan/dissectors/packet-rlc.h
+++ b/epan/dissectors/packet-umts_rlc.h
@@ -1,4 +1,4 @@
-/* packet-rlc.h
+/* packet-umts_rlc.h
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 18:42:45 +0000