259 files changed, 66 insertions, 52 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43b8efd72c..2636e42882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1907,12 +1907,12 @@ set(TSHARK_TAP_SRC
 )
 
 set(INSTALL_DIRS
-	diameter
-	dtds
+	resources/protocols/diameter
+	resources/protocols/dtds
 	profiles
-	radius
-	tpncp
-	wimaxasncp
+	resources/protocols/radius
+	resources/protocols/tpncp
+	resources/protocols/wimaxasncp
 )
 
 set(INSTALL_FILES
@@ -2241,106 +2241,117 @@ if(LUA_FOUND AND ENABLE_LUA)
 endif(LUA_FOUND AND ENABLE_LUA)
 # doc/*.html handled elsewhere.
 
+set(_protocol_data_dir ${CMAKE_SOURCE_DIR}/resources/protocols)
 # Glob patterns relative to the source directory that should be copied to
 # ${DATAFILE_DIR} (including directory prefixes)
 # TODO shouldn't this use full (relative) paths instead of glob patterns?
 set(DATA_FILES_SRC
-	"tpncp/tpncp.dat"
-	"wimaxasncp/*.dtd"
-	"wimaxasncp/*.xml"
+	${_protocol_data_dir}/tpncp/tpncp.dat
+	${_protocol_data_dir}/wimaxasncp/*.dtd
+	${_protocol_data_dir}/wimaxasncp/*.xml
 )
 
 # Copy all paths from the source tree to the data directory. Directories are
 # automatically created if missing as the filename is given.
-file(GLOB _data_files RELATIVE "${CMAKE_SOURCE_DIR}" ${DATA_FILES_SRC})
+file(GLOB _data_files RELATIVE ${_protocol_data_dir} ${DATA_FILES_SRC})
 foreach(_data_file ${_data_files})
 	add_custom_command(OUTPUT "${DATAFILE_DIR}/${_data_file}"
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			"${CMAKE_SOURCE_DIR}/${_data_file}"
-			"${DATAFILE_DIR}/${_data_file}"
+			${_protocol_data_dir}/${_data_file}
+			${DATAFILE_DIR}/${_data_file}
 		DEPENDS
-			"${CMAKE_SOURCE_DIR}/${_data_file}"
+			${_protocol_data_dir}/${_data_file}
 	)
-	list(APPEND copy_data_files_depends "${DATAFILE_DIR}/${_data_file}")
+	list(APPEND copy_data_files_depends ${DATAFILE_DIR}/${_data_file})
 endforeach()
 
-file(GLOB _dtds_src_files RELATIVE "${CMAKE_SOURCE_DIR}" "dtds/*.dtd")
+file(GLOB _dtds_src_files RELATIVE ${_protocol_data_dir} ${_protocol_data_dir}/dtds/*.dtd)
 
 set (_dtds_data_files)
+set (_dtds_dep_files)
 foreach(_data_file ${_dtds_src_files})
-	list(APPEND _dtds_data_files "${DATAFILE_DIR}/${_data_file}")
+	list(APPEND _dtds_data_files ${DATAFILE_DIR}/${_data_file})
+	list(APPEND _dtds_dep_files ${_protocol_data_dir})
 endforeach()
 
 add_custom_command(
 	OUTPUT ${_dtds_data_files}
-	COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/dtds"
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/dtds
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		${_dtds_src_files}
-		"${DATAFILE_DIR}/dtds"
+		${DATAFILE_DIR}/dtds
 	VERBATIM
-	DEPENDS ${_dtds_src_files}
-	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	DEPENDS ${_dtds_dep_files}
+	WORKING_DIRECTORY ${_protocol_data_dir}
 )
 
-file(GLOB _diameter_src_files RELATIVE "${CMAKE_SOURCE_DIR}"
-	diameter/*.dtd
-	diameter/*.xml
+file(GLOB _diameter_src_files RELATIVE ${_protocol_data_dir}
+	${_protocol_data_dir}/diameter/*.dtd
+	${_protocol_data_dir}/diameter/*.xml
 )
 
 set (_diameter_data_files)
+set (_diameter_dep_files)
 foreach(_data_file ${_diameter_src_files})
-	list(APPEND _diameter_data_files "${DATAFILE_DIR}/${_data_file}")
+	list(APPEND _diameter_data_files ${DATAFILE_DIR}/${_data_file})
+	list(APPEND _diameter_dep_files ${_protocol_data_dir}/${_data_file})
 endforeach()
 
 add_custom_command(
 	OUTPUT ${_diameter_data_files}
-	COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/diameter"
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/diameter
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		${_diameter_src_files}
-		"${DATAFILE_DIR}/diameter"
+		${DATAFILE_DIR}/diameter
 	VERBATIM
-	DEPENDS ${_diameter_src_files}
-	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	DEPENDS ${_diameter_dep_files}
+	WORKING_DIRECTORY ${_protocol_data_dir}
 )
 
-file(GLOB _radius_src_files RELATIVE "${CMAKE_SOURCE_DIR}"
-	radius/README.radius_dictionary
-	radius/custom.includes
-	radius/dictionary
-	radius/dictionary.*
+file(GLOB _radius_src_files RELATIVE ${_protocol_data_dir}
+	${_protocol_data_dir}/radius/README.radius_dictionary
+	${_protocol_data_dir}/radius/custom.includes
+	${_protocol_data_dir}/radius/dictionary
+	${_protocol_data_dir}/radius/dictionary.*
 )
 
 set (_radius_data_files)
+set (_radius_dep_files)
 foreach(_data_file ${_radius_src_files})
-	list(APPEND _radius_data_files "${DATAFILE_DIR}/${_data_file}")
+	list(APPEND _radius_data_files ${DATAFILE_DIR}/${_data_file})
+	list(APPEND _radius_dep_files ${_protocol_data_dir}/${_data_file})
 endforeach()
 
 add_custom_command(
 	OUTPUT ${_radius_data_files}
-	COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/radius"
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/radius
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		${_radius_src_files}
-		"${DATAFILE_DIR}/radius"
+		${DATAFILE_DIR}/radius
 	VERBATIM
-	DEPENDS ${_radius_src_files}
-	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	DEPENDS ${_radius_dep_files}
+	WORKING_DIRECTORY ${_protocol_data_dir}
 )
 
-file(GLOB _protobuf_src_files RELATIVE "${CMAKE_SOURCE_DIR}" protobuf/*.proto)
+file(GLOB _protobuf_src_files RELATIVE ${_protocol_data_dir}
+	${_protocol_data_dir}/protobuf/*.proto
+)
 set (_protobuf_data_files)
+set (_protobuf_dep_files)
 foreach(_data_file ${_protobuf_src_files})
-	list(APPEND _protobuf_data_files "${DATAFILE_DIR}/${_data_file}")
+	list(APPEND _protobuf_data_files ${DATAFILE_DIR}/${_data_file})
+	list(APPEND _protobuf_data_files ${_protocol_data_dir}/${_data_file})
 endforeach()
 
 add_custom_command(
 	OUTPUT ${_protobuf_data_files}
-	COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/protobuf"
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/protobuf
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		${_protobuf_src_files}
-		"${DATAFILE_DIR}/protobuf"
+		${DATAFILE_DIR}/protobuf
 	VERBATIM
-	DEPENDS ${_protobuf_src_files}
-	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	DEPENDS ${_protobuf_dep_files}
+	WORKING_DIRECTORY ${_protocol_data_dir}
 )
 
 file(GLOB _profiles_src_files RELATIVE "${CMAKE_SOURCE_DIR}" profiles/*/*)
diff --git a/diameter/AlcatelLucent.xml b/resources/protocols/diameter/AlcatelLucent.xml
index 4df792bc26..4df792bc26 100644
--- a/diameter/AlcatelLucent.xml
+++ b/resources/protocols/diameter/AlcatelLucent.xml
diff --git a/diameter/Cisco.xml b/resources/protocols/diameter/Cisco.xml
index e5d05063e7..e5d05063e7 100644
--- a/diameter/Cisco.xml
+++ b/resources/protocols/diameter/Cisco.xml
diff --git a/diameter/CiscoSystems.xml b/resources/protocols/diameter/CiscoSystems.xml
index 9bd03fc050..9bd03fc050 100644
--- a/diameter/CiscoSystems.xml
+++ b/resources/protocols/diameter/CiscoSystems.xml
diff --git a/diameter/Custom.xml b/resources/protocols/diameter/Custom.xml
index e40b4272f8..e40b4272f8 100644
--- a/diameter/Custom.xml
+++ b/resources/protocols/diameter/Custom.xml
diff --git a/diameter/Ericsson.xml b/resources/protocols/diameter/Ericsson.xml
index 74d5607426..74d5607426 100644
--- a/diameter/Ericsson.xml
+++ b/resources/protocols/diameter/Ericsson.xml
diff --git a/diameter/HP.xml b/resources/protocols/diameter/HP.xml
index e1927fa989..e1927fa989 100644
--- a/diameter/HP.xml
+++ b/resources/protocols/diameter/HP.xml
diff --git a/diameter/Huawei.xml b/resources/protocols/diameter/Huawei.xml
index e2654ace49..e2654ace49 100644
--- a/diameter/Huawei.xml
+++ b/resources/protocols/diameter/Huawei.xml
diff --git a/diameter/Inovar.xml b/resources/protocols/diameter/Inovar.xml
index 16105b0b1b..16105b0b1b 100644
--- a/diameter/Inovar.xml
+++ b/resources/protocols/diameter/Inovar.xml
diff --git a/diameter/Juniper.xml b/resources/protocols/diameter/Juniper.xml
index 1a1a7b1508..1a1a7b1508 100644
--- a/diameter/Juniper.xml
+++ b/resources/protocols/diameter/Juniper.xml
diff --git a/diameter/Metaswitch.xml b/resources/protocols/diameter/Metaswitch.xml
index b7b32ea91f..b7b32ea91f 100644
--- a/diameter/Metaswitch.xml
+++ b/resources/protocols/diameter/Metaswitch.xml
diff --git a/diameter/Microsoft.xml b/resources/protocols/diameter/Microsoft.xml
index 442f02fb5c..442f02fb5c 100644
--- a/diameter/Microsoft.xml
+++ b/resources/protocols/diameter/Microsoft.xml
diff --git a/diameter/Nokia.xml b/resources/protocols/diameter/Nokia.xml
index 64ca2645f3..64ca2645f3 100644
--- a/diameter/Nokia.xml
+++ b/resources/protocols/diameter/Nokia.xml
diff --git a/diameter/NokiaSolutionsAndNetworks.xml b/resources/protocols/diameter/NokiaSolutionsAndNetworks.xml
index 56edd0a89c..56edd0a89c 100644
--- a/diameter/NokiaSolutionsAndNetworks.xml
+++ b/resources/protocols/diameter/NokiaSolutionsAndNetworks.xml
diff --git a/diameter/Oracle.xml b/resources/protocols/diameter/Oracle.xml
index ecdb3bef91..ecdb3bef91 100644
--- a/diameter/Oracle.xml
+++ b/resources/protocols/diameter/Oracle.xml
diff --git a/diameter/Siemens.xml b/resources/protocols/diameter/Siemens.xml
index 1717f195f1..1717f195f1 100644
--- a/diameter/Siemens.xml
+++ b/resources/protocols/diameter/Siemens.xml
diff --git a/diameter/Starent.xml b/resources/protocols/diameter/Starent.xml
index 0e2ed2c100..0e2ed2c100 100644
--- a/diameter/Starent.xml
+++ b/resources/protocols/diameter/Starent.xml
diff --git a/diameter/TGPP.xml b/resources/protocols/diameter/TGPP.xml
index db14362a84..db14362a84 100644
--- a/diameter/TGPP.xml
+++ b/resources/protocols/diameter/TGPP.xml
diff --git a/diameter/TGPP2.xml b/resources/protocols/diameter/TGPP2.xml
index b38f330877..b38f330877 100644
--- a/diameter/TGPP2.xml
+++ b/resources/protocols/diameter/TGPP2.xml
diff --git a/diameter/Telefonica.xml b/resources/protocols/diameter/Telefonica.xml
index 670b475543..670b475543 100644
--- a/diameter/Telefonica.xml
+++ b/resources/protocols/diameter/Telefonica.xml
diff --git a/diameter/VerizonWireless.xml b/resources/protocols/diameter/VerizonWireless.xml
index ab39ecc967..ab39ecc967 100644
--- a/diameter/VerizonWireless.xml
+++ b/resources/protocols/diameter/VerizonWireless.xml
diff --git a/diameter/Vodafone.xml b/resources/protocols/diameter/Vodafone.xml
index f421baa6db..f421baa6db 100644
--- a/diameter/Vodafone.xml
+++ b/resources/protocols/diameter/Vodafone.xml
diff --git a/diameter/chargecontrol.xml b/resources/protocols/diameter/chargecontrol.xml
index 0a0ab584f2..0a0ab584f2 100644
--- a/diameter/chargecontrol.xml
+++ b/resources/protocols/diameter/chargecontrol.xml
diff --git a/diameter/dictionary.dtd b/resources/protocols/diameter/dictionary.dtd
index a48562c77a..a48562c77a 100644
--- a/diameter/dictionary.dtd
+++ b/resources/protocols/diameter/dictionary.dtd
diff --git a/diameter/dictionary.xml b/resources/protocols/diameter/dictionary.xml
index a2c059386f..a2c059386f 100644
--- a/diameter/dictionary.xml
+++ b/resources/protocols/diameter/dictionary.xml
diff --git a/diameter/eap.xml b/resources/protocols/diameter/eap.xml
index f5711dbb86..f5711dbb86 100644
--- a/diameter/eap.xml
+++ b/resources/protocols/diameter/eap.xml
diff --git a/diameter/etsie2e4.xml b/resources/protocols/diameter/etsie2e4.xml
index a48da2b437..a48da2b437 100644
--- a/diameter/etsie2e4.xml
+++ b/resources/protocols/diameter/etsie2e4.xml
diff --git a/diameter/mobileipv4.xml b/resources/protocols/diameter/mobileipv4.xml
index 8b85d50413..8b85d50413 100644
--- a/diameter/mobileipv4.xml
+++ b/resources/protocols/diameter/mobileipv4.xml
diff --git a/diameter/mobileipv6.xml b/resources/protocols/diameter/mobileipv6.xml
index 135a0d0ac0..135a0d0ac0 100644
--- a/diameter/mobileipv6.xml
+++ b/resources/protocols/diameter/mobileipv6.xml
diff --git a/diameter/nasreq.xml b/resources/protocols/diameter/nasreq.xml
index 5586ca6a53..5586ca6a53 100644
--- a/diameter/nasreq.xml
+++ b/resources/protocols/diameter/nasreq.xml
diff --git a/diameter/sip.xml b/resources/protocols/diameter/sip.xml
index 7ad6cc8e58..7ad6cc8e58 100644
--- a/diameter/sip.xml
+++ b/resources/protocols/diameter/sip.xml
diff --git a/diameter/sunping.xml b/resources/protocols/diameter/sunping.xml
index 3a4a1ea856..3a4a1ea856 100644
--- a/diameter/sunping.xml
+++ b/resources/protocols/diameter/sunping.xml
diff --git a/dtds/dc.dtd b/resources/protocols/dtds/dc.dtd
index b2f630aa40..b2f630aa40 100644
--- a/dtds/dc.dtd
+++ b/resources/protocols/dtds/dc.dtd
diff --git a/dtds/itunes.dtd b/resources/protocols/dtds/itunes.dtd
index ed1963e6ae..ed1963e6ae 100644
--- a/dtds/itunes.dtd
+++ b/resources/protocols/dtds/itunes.dtd
diff --git a/dtds/mscml.dtd b/resources/protocols/dtds/mscml.dtd
index 97d7ee38f2..97d7ee38f2 100644
--- a/dtds/mscml.dtd
+++ b/resources/protocols/dtds/mscml.dtd
diff --git a/dtds/pocsettings.dtd b/resources/protocols/dtds/pocsettings.dtd
index b474d1c9a5..b474d1c9a5 100644
--- a/dtds/pocsettings.dtd
+++ b/resources/protocols/dtds/pocsettings.dtd
diff --git a/dtds/presence.dtd b/resources/protocols/dtds/presence.dtd
index ca292069bf..ca292069bf 100644
--- a/dtds/presence.dtd
+++ b/resources/protocols/dtds/presence.dtd
diff --git a/dtds/reginfo.dtd b/resources/protocols/dtds/reginfo.dtd
index ba9601f207..ba9601f207 100644
--- a/dtds/reginfo.dtd
+++ b/resources/protocols/dtds/reginfo.dtd
diff --git a/dtds/rlmi.dtd b/resources/protocols/dtds/rlmi.dtd
index a41b0a720e..a41b0a720e 100644
--- a/dtds/rlmi.dtd
+++ b/resources/protocols/dtds/rlmi.dtd
diff --git a/dtds/rss.dtd b/resources/protocols/dtds/rss.dtd
index dc7651dbf4..dc7651dbf4 100644
--- a/dtds/rss.dtd
+++ b/resources/protocols/dtds/rss.dtd
diff --git a/dtds/smil.dtd b/resources/protocols/dtds/smil.dtd
index 7f0ce56210..7f0ce56210 100644
--- a/dtds/smil.dtd
+++ b/resources/protocols/dtds/smil.dtd
diff --git a/dtds/watcherinfo.dtd b/resources/protocols/dtds/watcherinfo.dtd
index 483e559160..483e559160 100644
--- a/dtds/watcherinfo.dtd
+++ b/resources/protocols/dtds/watcherinfo.dtd
diff --git a/dtds/xcap-caps.dtd b/resources/protocols/dtds/xcap-caps.dtd
index 1f828742dc..1f828742dc 100644
--- a/dtds/xcap-caps.dtd
+++ b/resources/protocols/dtds/xcap-caps.dtd
diff --git a/dtds/xcap-error.dtd b/resources/protocols/dtds/xcap-error.dtd
index 1a21a8c1ee..1a21a8c1ee 100644
--- a/dtds/xcap-error.dtd
+++ b/resources/protocols/dtds/xcap-error.dtd
diff --git a/protobuf/sparkplug_b.proto b/resources/protocols/protobuf/sparkplug_b.proto
index bda645cc91..bda645cc91 100644
--- a/protobuf/sparkplug_b.proto
+++ b/resources/protocols/protobuf/sparkplug_b.proto
diff --git a/radius/README.radius_dictionary b/resources/protocols/radius/README.radius_dictionary
index d6401311af..d6401311af 100644
--- a/radius/README.radius_dictionary
+++ b/resources/protocols/radius/README.radius_dictionary
diff --git a/radius/custom.includes b/resources/protocols/radius/custom.includes
index 6f14af0a63..6f14af0a63 100644
--- a/radius/custom.includes
+++ b/resources/protocols/radius/custom.includes
diff --git a/radius/dictionary b/resources/protocols/radius/dictionary
index 347ba56167..347ba56167 100644
--- a/radius/dictionary
+++ b/resources/protocols/radius/dictionary
diff --git a/radius/dictionary.3com b/resources/protocols/radius/dictionary.3com
index 4d0ad48cb4..4d0ad48cb4 100644
--- a/radius/dictionary.3com
+++ b/resources/protocols/radius/dictionary.3com
diff --git a/radius/dictionary.3gpp b/resources/protocols/radius/dictionary.3gpp
index e0fa7c38e5..e0fa7c38e5 100644
--- a/radius/dictionary.3gpp
+++ b/resources/protocols/radius/dictionary.3gpp
diff --git a/radius/dictionary.3gpp2 b/resources/protocols/radius/dictionary.3gpp2
index 5593d3792d..5593d3792d 100644
--- a/radius/dictionary.3gpp2
+++ b/resources/protocols/radius/dictionary.3gpp2
diff --git a/radius/dictionary.acc b/resources/protocols/radius/dictionary.acc
index 2510c2e640..2510c2e640 100644
--- a/radius/dictionary.acc
+++ b/resources/protocols/radius/dictionary.acc
diff --git a/radius/dictionary.acme b/resources/protocols/radius/dictionary.acme
index e495bcd27c..e495bcd27c 100644
--- a/radius/dictionary.acme
+++ b/resources/protocols/radius/dictionary.acme
diff --git a/radius/dictionary.actelis b/resources/protocols/radius/dictionary.actelis
index 9021f62ebd..9021f62ebd 100644
--- a/radius/dictionary.actelis
+++ b/resources/protocols/radius/dictionary.actelis
diff --git a/radius/dictionary.aerohive b/resources/protocols/radius/dictionary.aerohive
index a958628943..a958628943 100644
--- a/radius/dictionary.aerohive
+++ b/resources/protocols/radius/dictionary.aerohive
diff --git a/radius/dictionary.airespace b/resources/protocols/radius/dictionary.airespace
index f5595e58e2..f5595e58e2 100644
--- a/radius/dictionary.airespace
+++ b/resources/protocols/radius/dictionary.airespace
diff --git a/radius/dictionary.alcatel b/resources/protocols/radius/dictionary.alcatel
index 959ba0e257..959ba0e257 100644
--- a/radius/dictionary.alcatel
+++ b/resources/protocols/radius/dictionary.alcatel
diff --git a/radius/dictionary.alcatel-lucent.aaa b/resources/protocols/radius/dictionary.alcatel-lucent.aaa
index 5ec0d0c7df..5ec0d0c7df 100644
--- a/radius/dictionary.alcatel-lucent.aaa
+++ b/resources/protocols/radius/dictionary.alcatel-lucent.aaa
diff --git a/radius/dictionary.alcatel.esam b/resources/protocols/radius/dictionary.alcatel.esam
index 8a76a8591b..8a76a8591b 100644
--- a/radius/dictionary.alcatel.esam
+++ b/resources/protocols/radius/dictionary.alcatel.esam
diff --git a/radius/dictionary.alcatel.sr b/resources/protocols/radius/dictionary.alcatel.sr
index 726c6a8169..726c6a8169 100644
--- a/radius/dictionary.alcatel.sr
+++ b/resources/protocols/radius/dictionary.alcatel.sr
diff --git a/radius/dictionary.alteon b/resources/protocols/radius/dictionary.alteon
index 6184a9b316..6184a9b316 100644
--- a/radius/dictionary.alteon
+++ b/resources/protocols/radius/dictionary.alteon
diff --git a/radius/dictionary.altiga b/resources/protocols/radius/dictionary.altiga
index 0661204c8f..0661204c8f 100644
--- a/radius/dictionary.altiga
+++ b/resources/protocols/radius/dictionary.altiga
diff --git a/radius/dictionary.alvarion b/resources/protocols/radius/dictionary.alvarion
index c359d3485a..c359d3485a 100644
--- a/radius/dictionary.alvarion
+++ b/resources/protocols/radius/dictionary.alvarion
diff --git a/radius/dictionary.alvarion.wimax.v2_2 b/resources/protocols/radius/dictionary.alvarion.wimax.v2_2
index c0d040c0b5..c0d040c0b5 100644
--- a/radius/dictionary.alvarion.wimax.v2_2
+++ b/resources/protocols/radius/dictionary.alvarion.wimax.v2_2
diff --git a/radius/dictionary.apc b/resources/protocols/radius/dictionary.apc
index 6bcb955712..6bcb955712 100644
--- a/radius/dictionary.apc
+++ b/resources/protocols/radius/dictionary.apc
diff --git a/radius/dictionary.aptilo b/resources/protocols/radius/dictionary.aptilo
index ca973a37c1..ca973a37c1 100644
--- a/radius/dictionary.aptilo
+++ b/resources/protocols/radius/dictionary.aptilo
diff --git a/radius/dictionary.aptis b/resources/protocols/radius/dictionary.aptis
index 6478b875db..6478b875db 100644
--- a/radius/dictionary.aptis
+++ b/resources/protocols/radius/dictionary.aptis
diff --git a/radius/dictionary.arbor b/resources/protocols/radius/dictionary.arbor
index 698534987d..698534987d 100644
--- a/radius/dictionary.arbor
+++ b/resources/protocols/radius/dictionary.arbor
diff --git a/radius/dictionary.aruba b/resources/protocols/radius/dictionary.aruba
index 929f111c0b..929f111c0b 100644
--- a/radius/dictionary.aruba
+++ b/resources/protocols/radius/dictionary.aruba
diff --git a/radius/dictionary.ascend b/resources/protocols/radius/dictionary.ascend
index 3f5b3c28bc..3f5b3c28bc 100644
--- a/radius/dictionary.ascend
+++ b/resources/protocols/radius/dictionary.ascend
diff --git a/radius/dictionary.asn b/resources/protocols/radius/dictionary.asn
index 33d0319dce..33d0319dce 100644
--- a/radius/dictionary.asn
+++ b/resources/protocols/radius/dictionary.asn
diff --git a/radius/dictionary.audiocodes b/resources/protocols/radius/dictionary.audiocodes
index ec1c232db3..ec1c232db3 100644
--- a/radius/dictionary.audiocodes
+++ b/resources/protocols/radius/dictionary.audiocodes
diff --git a/radius/dictionary.avaya b/resources/protocols/radius/dictionary.avaya
index 65eaa64354..65eaa64354 100644
--- a/radius/dictionary.avaya
+++ b/resources/protocols/radius/dictionary.avaya
diff --git a/radius/dictionary.azaire b/resources/protocols/radius/dictionary.azaire
index 662a41b42e..662a41b42e 100644
--- a/radius/dictionary.azaire
+++ b/resources/protocols/radius/dictionary.azaire
diff --git a/radius/dictionary.bay b/resources/protocols/radius/dictionary.bay
index f3fbb3d150..f3fbb3d150 100644
--- a/radius/dictionary.bay
+++ b/resources/protocols/radius/dictionary.bay
diff --git a/radius/dictionary.bintec b/resources/protocols/radius/dictionary.bintec
index f745ac3b83..f745ac3b83 100644
--- a/radius/dictionary.bintec
+++ b/resources/protocols/radius/dictionary.bintec
diff --git a/radius/dictionary.bluecoat b/resources/protocols/radius/dictionary.bluecoat
index 4db91da3c2..4db91da3c2 100644
--- a/radius/dictionary.bluecoat
+++ b/resources/protocols/radius/dictionary.bluecoat
diff --git a/radius/dictionary.bristol b/resources/protocols/radius/dictionary.bristol
index e80b4caf62..e80b4caf62 100644
--- a/radius/dictionary.bristol
+++ b/resources/protocols/radius/dictionary.bristol
diff --git a/radius/dictionary.broadsoft b/resources/protocols/radius/dictionary.broadsoft
index 6ad5504648..6ad5504648 100644
--- a/radius/dictionary.broadsoft
+++ b/resources/protocols/radius/dictionary.broadsoft
diff --git a/radius/dictionary.brocade b/resources/protocols/radius/dictionary.brocade
index 7d7e9c0e1e..7d7e9c0e1e 100644
--- a/radius/dictionary.brocade
+++ b/resources/protocols/radius/dictionary.brocade
diff --git a/radius/dictionary.bskyb b/resources/protocols/radius/dictionary.bskyb
index c239f6bdb0..c239f6bdb0 100644
--- a/radius/dictionary.bskyb
+++ b/resources/protocols/radius/dictionary.bskyb
diff --git a/radius/dictionary.bt b/resources/protocols/radius/dictionary.bt
index ea147be5a6..ea147be5a6 100644
--- a/radius/dictionary.bt
+++ b/resources/protocols/radius/dictionary.bt
diff --git a/radius/dictionary.cablelabs b/resources/protocols/radius/dictionary.cablelabs
index 21fa03a64b..21fa03a64b 100644
--- a/radius/dictionary.cablelabs
+++ b/resources/protocols/radius/dictionary.cablelabs
diff --git a/radius/dictionary.cabletron b/resources/protocols/radius/dictionary.cabletron
index 2154fef373..2154fef373 100644
--- a/radius/dictionary.cabletron
+++ b/resources/protocols/radius/dictionary.cabletron
diff --git a/radius/dictionary.camiant b/resources/protocols/radius/dictionary.camiant
index 47a884d03f..47a884d03f 100644
--- a/radius/dictionary.camiant
+++ b/resources/protocols/radius/dictionary.camiant
diff --git a/radius/dictionary.chillispot b/resources/protocols/radius/dictionary.chillispot
index 4d7fb472c5..4d7fb472c5 100644
--- a/radius/dictionary.chillispot
+++ b/resources/protocols/radius/dictionary.chillispot
diff --git a/radius/dictionary.cisco b/resources/protocols/radius/dictionary.cisco
index e030178a63..e030178a63 100644
--- a/radius/dictionary.cisco
+++ b/resources/protocols/radius/dictionary.cisco
diff --git a/radius/dictionary.cisco.asa b/resources/protocols/radius/dictionary.cisco.asa
index e0a609e628..e0a609e628 100644
--- a/radius/dictionary.cisco.asa
+++ b/resources/protocols/radius/dictionary.cisco.asa
diff --git a/radius/dictionary.cisco.bbsm b/resources/protocols/radius/dictionary.cisco.bbsm
index 2cf8f9a59f..2cf8f9a59f 100644
--- a/radius/dictionary.cisco.bbsm
+++ b/resources/protocols/radius/dictionary.cisco.bbsm
diff --git a/radius/dictionary.cisco.vpn3000 b/resources/protocols/radius/dictionary.cisco.vpn3000
index 41bc0e9b3c..41bc0e9b3c 100644
--- a/radius/dictionary.cisco.vpn3000
+++ b/resources/protocols/radius/dictionary.cisco.vpn3000
diff --git a/radius/dictionary.cisco.vpn5000 b/resources/protocols/radius/dictionary.cisco.vpn5000
index 2a0b8a6512..2a0b8a6512 100644
--- a/radius/dictionary.cisco.vpn5000
+++ b/resources/protocols/radius/dictionary.cisco.vpn5000
diff --git a/radius/dictionary.citrix b/resources/protocols/radius/dictionary.citrix
index ed6d63bf6d..ed6d63bf6d 100644
--- a/radius/dictionary.citrix
+++ b/resources/protocols/radius/dictionary.citrix
diff --git a/radius/dictionary.clavister b/resources/protocols/radius/dictionary.clavister
index 302ee4bc61..302ee4bc61 100644
--- a/radius/dictionary.clavister
+++ b/resources/protocols/radius/dictionary.clavister
diff --git a/radius/dictionary.cnergee b/resources/protocols/radius/dictionary.cnergee
index 0c67eb9ced..0c67eb9ced 100644
--- a/radius/dictionary.cnergee
+++ b/resources/protocols/radius/dictionary.cnergee
diff --git a/radius/dictionary.colubris b/resources/protocols/radius/dictionary.colubris
index b2027dadee..b2027dadee 100644
--- a/radius/dictionary.colubris
+++ b/resources/protocols/radius/dictionary.colubris
diff --git a/radius/dictionary.columbia_university b/resources/protocols/radius/dictionary.columbia_university
index 82a9e126bd..82a9e126bd 100644
--- a/radius/dictionary.columbia_university
+++ b/resources/protocols/radius/dictionary.columbia_university
diff --git a/radius/dictionary.compat b/resources/protocols/radius/dictionary.compat
index 24c754aacb..24c754aacb 100644
--- a/radius/dictionary.compat
+++ b/resources/protocols/radius/dictionary.compat
diff --git a/radius/dictionary.compatible b/resources/protocols/radius/dictionary.compatible
index e4ba998f45..e4ba998f45 100644
--- a/radius/dictionary.compatible
+++ b/resources/protocols/radius/dictionary.compatible
diff --git a/radius/dictionary.cosine b/resources/protocols/radius/dictionary.cosine
index 209755e27a..209755e27a 100644
--- a/radius/dictionary.cosine
+++ b/resources/protocols/radius/dictionary.cosine
diff --git a/radius/dictionary.dante b/resources/protocols/radius/dictionary.dante
index d9746e17e7..d9746e17e7 100644
--- a/radius/dictionary.dante
+++ b/resources/protocols/radius/dictionary.dante
diff --git a/radius/dictionary.dellemc b/resources/protocols/radius/dictionary.dellemc
index 68c2758a29..68c2758a29 100644
--- a/radius/dictionary.dellemc
+++ b/resources/protocols/radius/dictionary.dellemc
diff --git a/radius/dictionary.dhcp b/resources/protocols/radius/dictionary.dhcp
index 966379eae5..966379eae5 100644
--- a/radius/dictionary.dhcp
+++ b/resources/protocols/radius/dictionary.dhcp
diff --git a/radius/dictionary.digium b/resources/protocols/radius/dictionary.digium
index 5c028e0041..5c028e0041 100644
--- a/radius/dictionary.digium
+++ b/resources/protocols/radius/dictionary.digium
diff --git a/radius/dictionary.dlink b/resources/protocols/radius/dictionary.dlink
index 5722c48679..5722c48679 100644
--- a/radius/dictionary.dlink
+++ b/resources/protocols/radius/dictionary.dlink
diff --git a/radius/dictionary.dragonwave b/resources/protocols/radius/dictionary.dragonwave
index 85658ba88a..85658ba88a 100644
--- a/radius/dictionary.dragonwave
+++ b/resources/protocols/radius/dictionary.dragonwave
diff --git a/radius/dictionary.efficientip b/resources/protocols/radius/dictionary.efficientip
index 09efef4b7c..09efef4b7c 100644
--- a/radius/dictionary.efficientip
+++ b/resources/protocols/radius/dictionary.efficientip
diff --git a/radius/dictionary.eltex b/resources/protocols/radius/dictionary.eltex
index 6bcc4a1223..6bcc4a1223 100644
--- a/radius/dictionary.eltex
+++ b/resources/protocols/radius/dictionary.eltex
diff --git a/radius/dictionary.enterasys b/resources/protocols/radius/dictionary.enterasys
index eaec37fcf5..eaec37fcf5 100644
--- a/radius/dictionary.enterasys
+++ b/resources/protocols/radius/dictionary.enterasys
diff --git a/radius/dictionary.epygi b/resources/protocols/radius/dictionary.epygi
index 8e0ec8abb5..8e0ec8abb5 100644
--- a/radius/dictionary.epygi
+++ b/resources/protocols/radius/dictionary.epygi
diff --git a/radius/dictionary.equallogic b/resources/protocols/radius/dictionary.equallogic
index 06caf5f176..06caf5f176 100644
--- a/radius/dictionary.equallogic
+++ b/resources/protocols/radius/dictionary.equallogic
diff --git a/radius/dictionary.ericsson b/resources/protocols/radius/dictionary.ericsson
index 1dd8fbce61..1dd8fbce61 100644
--- a/radius/dictionary.ericsson
+++ b/resources/protocols/radius/dictionary.ericsson
diff --git a/radius/dictionary.ericsson.ab b/resources/protocols/radius/dictionary.ericsson.ab
index aa535b8ad0..aa535b8ad0 100644
--- a/radius/dictionary.ericsson.ab
+++ b/resources/protocols/radius/dictionary.ericsson.ab
diff --git a/radius/dictionary.ericsson.packet.core.networks b/resources/protocols/radius/dictionary.ericsson.packet.core.networks
index d15bfcb568..d15bfcb568 100644
--- a/radius/dictionary.ericsson.packet.core.networks
+++ b/resources/protocols/radius/dictionary.ericsson.packet.core.networks
diff --git a/radius/dictionary.extreme b/resources/protocols/radius/dictionary.extreme
index b027d47b9c..b027d47b9c 100644
--- a/radius/dictionary.extreme
+++ b/resources/protocols/radius/dictionary.extreme
diff --git a/radius/dictionary.f5 b/resources/protocols/radius/dictionary.f5
index ce97f9c450..ce97f9c450 100644
--- a/radius/dictionary.f5
+++ b/resources/protocols/radius/dictionary.f5
diff --git a/radius/dictionary.fdxtended b/resources/protocols/radius/dictionary.fdxtended
index 55d9d97795..55d9d97795 100644
--- a/radius/dictionary.fdxtended
+++ b/resources/protocols/radius/dictionary.fdxtended
diff --git a/radius/dictionary.fortinet b/resources/protocols/radius/dictionary.fortinet
index 38a9bf7c89..38a9bf7c89 100644
--- a/radius/dictionary.fortinet
+++ b/resources/protocols/radius/dictionary.fortinet
diff --git a/radius/dictionary.foundry b/resources/protocols/radius/dictionary.foundry
index 134b206b89..134b206b89 100644
--- a/radius/dictionary.foundry
+++ b/resources/protocols/radius/dictionary.foundry
diff --git a/radius/dictionary.freedhcp b/resources/protocols/radius/dictionary.freedhcp
index 1af27224de..1af27224de 100644
--- a/radius/dictionary.freedhcp
+++ b/resources/protocols/radius/dictionary.freedhcp
diff --git a/radius/dictionary.freeradius b/resources/protocols/radius/dictionary.freeradius
index 43f1f1380a..43f1f1380a 100644
--- a/radius/dictionary.freeradius
+++ b/resources/protocols/radius/dictionary.freeradius
diff --git a/radius/dictionary.freeradius.internal b/resources/protocols/radius/dictionary.freeradius.internal
index d75e9d6974..d75e9d6974 100644
--- a/radius/dictionary.freeradius.internal
+++ b/resources/protocols/radius/dictionary.freeradius.internal
diff --git a/radius/dictionary.freeswitch b/resources/protocols/radius/dictionary.freeswitch
index 2594ef7e67..2594ef7e67 100644
--- a/radius/dictionary.freeswitch
+++ b/resources/protocols/radius/dictionary.freeswitch
diff --git a/radius/dictionary.gandalf b/resources/protocols/radius/dictionary.gandalf
index dbb08fa931..dbb08fa931 100644
--- a/radius/dictionary.gandalf
+++ b/resources/protocols/radius/dictionary.gandalf
diff --git a/radius/dictionary.garderos b/resources/protocols/radius/dictionary.garderos
index bf51158013..bf51158013 100644
--- a/radius/dictionary.garderos
+++ b/resources/protocols/radius/dictionary.garderos
diff --git a/radius/dictionary.gemtek b/resources/protocols/radius/dictionary.gemtek
index 4a1559f0b0..4a1559f0b0 100644
--- a/radius/dictionary.gemtek
+++ b/resources/protocols/radius/dictionary.gemtek
diff --git a/radius/dictionary.h3c b/resources/protocols/radius/dictionary.h3c
index d725b1292f..d725b1292f 100644
--- a/radius/dictionary.h3c
+++ b/resources/protocols/radius/dictionary.h3c
diff --git a/radius/dictionary.hp b/resources/protocols/radius/dictionary.hp
index daba4ac7a7..daba4ac7a7 100644
--- a/radius/dictionary.hp
+++ b/resources/protocols/radius/dictionary.hp
diff --git a/radius/dictionary.huawei b/resources/protocols/radius/dictionary.huawei
index 48709e423a..48709e423a 100644
--- a/radius/dictionary.huawei
+++ b/resources/protocols/radius/dictionary.huawei
diff --git a/radius/dictionary.iana b/resources/protocols/radius/dictionary.iana
index 931707baec..931707baec 100644
--- a/radius/dictionary.iana
+++ b/resources/protocols/radius/dictionary.iana
diff --git a/radius/dictionary.identity_engines b/resources/protocols/radius/dictionary.identity_engines
index f3ef14b116..f3ef14b116 100644
--- a/radius/dictionary.identity_engines
+++ b/resources/protocols/radius/dictionary.identity_engines
diff --git a/radius/dictionary.iea b/resources/protocols/radius/dictionary.iea
index 92a4da873c..92a4da873c 100644
--- a/radius/dictionary.iea
+++ b/resources/protocols/radius/dictionary.iea
diff --git a/radius/dictionary.infoblox b/resources/protocols/radius/dictionary.infoblox
index 41733aeaef..41733aeaef 100644
--- a/radius/dictionary.infoblox
+++ b/resources/protocols/radius/dictionary.infoblox
diff --git a/radius/dictionary.infonet b/resources/protocols/radius/dictionary.infonet
index 5662d0901f..5662d0901f 100644
--- a/radius/dictionary.infonet
+++ b/resources/protocols/radius/dictionary.infonet
diff --git a/radius/dictionary.ipunplugged b/resources/protocols/radius/dictionary.ipunplugged
index 6862e84857..6862e84857 100644
--- a/radius/dictionary.ipunplugged
+++ b/resources/protocols/radius/dictionary.ipunplugged
diff --git a/radius/dictionary.issanni b/resources/protocols/radius/dictionary.issanni
index b5aeb4646d..b5aeb4646d 100644
--- a/radius/dictionary.issanni
+++ b/resources/protocols/radius/dictionary.issanni
diff --git a/radius/dictionary.itk b/resources/protocols/radius/dictionary.itk
index 95877f1693..95877f1693 100644
--- a/radius/dictionary.itk
+++ b/resources/protocols/radius/dictionary.itk
diff --git a/radius/dictionary.jradius b/resources/protocols/radius/dictionary.jradius
index aa5ae7abbc..aa5ae7abbc 100644
--- a/radius/dictionary.jradius
+++ b/resources/protocols/radius/dictionary.jradius
diff --git a/radius/dictionary.juniper b/resources/protocols/radius/dictionary.juniper
index bd89cc8ca5..bd89cc8ca5 100644
--- a/radius/dictionary.juniper
+++ b/resources/protocols/radius/dictionary.juniper
diff --git a/radius/dictionary.karlnet b/resources/protocols/radius/dictionary.karlnet
index 26802099ad..26802099ad 100644
--- a/radius/dictionary.karlnet
+++ b/resources/protocols/radius/dictionary.karlnet
diff --git a/radius/dictionary.kineto b/resources/protocols/radius/dictionary.kineto
index 9bf35336bf..9bf35336bf 100644
--- a/radius/dictionary.kineto
+++ b/resources/protocols/radius/dictionary.kineto
diff --git a/radius/dictionary.lancom b/resources/protocols/radius/dictionary.lancom
index c29f3d677c..c29f3d677c 100644
--- a/radius/dictionary.lancom
+++ b/resources/protocols/radius/dictionary.lancom
diff --git a/radius/dictionary.livingston b/resources/protocols/radius/dictionary.livingston
index e4d8281782..e4d8281782 100644
--- a/radius/dictionary.livingston
+++ b/resources/protocols/radius/dictionary.livingston
diff --git a/radius/dictionary.localweb b/resources/protocols/radius/dictionary.localweb
index b9d11fc78e..b9d11fc78e 100644
--- a/radius/dictionary.localweb
+++ b/resources/protocols/radius/dictionary.localweb
diff --git a/radius/dictionary.lucent b/resources/protocols/radius/dictionary.lucent
index 88521654e7..88521654e7 100644
--- a/radius/dictionary.lucent
+++ b/resources/protocols/radius/dictionary.lucent
diff --git a/radius/dictionary.manzara b/resources/protocols/radius/dictionary.manzara
index 3c0f93813b..3c0f93813b 100644
--- a/radius/dictionary.manzara
+++ b/resources/protocols/radius/dictionary.manzara
diff --git a/radius/dictionary.meinberg b/resources/protocols/radius/dictionary.meinberg
index e0e2d32b3e..e0e2d32b3e 100644
--- a/radius/dictionary.meinberg
+++ b/resources/protocols/radius/dictionary.meinberg
diff --git a/radius/dictionary.meraki b/resources/protocols/radius/dictionary.meraki
index eb69f5e6d6..eb69f5e6d6 100644
--- a/radius/dictionary.meraki
+++ b/resources/protocols/radius/dictionary.meraki
diff --git a/radius/dictionary.merit b/resources/protocols/radius/dictionary.merit
index f1f52cb438..f1f52cb438 100644
--- a/radius/dictionary.merit
+++ b/resources/protocols/radius/dictionary.merit
diff --git a/radius/dictionary.meru b/resources/protocols/radius/dictionary.meru
index 41595a162e..41595a162e 100644
--- a/radius/dictionary.meru
+++ b/resources/protocols/radius/dictionary.meru
diff --git a/radius/dictionary.microsemi b/resources/protocols/radius/dictionary.microsemi
index 7a82486b79..7a82486b79 100644
--- a/radius/dictionary.microsemi
+++ b/resources/protocols/radius/dictionary.microsemi
diff --git a/radius/dictionary.microsoft b/resources/protocols/radius/dictionary.microsoft
index ec51c96e42..ec51c96e42 100644
--- a/radius/dictionary.microsoft
+++ b/resources/protocols/radius/dictionary.microsoft
diff --git a/radius/dictionary.mikrotik b/resources/protocols/radius/dictionary.mikrotik
index 0a37be9beb..0a37be9beb 100644
--- a/radius/dictionary.mikrotik
+++ b/resources/protocols/radius/dictionary.mikrotik
diff --git a/radius/dictionary.motorola b/resources/protocols/radius/dictionary.motorola
index 04d2f83f47..04d2f83f47 100644
--- a/radius/dictionary.motorola
+++ b/resources/protocols/radius/dictionary.motorola
diff --git a/radius/dictionary.motorola.wimax b/resources/protocols/radius/dictionary.motorola.wimax
index 0477366b1c..0477366b1c 100644
--- a/radius/dictionary.motorola.wimax
+++ b/resources/protocols/radius/dictionary.motorola.wimax
diff --git a/radius/dictionary.navini b/resources/protocols/radius/dictionary.navini
index 2ecf43fb59..2ecf43fb59 100644
--- a/radius/dictionary.navini
+++ b/resources/protocols/radius/dictionary.navini
diff --git a/radius/dictionary.netscreen b/resources/protocols/radius/dictionary.netscreen
index e650ad7181..e650ad7181 100644
--- a/radius/dictionary.netscreen
+++ b/resources/protocols/radius/dictionary.netscreen
diff --git a/radius/dictionary.networkphysics b/resources/protocols/radius/dictionary.networkphysics
index 9e318866d4..9e318866d4 100644
--- a/radius/dictionary.networkphysics
+++ b/resources/protocols/radius/dictionary.networkphysics
diff --git a/radius/dictionary.nexans b/resources/protocols/radius/dictionary.nexans
index e8f6520539..e8f6520539 100644
--- a/radius/dictionary.nexans
+++ b/resources/protocols/radius/dictionary.nexans
diff --git a/radius/dictionary.nokia b/resources/protocols/radius/dictionary.nokia
index ffe658c407..ffe658c407 100644
--- a/radius/dictionary.nokia
+++ b/resources/protocols/radius/dictionary.nokia
diff --git a/radius/dictionary.nokia.conflict b/resources/protocols/radius/dictionary.nokia.conflict
index 4215edd82e..4215edd82e 100644
--- a/radius/dictionary.nokia.conflict
+++ b/resources/protocols/radius/dictionary.nokia.conflict
diff --git a/radius/dictionary.nomadix b/resources/protocols/radius/dictionary.nomadix
index 36f72047bb..36f72047bb 100644
--- a/radius/dictionary.nomadix
+++ b/resources/protocols/radius/dictionary.nomadix
diff --git a/radius/dictionary.nortel b/resources/protocols/radius/dictionary.nortel
index 0e58bf3a08..0e58bf3a08 100644
--- a/radius/dictionary.nortel
+++ b/resources/protocols/radius/dictionary.nortel
diff --git a/radius/dictionary.ntua b/resources/protocols/radius/dictionary.ntua
index d637869e1b..d637869e1b 100644
--- a/radius/dictionary.ntua
+++ b/resources/protocols/radius/dictionary.ntua
diff --git a/radius/dictionary.openser b/resources/protocols/radius/dictionary.openser
index 9e4686cfd8..9e4686cfd8 100644
--- a/radius/dictionary.openser
+++ b/resources/protocols/radius/dictionary.openser
diff --git a/radius/dictionary.packeteer b/resources/protocols/radius/dictionary.packeteer
index 76afa7223f..76afa7223f 100644
--- a/radius/dictionary.packeteer
+++ b/resources/protocols/radius/dictionary.packeteer
diff --git a/radius/dictionary.paloalto b/resources/protocols/radius/dictionary.paloalto
index 2429c1dad9..2429c1dad9 100644
--- a/radius/dictionary.paloalto
+++ b/resources/protocols/radius/dictionary.paloalto
diff --git a/radius/dictionary.patton b/resources/protocols/radius/dictionary.patton
index 2bbb4468c4..2bbb4468c4 100644
--- a/radius/dictionary.patton
+++ b/resources/protocols/radius/dictionary.patton
diff --git a/radius/dictionary.perle b/resources/protocols/radius/dictionary.perle
index 39bee3efbc..39bee3efbc 100644
--- a/radius/dictionary.perle
+++ b/resources/protocols/radius/dictionary.perle
diff --git a/radius/dictionary.propel b/resources/protocols/radius/dictionary.propel
index 0e3815f296..0e3815f296 100644
--- a/radius/dictionary.propel
+++ b/resources/protocols/radius/dictionary.propel
diff --git a/radius/dictionary.prosoft b/resources/protocols/radius/dictionary.prosoft
index 1c7b8c03e4..1c7b8c03e4 100644
--- a/radius/dictionary.prosoft
+++ b/resources/protocols/radius/dictionary.prosoft
diff --git a/radius/dictionary.proxim b/resources/protocols/radius/dictionary.proxim
index 3436a8ae1e..3436a8ae1e 100644
--- a/radius/dictionary.proxim
+++ b/resources/protocols/radius/dictionary.proxim
diff --git a/radius/dictionary.purewave b/resources/protocols/radius/dictionary.purewave
index d194fcd802..d194fcd802 100644
--- a/radius/dictionary.purewave
+++ b/resources/protocols/radius/dictionary.purewave
diff --git a/radius/dictionary.quiconnect b/resources/protocols/radius/dictionary.quiconnect
index 3c6696ac8e..3c6696ac8e 100644
--- a/radius/dictionary.quiconnect
+++ b/resources/protocols/radius/dictionary.quiconnect
diff --git a/radius/dictionary.quintum b/resources/protocols/radius/dictionary.quintum
index f61c944a21..f61c944a21 100644
--- a/radius/dictionary.quintum
+++ b/resources/protocols/radius/dictionary.quintum
diff --git a/radius/dictionary.redcreek b/resources/protocols/radius/dictionary.redcreek
index 021af51f3c..021af51f3c 100644
--- a/radius/dictionary.redcreek
+++ b/resources/protocols/radius/dictionary.redcreek
diff --git a/radius/dictionary.rfc2865 b/resources/protocols/radius/dictionary.rfc2865
index 2edcb9f658..2edcb9f658 100644
--- a/radius/dictionary.rfc2865
+++ b/resources/protocols/radius/dictionary.rfc2865
diff --git a/radius/dictionary.rfc2866 b/resources/protocols/radius/dictionary.rfc2866
index a6d78ea682..a6d78ea682 100644
--- a/radius/dictionary.rfc2866
+++ b/resources/protocols/radius/dictionary.rfc2866
diff --git a/radius/dictionary.rfc2867 b/resources/protocols/radius/dictionary.rfc2867
index 515f63173b..515f63173b 100644
--- a/radius/dictionary.rfc2867
+++ b/resources/protocols/radius/dictionary.rfc2867
diff --git a/radius/dictionary.rfc2868 b/resources/protocols/radius/dictionary.rfc2868
index 30ed897596..30ed897596 100644
--- a/radius/dictionary.rfc2868
+++ b/resources/protocols/radius/dictionary.rfc2868
diff --git a/radius/dictionary.rfc2869 b/resources/protocols/radius/dictionary.rfc2869
index 94f86f9a5e..94f86f9a5e 100644
--- a/radius/dictionary.rfc2869
+++ b/resources/protocols/radius/dictionary.rfc2869
diff --git a/radius/dictionary.rfc3162 b/resources/protocols/radius/dictionary.rfc3162
index 7f462625f9..7f462625f9 100644
--- a/radius/dictionary.rfc3162
+++ b/resources/protocols/radius/dictionary.rfc3162
diff --git a/radius/dictionary.rfc3576 b/resources/protocols/radius/dictionary.rfc3576
index bef0947be2..bef0947be2 100644
--- a/radius/dictionary.rfc3576
+++ b/resources/protocols/radius/dictionary.rfc3576
diff --git a/radius/dictionary.rfc3580 b/resources/protocols/radius/dictionary.rfc3580
index e456b55f88..e456b55f88 100644
--- a/radius/dictionary.rfc3580
+++ b/resources/protocols/radius/dictionary.rfc3580
diff --git a/radius/dictionary.rfc4072 b/resources/protocols/radius/dictionary.rfc4072
index b34aa3c43b..b34aa3c43b 100644
--- a/radius/dictionary.rfc4072
+++ b/resources/protocols/radius/dictionary.rfc4072
diff --git a/radius/dictionary.rfc4372 b/resources/protocols/radius/dictionary.rfc4372
index 5cfd9111f7..5cfd9111f7 100644
--- a/radius/dictionary.rfc4372
+++ b/resources/protocols/radius/dictionary.rfc4372
diff --git a/radius/dictionary.rfc4603 b/resources/protocols/radius/dictionary.rfc4603
index 535301d175..535301d175 100644
--- a/radius/dictionary.rfc4603
+++ b/resources/protocols/radius/dictionary.rfc4603
diff --git a/radius/dictionary.rfc4675 b/resources/protocols/radius/dictionary.rfc4675
index ba7e466c9a..ba7e466c9a 100644
--- a/radius/dictionary.rfc4675
+++ b/resources/protocols/radius/dictionary.rfc4675
diff --git a/radius/dictionary.rfc4679 b/resources/protocols/radius/dictionary.rfc4679
index 1861e6678a..1861e6678a 100644
--- a/radius/dictionary.rfc4679
+++ b/resources/protocols/radius/dictionary.rfc4679
diff --git a/radius/dictionary.rfc4818 b/resources/protocols/radius/dictionary.rfc4818
index 09f074c687..09f074c687 100644
--- a/radius/dictionary.rfc4818
+++ b/resources/protocols/radius/dictionary.rfc4818
diff --git a/radius/dictionary.rfc4849 b/resources/protocols/radius/dictionary.rfc4849
index 1ef7fa6429..1ef7fa6429 100644
--- a/radius/dictionary.rfc4849
+++ b/resources/protocols/radius/dictionary.rfc4849
diff --git a/radius/dictionary.rfc5090 b/resources/protocols/radius/dictionary.rfc5090
index 771dcf7b67..771dcf7b67 100644
--- a/radius/dictionary.rfc5090
+++ b/resources/protocols/radius/dictionary.rfc5090
diff --git a/radius/dictionary.rfc5176 b/resources/protocols/radius/dictionary.rfc5176
index fbe97d66bd..fbe97d66bd 100644
--- a/radius/dictionary.rfc5176
+++ b/resources/protocols/radius/dictionary.rfc5176
diff --git a/radius/dictionary.rfc5447 b/resources/protocols/radius/dictionary.rfc5447
index 978ab4cc1c..978ab4cc1c 100644
--- a/radius/dictionary.rfc5447
+++ b/resources/protocols/radius/dictionary.rfc5447
diff --git a/radius/dictionary.rfc5580 b/resources/protocols/radius/dictionary.rfc5580
index 374710e957..374710e957 100644
--- a/radius/dictionary.rfc5580
+++ b/resources/protocols/radius/dictionary.rfc5580
diff --git a/radius/dictionary.rfc5607 b/resources/protocols/radius/dictionary.rfc5607
index b618354257..b618354257 100644
--- a/radius/dictionary.rfc5607
+++ b/resources/protocols/radius/dictionary.rfc5607
diff --git a/radius/dictionary.rfc5904 b/resources/protocols/radius/dictionary.rfc5904
index 62b7431f47..62b7431f47 100644
--- a/radius/dictionary.rfc5904
+++ b/resources/protocols/radius/dictionary.rfc5904
diff --git a/radius/dictionary.rfc6519 b/resources/protocols/radius/dictionary.rfc6519
index 50f8c990a9..50f8c990a9 100644
--- a/radius/dictionary.rfc6519
+++ b/resources/protocols/radius/dictionary.rfc6519
diff --git a/radius/dictionary.rfc6572 b/resources/protocols/radius/dictionary.rfc6572
index 23b223b484..23b223b484 100644
--- a/radius/dictionary.rfc6572
+++ b/resources/protocols/radius/dictionary.rfc6572
diff --git a/radius/dictionary.rfc6677 b/resources/protocols/radius/dictionary.rfc6677
index 148f1a121d..148f1a121d 100644
--- a/radius/dictionary.rfc6677
+++ b/resources/protocols/radius/dictionary.rfc6677
diff --git a/radius/dictionary.rfc6911 b/resources/protocols/radius/dictionary.rfc6911
index 7d918ac264..7d918ac264 100644
--- a/radius/dictionary.rfc6911
+++ b/resources/protocols/radius/dictionary.rfc6911
diff --git a/radius/dictionary.rfc6929 b/resources/protocols/radius/dictionary.rfc6929
index 428764a55f..428764a55f 100644
--- a/radius/dictionary.rfc6929
+++ b/resources/protocols/radius/dictionary.rfc6929
diff --git a/radius/dictionary.rfc6930 b/resources/protocols/radius/dictionary.rfc6930
index 12d1d68ba9..12d1d68ba9 100644
--- a/radius/dictionary.rfc6930
+++ b/resources/protocols/radius/dictionary.rfc6930
diff --git a/radius/dictionary.rfc7055 b/resources/protocols/radius/dictionary.rfc7055
index 42ff5364dc..42ff5364dc 100644
--- a/radius/dictionary.rfc7055
+++ b/resources/protocols/radius/dictionary.rfc7055
diff --git a/radius/dictionary.rfc7155 b/resources/protocols/radius/dictionary.rfc7155
index dd48edcd39..dd48edcd39 100644
--- a/radius/dictionary.rfc7155
+++ b/resources/protocols/radius/dictionary.rfc7155
diff --git a/radius/dictionary.rfc7268 b/resources/protocols/radius/dictionary.rfc7268
index 5ed2ac59b6..5ed2ac59b6 100644
--- a/radius/dictionary.rfc7268
+++ b/resources/protocols/radius/dictionary.rfc7268
diff --git a/radius/dictionary.rfc7499 b/resources/protocols/radius/dictionary.rfc7499
index b025b5c5ce..b025b5c5ce 100644
--- a/radius/dictionary.rfc7499
+++ b/resources/protocols/radius/dictionary.rfc7499
diff --git a/radius/dictionary.rfc7930 b/resources/protocols/radius/dictionary.rfc7930
index f17e5024d9..f17e5024d9 100644
--- a/radius/dictionary.rfc7930
+++ b/resources/protocols/radius/dictionary.rfc7930
diff --git a/radius/dictionary.riverbed b/resources/protocols/radius/dictionary.riverbed
index 75601c0766..75601c0766 100644
--- a/radius/dictionary.riverbed
+++ b/resources/protocols/radius/dictionary.riverbed
diff --git a/radius/dictionary.riverstone b/resources/protocols/radius/dictionary.riverstone
index 92006d186a..92006d186a 100644
--- a/radius/dictionary.riverstone
+++ b/resources/protocols/radius/dictionary.riverstone
diff --git a/radius/dictionary.roaringpenguin b/resources/protocols/radius/dictionary.roaringpenguin
index 81086fe2a1..81086fe2a1 100644
--- a/radius/dictionary.roaringpenguin
+++ b/resources/protocols/radius/dictionary.roaringpenguin
diff --git a/radius/dictionary.ruckus b/resources/protocols/radius/dictionary.ruckus
index 37e0848e62..37e0848e62 100644
--- a/radius/dictionary.ruckus
+++ b/resources/protocols/radius/dictionary.ruckus
diff --git a/radius/dictionary.ruggedcom b/resources/protocols/radius/dictionary.ruggedcom
index 8011d0d1b1..8011d0d1b1 100644
--- a/radius/dictionary.ruggedcom
+++ b/resources/protocols/radius/dictionary.ruggedcom
diff --git a/radius/dictionary.sangoma b/resources/protocols/radius/dictionary.sangoma
index 1f7bc2a784..1f7bc2a784 100644
--- a/radius/dictionary.sangoma
+++ b/resources/protocols/radius/dictionary.sangoma
diff --git a/radius/dictionary.sg b/resources/protocols/radius/dictionary.sg
index 2e12c9f996..2e12c9f996 100644
--- a/radius/dictionary.sg
+++ b/resources/protocols/radius/dictionary.sg
diff --git a/radius/dictionary.shasta b/resources/protocols/radius/dictionary.shasta
index 0aa5893163..0aa5893163 100644
--- a/radius/dictionary.shasta
+++ b/resources/protocols/radius/dictionary.shasta
diff --git a/radius/dictionary.shiva b/resources/protocols/radius/dictionary.shiva
index 984d4fc5b3..984d4fc5b3 100644
--- a/radius/dictionary.shiva
+++ b/resources/protocols/radius/dictionary.shiva
diff --git a/radius/dictionary.siemens b/resources/protocols/radius/dictionary.siemens
index 26ed8ecd83..26ed8ecd83 100644
--- a/radius/dictionary.siemens
+++ b/resources/protocols/radius/dictionary.siemens
diff --git a/radius/dictionary.slipstream b/resources/protocols/radius/dictionary.slipstream
index fa16ae1bba..fa16ae1bba 100644
--- a/radius/dictionary.slipstream
+++ b/resources/protocols/radius/dictionary.slipstream
diff --git a/radius/dictionary.sofaware b/resources/protocols/radius/dictionary.sofaware
index 65554e4e36..65554e4e36 100644
--- a/radius/dictionary.sofaware
+++ b/resources/protocols/radius/dictionary.sofaware
diff --git a/radius/dictionary.sonicwall b/resources/protocols/radius/dictionary.sonicwall
index bdc57f3b47..bdc57f3b47 100644
--- a/radius/dictionary.sonicwall
+++ b/resources/protocols/radius/dictionary.sonicwall
diff --git a/radius/dictionary.springtide b/resources/protocols/radius/dictionary.springtide
index 23f1894a8a..23f1894a8a 100644
--- a/radius/dictionary.springtide
+++ b/resources/protocols/radius/dictionary.springtide
diff --git a/radius/dictionary.starent b/resources/protocols/radius/dictionary.starent
index 12f6405e10..12f6405e10 100644
--- a/radius/dictionary.starent
+++ b/resources/protocols/radius/dictionary.starent
diff --git a/radius/dictionary.starent.vsa1 b/resources/protocols/radius/dictionary.starent.vsa1
index e8c9ccced8..e8c9ccced8 100644
--- a/radius/dictionary.starent.vsa1
+++ b/resources/protocols/radius/dictionary.starent.vsa1
diff --git a/radius/dictionary.surfnet b/resources/protocols/radius/dictionary.surfnet
index 9405225343..9405225343 100644
--- a/radius/dictionary.surfnet
+++ b/resources/protocols/radius/dictionary.surfnet
diff --git a/radius/dictionary.symbol b/resources/protocols/radius/dictionary.symbol
index 6410d81c44..6410d81c44 100644
--- a/radius/dictionary.symbol
+++ b/resources/protocols/radius/dictionary.symbol
diff --git a/radius/dictionary.t_systems_nova b/resources/protocols/radius/dictionary.t_systems_nova
index c0b5987a9c..c0b5987a9c 100644
--- a/radius/dictionary.t_systems_nova
+++ b/resources/protocols/radius/dictionary.t_systems_nova
diff --git a/radius/dictionary.telebit b/resources/protocols/radius/dictionary.telebit
index b7ed4d2559..b7ed4d2559 100644
--- a/radius/dictionary.telebit
+++ b/resources/protocols/radius/dictionary.telebit
diff --git a/radius/dictionary.telkom b/resources/protocols/radius/dictionary.telkom
index 95c4774054..95c4774054 100644
--- a/radius/dictionary.telkom
+++ b/resources/protocols/radius/dictionary.telkom
diff --git a/radius/dictionary.terena b/resources/protocols/radius/dictionary.terena
index 0e3a396828..0e3a396828 100644
--- a/radius/dictionary.terena
+++ b/resources/protocols/radius/dictionary.terena
diff --git a/radius/dictionary.trapeze b/resources/protocols/radius/dictionary.trapeze
index bd613a7d6f..bd613a7d6f 100644
--- a/radius/dictionary.trapeze
+++ b/resources/protocols/radius/dictionary.trapeze
diff --git a/radius/dictionary.travelping b/resources/protocols/radius/dictionary.travelping
index 6d904a5886..6d904a5886 100644
--- a/radius/dictionary.travelping
+++ b/resources/protocols/radius/dictionary.travelping
diff --git a/radius/dictionary.tropos b/resources/protocols/radius/dictionary.tropos
index 27f918cc20..27f918cc20 100644
--- a/radius/dictionary.tropos
+++ b/resources/protocols/radius/dictionary.tropos
diff --git a/radius/dictionary.ukerna b/resources/protocols/radius/dictionary.ukerna
index e135917855..e135917855 100644
--- a/radius/dictionary.ukerna
+++ b/resources/protocols/radius/dictionary.ukerna
diff --git a/radius/dictionary.unisphere b/resources/protocols/radius/dictionary.unisphere
index a5431093e3..a5431093e3 100644
--- a/radius/dictionary.unisphere
+++ b/resources/protocols/radius/dictionary.unisphere
diff --git a/radius/dictionary.unix b/resources/protocols/radius/dictionary.unix
index d2f0059651..d2f0059651 100644
--- a/radius/dictionary.unix
+++ b/resources/protocols/radius/dictionary.unix
diff --git a/radius/dictionary.usr b/resources/protocols/radius/dictionary.usr
index 7bf9942ac9..7bf9942ac9 100644
--- a/radius/dictionary.usr
+++ b/resources/protocols/radius/dictionary.usr
diff --git a/radius/dictionary.utstarcom b/resources/protocols/radius/dictionary.utstarcom
index ae9e2615ee..ae9e2615ee 100644
--- a/radius/dictionary.utstarcom
+++ b/resources/protocols/radius/dictionary.utstarcom
diff --git a/radius/dictionary.valemount b/resources/protocols/radius/dictionary.valemount
index 94be06128e..94be06128e 100644
--- a/radius/dictionary.valemount
+++ b/resources/protocols/radius/dictionary.valemount
diff --git a/radius/dictionary.verizon b/resources/protocols/radius/dictionary.verizon
index 0d45418291..0d45418291 100644
--- a/radius/dictionary.verizon
+++ b/resources/protocols/radius/dictionary.verizon
diff --git a/radius/dictionary.versanet b/resources/protocols/radius/dictionary.versanet
index 1060a35520..1060a35520 100644
--- a/radius/dictionary.versanet
+++ b/resources/protocols/radius/dictionary.versanet
diff --git a/radius/dictionary.vqp b/resources/protocols/radius/dictionary.vqp
index a0bcbeb1f6..a0bcbeb1f6 100644
--- a/radius/dictionary.vqp
+++ b/resources/protocols/radius/dictionary.vqp
diff --git a/radius/dictionary.walabi b/resources/protocols/radius/dictionary.walabi
index 0713c83294..0713c83294 100644
--- a/radius/dictionary.walabi
+++ b/resources/protocols/radius/dictionary.walabi
diff --git a/radius/dictionary.waverider b/resources/protocols/radius/dictionary.waverider
index b1beef74e0..b1beef74e0 100644
--- a/radius/dictionary.waverider
+++ b/resources/protocols/radius/dictionary.waverider
diff --git a/radius/dictionary.wichorus b/resources/protocols/radius/dictionary.wichorus
index 20295e03fd..20295e03fd 100644
--- a/radius/dictionary.wichorus
+++ b/resources/protocols/radius/dictionary.wichorus
diff --git a/radius/dictionary.wimax b/resources/protocols/radius/dictionary.wimax
index 984f90b557..984f90b557 100644
--- a/radius/dictionary.wimax
+++ b/resources/protocols/radius/dictionary.wimax
diff --git a/radius/dictionary.wimax.alvarion b/resources/protocols/radius/dictionary.wimax.alvarion
index 1f839bda94..1f839bda94 100644
--- a/radius/dictionary.wimax.alvarion
+++ b/resources/protocols/radius/dictionary.wimax.alvarion
diff --git a/radius/dictionary.wimax.wichorus b/resources/protocols/radius/dictionary.wimax.wichorus
index 02b2007bbc..02b2007bbc 100644
--- a/radius/dictionary.wimax.wichorus
+++ b/resources/protocols/radius/dictionary.wimax.wichorus
diff --git a/radius/dictionary.wispr b/resources/protocols/radius/dictionary.wispr
index 71b4cdd6a3..71b4cdd6a3 100644
--- a/radius/dictionary.wispr
+++ b/resources/protocols/radius/dictionary.wispr
diff --git a/radius/dictionary.xedia b/resources/protocols/radius/dictionary.xedia
index 05d44d3c17..05d44d3c17 100644
--- a/radius/dictionary.xedia
+++ b/resources/protocols/radius/dictionary.xedia
diff --git a/radius/dictionary.xylan b/resources/protocols/radius/dictionary.xylan
index 2f6484d211..2f6484d211 100644
--- a/radius/dictionary.xylan
+++ b/resources/protocols/radius/dictionary.xylan
diff --git a/radius/dictionary.yubico b/resources/protocols/radius/dictionary.yubico
index a7fb1990a3..a7fb1990a3 100644
--- a/radius/dictionary.yubico
+++ b/resources/protocols/radius/dictionary.yubico
diff --git a/radius/dictionary.zeus b/resources/protocols/radius/dictionary.zeus
index 1604b7bdef..1604b7bdef 100644
--- a/radius/dictionary.zeus
+++ b/resources/protocols/radius/dictionary.zeus
diff --git a/radius/dictionary.zte b/resources/protocols/radius/dictionary.zte
index 6cfda57438..6cfda57438 100644
--- a/radius/dictionary.zte
+++ b/resources/protocols/radius/dictionary.zte
diff --git a/radius/dictionary.zyxel b/resources/protocols/radius/dictionary.zyxel
index 6bde7317f6..6bde7317f6 100644
--- a/radius/dictionary.zyxel
+++ b/resources/protocols/radius/dictionary.zyxel
diff --git a/tpncp/tpncp.dat b/resources/protocols/tpncp/tpncp.dat
index 94b67f4c2e..94b67f4c2e 100644
--- a/tpncp/tpncp.dat
+++ b/resources/protocols/tpncp/tpncp.dat
diff --git a/wimaxasncp/dictionary.dtd b/resources/protocols/wimaxasncp/dictionary.dtd
index 9cb556e09b..9cb556e09b 100644
--- a/wimaxasncp/dictionary.dtd
+++ b/resources/protocols/wimaxasncp/dictionary.dtd
diff --git a/wimaxasncp/dictionary.xml b/resources/protocols/wimaxasncp/dictionary.xml
index a856b22dd7..a856b22dd7 100644
--- a/wimaxasncp/dictionary.xml
+++ b/resources/protocols/wimaxasncp/dictionary.xml
diff --git a/tools/checklicenses.py b/tools/checklicenses.py
index 1c31edf062..7d04c49138 100755
--- a/tools/checklicenses.py
+++ b/tools/checklicenses.py
@@ -61,13 +61,13 @@ PATH_SPECIFIC_ALLOWED_LICENSES = {
     'wsutil/strnatcmp.h': [
         'Zlib',
     ],
-    'dtds': [
+    'resources/protocols/dtds': [
         'UNKNOWN',
     ],
-    'diameter/dictionary.dtd': [
+    'resources/protocols/diameter/dictionary.dtd': [
         'UNKNOWN',
     ],
-    'wimaxasncp/dictionary.dtd': [
+    'resources/protocols/wimaxasncp/dictionary.dtd': [
         'UNKNOWN',
     ],
     'doc/': [
diff --git a/tools/validate-diameter-xml.sh b/tools/validate-diameter-xml.sh
index a360633d44..e1937f71bb 100755
--- a/tools/validate-diameter-xml.sh
+++ b/tools/validate-diameter-xml.sh
@@ -25,15 +25,18 @@ then
 	exit 0
 fi
 
+src_dir="$(dirname "$0")/.."
+diameter_dir="$src_dir/resources/protocols/diameter"
+
 # Ideally this would work regardless of our cwd
-if [ ! -r diameter/dictionary.xml ]
+if [ ! -r "$diameter_dir/dictionary.xml" ]
 then
-	echo "Couldn't find diameter/dictionary.xml" 1>&2
+	echo "Couldn't find $diameter_dir/dictionary.xml" 1>&2
 	exit 1
 fi
-if [ ! -r diameter/dictionary.dtd ]
+if [ ! -r "$diameter_dir/dictionary.dtd" ]
 then
-	echo "Couldn't find diameter/dictionary.dtd" 1>&2
+	echo "Couldn't find $diameter_dir/dictionary.dtd" 1>&2
 	exit 1
 fi
 
@@ -65,8 +68,8 @@ done
 # Delete the last character, i.e., the trailing semicolon
 sedopts=${sedopts%?}
 
-cp diameter/dictionary.dtd "$tmpdir" || exit 1
-for f in diameter/*.xml
+cp "$diameter_dir/dictionary.dtd" "$tmpdir" || exit 1
+for f in "$diameter_dir"/*.xml
 do
         sed "${sedopts}" "$f" > "$tmpdir/${f##*/}" || exit 1
 done