[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>

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index f5fda870d840bd19dcbe76914709d99a1d71e79b..6f5469ff786c85d1cbec2196db50e7252f0d3382 100644 (file)
--- 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 e24bcc4773e91a7f3fcad2c901a9f4e202ca8001..3f4d998c89eaaba5945522d708cbafe2db1f3f80 100644 (file)
--- 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 97bd0999f17d504661bcfbafc15c2bfe7ae4ded3..7034da1ef7445780330a91420e2899cd6e0f04c9 100644 (file)
--- 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 10fdc75b154c49c496e50c8b225d24446b8f3bd1..57686e66e12e64616889eb92b2e10dea5f1b08e4 100644 (file)
--- 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 1b244152096beab4a13f95f8b6bf487521d07afe..a4f02545358c1e744ec394311b68a23057d4bd39 100644 (file)
--- 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 6ad6f99d253be56c6c405bc118d9baf4cbc4a80f..d2ad449f033f0477d56ee302160bb58ed096c010 100644 (file)
--- 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 5a1f77ec4864e881885d6626c9d68d6badaab9c1..3b99141ce33498abd269e76b9181de007a95f6db 100644 (file)
--- 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 93548ea971f0a1d7a2c17b06e74d960de818953e..c404047c80e35a079d51ea7c639509bd423bb5cd 100644 (file)
--- 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 2ed7fe34c73fa89d7b10d3b5322e1d6ca4509cd9..0264f8fc906afd11976534e859f19c34b458cd82 100644 (file)
--- 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 3c6784330f634c12938efb27f08ff43e027b1fe5..b8744efff16f2e81a838e20d7efa34c6bc7f3e9c 100644 (file)
--- 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
similarity index 99%
rename from epan/dissectors/packet-rlc.c
rename to epan/dissectors/packet-umts_rlc.c
index 30010c8296af3928ab2678bb9f3f5f8a0aec96cd..1311fad451865ab312c171063d177198a839e15e 100644 (file)
--- 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
similarity index 99%
rename from epan/dissectors/packet-rlc.h
rename to epan/dissectors/packet-umts_rlc.h
index 0f019a08c131a79159e7963d5f99ec6356b4f0d9..cd9c58121892e92b8e3d9866fcdbad8da384652c 100644 (file)
--- 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>