From 492a11a256f55239498f58cf6e46e453737c0c4a Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 10 Mar 2022 16:01:14 -0800 Subject: [PATCH] Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp --- CMakeLists.txt | 97 +++++++++++-------- .../protocols/diameter}/AlcatelLucent.xml | 0 .../protocols/diameter}/Cisco.xml | 0 .../protocols/diameter}/CiscoSystems.xml | 0 .../protocols/diameter}/Custom.xml | 0 .../protocols/diameter}/Ericsson.xml | 0 .../protocols/diameter}/HP.xml | 0 .../protocols/diameter}/Huawei.xml | 0 .../protocols/diameter}/Inovar.xml | 0 .../protocols/diameter}/Juniper.xml | 0 .../protocols/diameter}/Metaswitch.xml | 0 .../protocols/diameter}/Microsoft.xml | 0 .../protocols/diameter}/Nokia.xml | 0 .../diameter}/NokiaSolutionsAndNetworks.xml | 0 .../protocols/diameter}/Oracle.xml | 0 .../protocols/diameter}/Siemens.xml | 0 .../protocols/diameter}/Starent.xml | 0 .../protocols/diameter}/TGPP.xml | 0 .../protocols/diameter}/TGPP2.xml | 0 .../protocols/diameter}/Telefonica.xml | 0 .../protocols/diameter}/VerizonWireless.xml | 0 .../protocols/diameter}/Vodafone.xml | 0 .../protocols/diameter}/chargecontrol.xml | 0 .../protocols/diameter}/dictionary.dtd | 0 .../protocols/diameter}/dictionary.xml | 0 .../protocols/diameter}/eap.xml | 0 .../protocols/diameter}/etsie2e4.xml | 0 .../protocols/diameter}/mobileipv4.xml | 0 .../protocols/diameter}/mobileipv6.xml | 0 .../protocols/diameter}/nasreq.xml | 0 .../protocols/diameter}/sip.xml | 0 .../protocols/diameter}/sunping.xml | 0 {dtds => resources/protocols/dtds}/dc.dtd | 0 {dtds => resources/protocols/dtds}/itunes.dtd | 0 {dtds => resources/protocols/dtds}/mscml.dtd | 0 .../protocols/dtds}/pocsettings.dtd | 0 .../protocols/dtds}/presence.dtd | 0 .../protocols/dtds}/reginfo.dtd | 0 {dtds => resources/protocols/dtds}/rlmi.dtd | 0 {dtds => resources/protocols/dtds}/rss.dtd | 0 {dtds => resources/protocols/dtds}/smil.dtd | 0 .../protocols/dtds}/watcherinfo.dtd | 0 .../protocols/dtds}/xcap-caps.dtd | 0 .../protocols/dtds}/xcap-error.dtd | 0 .../protocols/protobuf}/sparkplug_b.proto | 0 .../radius}/README.radius_dictionary | 0 .../protocols/radius}/custom.includes | 0 .../protocols/radius}/dictionary | 0 .../protocols/radius}/dictionary.3com | 0 .../protocols/radius}/dictionary.3gpp | 0 .../protocols/radius}/dictionary.3gpp2 | 0 .../protocols/radius}/dictionary.acc | 0 .../protocols/radius}/dictionary.acme | 0 .../protocols/radius}/dictionary.actelis | 0 .../protocols/radius}/dictionary.aerohive | 0 .../protocols/radius}/dictionary.airespace | 0 .../protocols/radius}/dictionary.alcatel | 0 .../radius}/dictionary.alcatel-lucent.aaa | 0 .../protocols/radius}/dictionary.alcatel.esam | 0 .../protocols/radius}/dictionary.alcatel.sr | 0 .../protocols/radius}/dictionary.alteon | 0 .../protocols/radius}/dictionary.altiga | 0 .../protocols/radius}/dictionary.alvarion | 0 .../radius}/dictionary.alvarion.wimax.v2_2 | 0 .../protocols/radius}/dictionary.apc | 0 .../protocols/radius}/dictionary.aptilo | 0 .../protocols/radius}/dictionary.aptis | 0 .../protocols/radius}/dictionary.arbor | 0 .../protocols/radius}/dictionary.aruba | 0 .../protocols/radius}/dictionary.ascend | 0 .../protocols/radius}/dictionary.asn | 0 .../protocols/radius}/dictionary.audiocodes | 0 .../protocols/radius}/dictionary.avaya | 0 .../protocols/radius}/dictionary.azaire | 0 .../protocols/radius}/dictionary.bay | 0 .../protocols/radius}/dictionary.bintec | 0 .../protocols/radius}/dictionary.bluecoat | 0 .../protocols/radius}/dictionary.bristol | 0 .../protocols/radius}/dictionary.broadsoft | 0 .../protocols/radius}/dictionary.brocade | 0 .../protocols/radius}/dictionary.bskyb | 0 .../protocols/radius}/dictionary.bt | 0 .../protocols/radius}/dictionary.cablelabs | 0 .../protocols/radius}/dictionary.cabletron | 0 .../protocols/radius}/dictionary.camiant | 0 .../protocols/radius}/dictionary.chillispot | 0 .../protocols/radius}/dictionary.cisco | 0 .../protocols/radius}/dictionary.cisco.asa | 0 .../protocols/radius}/dictionary.cisco.bbsm | 0 .../radius}/dictionary.cisco.vpn3000 | 0 .../radius}/dictionary.cisco.vpn5000 | 0 .../protocols/radius}/dictionary.citrix | 0 .../protocols/radius}/dictionary.clavister | 0 .../protocols/radius}/dictionary.cnergee | 0 .../protocols/radius}/dictionary.colubris | 0 .../radius}/dictionary.columbia_university | 0 .../protocols/radius}/dictionary.compat | 0 .../protocols/radius}/dictionary.compatible | 0 .../protocols/radius}/dictionary.cosine | 0 .../protocols/radius}/dictionary.dante | 0 .../protocols/radius}/dictionary.dellemc | 0 .../protocols/radius}/dictionary.dhcp | 0 .../protocols/radius}/dictionary.digium | 0 .../protocols/radius}/dictionary.dlink | 0 .../protocols/radius}/dictionary.dragonwave | 0 .../protocols/radius}/dictionary.efficientip | 0 .../protocols/radius}/dictionary.eltex | 0 .../protocols/radius}/dictionary.enterasys | 0 .../protocols/radius}/dictionary.epygi | 0 .../protocols/radius}/dictionary.equallogic | 0 .../protocols/radius}/dictionary.ericsson | 0 .../protocols/radius}/dictionary.ericsson.ab | 0 .../dictionary.ericsson.packet.core.networks | 0 .../protocols/radius}/dictionary.extreme | 0 .../protocols/radius}/dictionary.f5 | 0 .../protocols/radius}/dictionary.fdxtended | 0 .../protocols/radius}/dictionary.fortinet | 0 .../protocols/radius}/dictionary.foundry | 0 .../protocols/radius}/dictionary.freedhcp | 0 .../protocols/radius}/dictionary.freeradius | 0 .../radius}/dictionary.freeradius.internal | 0 .../protocols/radius}/dictionary.freeswitch | 0 .../protocols/radius}/dictionary.gandalf | 0 .../protocols/radius}/dictionary.garderos | 0 .../protocols/radius}/dictionary.gemtek | 0 .../protocols/radius}/dictionary.h3c | 0 .../protocols/radius}/dictionary.hp | 0 .../protocols/radius}/dictionary.huawei | 0 .../protocols/radius}/dictionary.iana | 0 .../radius}/dictionary.identity_engines | 0 .../protocols/radius}/dictionary.iea | 0 .../protocols/radius}/dictionary.infoblox | 0 .../protocols/radius}/dictionary.infonet | 0 .../protocols/radius}/dictionary.ipunplugged | 0 .../protocols/radius}/dictionary.issanni | 0 .../protocols/radius}/dictionary.itk | 0 .../protocols/radius}/dictionary.jradius | 0 .../protocols/radius}/dictionary.juniper | 0 .../protocols/radius}/dictionary.karlnet | 0 .../protocols/radius}/dictionary.kineto | 0 .../protocols/radius}/dictionary.lancom | 0 .../protocols/radius}/dictionary.livingston | 0 .../protocols/radius}/dictionary.localweb | 0 .../protocols/radius}/dictionary.lucent | 0 .../protocols/radius}/dictionary.manzara | 0 .../protocols/radius}/dictionary.meinberg | 0 .../protocols/radius}/dictionary.meraki | 0 .../protocols/radius}/dictionary.merit | 0 .../protocols/radius}/dictionary.meru | 0 .../protocols/radius}/dictionary.microsemi | 0 .../protocols/radius}/dictionary.microsoft | 0 .../protocols/radius}/dictionary.mikrotik | 0 .../protocols/radius}/dictionary.motorola | 0 .../radius}/dictionary.motorola.wimax | 0 .../protocols/radius}/dictionary.navini | 0 .../protocols/radius}/dictionary.netscreen | 0 .../radius}/dictionary.networkphysics | 0 .../protocols/radius}/dictionary.nexans | 0 .../protocols/radius}/dictionary.nokia | 0 .../radius}/dictionary.nokia.conflict | 0 .../protocols/radius}/dictionary.nomadix | 0 .../protocols/radius}/dictionary.nortel | 0 .../protocols/radius}/dictionary.ntua | 0 .../protocols/radius}/dictionary.openser | 0 .../protocols/radius}/dictionary.packeteer | 0 .../protocols/radius}/dictionary.paloalto | 0 .../protocols/radius}/dictionary.patton | 0 .../protocols/radius}/dictionary.perle | 0 .../protocols/radius}/dictionary.propel | 0 .../protocols/radius}/dictionary.prosoft | 0 .../protocols/radius}/dictionary.proxim | 0 .../protocols/radius}/dictionary.purewave | 0 .../protocols/radius}/dictionary.quiconnect | 0 .../protocols/radius}/dictionary.quintum | 0 .../protocols/radius}/dictionary.redcreek | 0 .../protocols/radius}/dictionary.rfc2865 | 0 .../protocols/radius}/dictionary.rfc2866 | 0 .../protocols/radius}/dictionary.rfc2867 | 0 .../protocols/radius}/dictionary.rfc2868 | 0 .../protocols/radius}/dictionary.rfc2869 | 0 .../protocols/radius}/dictionary.rfc3162 | 0 .../protocols/radius}/dictionary.rfc3576 | 0 .../protocols/radius}/dictionary.rfc3580 | 0 .../protocols/radius}/dictionary.rfc4072 | 0 .../protocols/radius}/dictionary.rfc4372 | 0 .../protocols/radius}/dictionary.rfc4603 | 0 .../protocols/radius}/dictionary.rfc4675 | 0 .../protocols/radius}/dictionary.rfc4679 | 0 .../protocols/radius}/dictionary.rfc4818 | 0 .../protocols/radius}/dictionary.rfc4849 | 0 .../protocols/radius}/dictionary.rfc5090 | 0 .../protocols/radius}/dictionary.rfc5176 | 0 .../protocols/radius}/dictionary.rfc5447 | 0 .../protocols/radius}/dictionary.rfc5580 | 0 .../protocols/radius}/dictionary.rfc5607 | 0 .../protocols/radius}/dictionary.rfc5904 | 0 .../protocols/radius}/dictionary.rfc6519 | 0 .../protocols/radius}/dictionary.rfc6572 | 0 .../protocols/radius}/dictionary.rfc6677 | 0 .../protocols/radius}/dictionary.rfc6911 | 0 .../protocols/radius}/dictionary.rfc6929 | 0 .../protocols/radius}/dictionary.rfc6930 | 0 .../protocols/radius}/dictionary.rfc7055 | 0 .../protocols/radius}/dictionary.rfc7155 | 0 .../protocols/radius}/dictionary.rfc7268 | 0 .../protocols/radius}/dictionary.rfc7499 | 0 .../protocols/radius}/dictionary.rfc7930 | 0 .../protocols/radius}/dictionary.riverbed | 0 .../protocols/radius}/dictionary.riverstone | 0 .../radius}/dictionary.roaringpenguin | 0 .../protocols/radius}/dictionary.ruckus | 0 .../protocols/radius}/dictionary.ruggedcom | 0 .../protocols/radius}/dictionary.sangoma | 0 .../protocols/radius}/dictionary.sg | 0 .../protocols/radius}/dictionary.shasta | 0 .../protocols/radius}/dictionary.shiva | 0 .../protocols/radius}/dictionary.siemens | 0 .../protocols/radius}/dictionary.slipstream | 0 .../protocols/radius}/dictionary.sofaware | 0 .../protocols/radius}/dictionary.sonicwall | 0 .../protocols/radius}/dictionary.springtide | 0 .../protocols/radius}/dictionary.starent | 0 .../protocols/radius}/dictionary.starent.vsa1 | 0 .../protocols/radius}/dictionary.surfnet | 0 .../protocols/radius}/dictionary.symbol | 0 .../radius}/dictionary.t_systems_nova | 0 .../protocols/radius}/dictionary.telebit | 0 .../protocols/radius}/dictionary.telkom | 0 .../protocols/radius}/dictionary.terena | 0 .../protocols/radius}/dictionary.trapeze | 0 .../protocols/radius}/dictionary.travelping | 0 .../protocols/radius}/dictionary.tropos | 0 .../protocols/radius}/dictionary.ukerna | 0 .../protocols/radius}/dictionary.unisphere | 0 .../protocols/radius}/dictionary.unix | 0 .../protocols/radius}/dictionary.usr | 0 .../protocols/radius}/dictionary.utstarcom | 0 .../protocols/radius}/dictionary.valemount | 0 .../protocols/radius}/dictionary.verizon | 0 .../protocols/radius}/dictionary.versanet | 0 .../protocols/radius}/dictionary.vqp | 0 .../protocols/radius}/dictionary.walabi | 0 .../protocols/radius}/dictionary.waverider | 0 .../protocols/radius}/dictionary.wichorus | 0 .../protocols/radius}/dictionary.wimax | 0 .../radius}/dictionary.wimax.alvarion | 0 .../radius}/dictionary.wimax.wichorus | 0 .../protocols/radius}/dictionary.wispr | 0 .../protocols/radius}/dictionary.xedia | 0 .../protocols/radius}/dictionary.xylan | 0 .../protocols/radius}/dictionary.yubico | 0 .../protocols/radius}/dictionary.zeus | 0 .../protocols/radius}/dictionary.zte | 0 .../protocols/radius}/dictionary.zyxel | 0 .../protocols/tpncp}/tpncp.dat | 0 .../protocols/wimaxasncp}/dictionary.dtd | 0 .../protocols/wimaxasncp}/dictionary.xml | 0 tools/checklicenses.py | 6 +- tools/validate-diameter-xml.sh | 15 +-- 259 files changed, 66 insertions(+), 52 deletions(-) rename {diameter => resources/protocols/diameter}/AlcatelLucent.xml (100%) rename {diameter => resources/protocols/diameter}/Cisco.xml (100%) rename {diameter => resources/protocols/diameter}/CiscoSystems.xml (100%) rename {diameter => resources/protocols/diameter}/Custom.xml (100%) rename {diameter => resources/protocols/diameter}/Ericsson.xml (100%) rename {diameter => resources/protocols/diameter}/HP.xml (100%) rename {diameter => resources/protocols/diameter}/Huawei.xml (100%) rename {diameter => resources/protocols/diameter}/Inovar.xml (100%) rename {diameter => resources/protocols/diameter}/Juniper.xml (100%) rename {diameter => resources/protocols/diameter}/Metaswitch.xml (100%) rename {diameter => resources/protocols/diameter}/Microsoft.xml (100%) rename {diameter => resources/protocols/diameter}/Nokia.xml (100%) rename {diameter => resources/protocols/diameter}/NokiaSolutionsAndNetworks.xml (100%) rename {diameter => resources/protocols/diameter}/Oracle.xml (100%) rename {diameter => resources/protocols/diameter}/Siemens.xml (100%) rename {diameter => resources/protocols/diameter}/Starent.xml (100%) rename {diameter => resources/protocols/diameter}/TGPP.xml (100%) rename {diameter => resources/protocols/diameter}/TGPP2.xml (100%) rename {diameter => resources/protocols/diameter}/Telefonica.xml (100%) rename {diameter => resources/protocols/diameter}/VerizonWireless.xml (100%) rename {diameter => resources/protocols/diameter}/Vodafone.xml (100%) rename {diameter => resources/protocols/diameter}/chargecontrol.xml (100%) rename {diameter => resources/protocols/diameter}/dictionary.dtd (100%) rename {diameter => resources/protocols/diameter}/dictionary.xml (100%) rename {diameter => resources/protocols/diameter}/eap.xml (100%) rename {diameter => resources/protocols/diameter}/etsie2e4.xml (100%) rename {diameter => resources/protocols/diameter}/mobileipv4.xml (100%) rename {diameter => resources/protocols/diameter}/mobileipv6.xml (100%) rename {diameter => resources/protocols/diameter}/nasreq.xml (100%) rename {diameter => resources/protocols/diameter}/sip.xml (100%) rename {diameter => resources/protocols/diameter}/sunping.xml (100%) rename {dtds => resources/protocols/dtds}/dc.dtd (100%) rename {dtds => resources/protocols/dtds}/itunes.dtd (100%) rename {dtds => resources/protocols/dtds}/mscml.dtd (100%) rename {dtds => resources/protocols/dtds}/pocsettings.dtd (100%) rename {dtds => resources/protocols/dtds}/presence.dtd (100%) rename {dtds => resources/protocols/dtds}/reginfo.dtd (100%) rename {dtds => resources/protocols/dtds}/rlmi.dtd (100%) rename {dtds => resources/protocols/dtds}/rss.dtd (100%) rename {dtds => resources/protocols/dtds}/smil.dtd (100%) rename {dtds => resources/protocols/dtds}/watcherinfo.dtd (100%) rename {dtds => resources/protocols/dtds}/xcap-caps.dtd (100%) rename {dtds => resources/protocols/dtds}/xcap-error.dtd (100%) rename {protobuf => resources/protocols/protobuf}/sparkplug_b.proto (100%) rename {radius => resources/protocols/radius}/README.radius_dictionary (100%) rename {radius => resources/protocols/radius}/custom.includes (100%) rename {radius => resources/protocols/radius}/dictionary (100%) rename {radius => resources/protocols/radius}/dictionary.3com (100%) rename {radius => resources/protocols/radius}/dictionary.3gpp (100%) rename {radius => resources/protocols/radius}/dictionary.3gpp2 (100%) rename {radius => resources/protocols/radius}/dictionary.acc (100%) rename {radius => resources/protocols/radius}/dictionary.acme (100%) rename {radius => resources/protocols/radius}/dictionary.actelis (100%) rename {radius => resources/protocols/radius}/dictionary.aerohive (100%) rename {radius => resources/protocols/radius}/dictionary.airespace (100%) rename {radius => resources/protocols/radius}/dictionary.alcatel (100%) rename {radius => resources/protocols/radius}/dictionary.alcatel-lucent.aaa (100%) rename {radius => resources/protocols/radius}/dictionary.alcatel.esam (100%) rename {radius => resources/protocols/radius}/dictionary.alcatel.sr (100%) rename {radius => resources/protocols/radius}/dictionary.alteon (100%) rename {radius => resources/protocols/radius}/dictionary.altiga (100%) rename {radius => resources/protocols/radius}/dictionary.alvarion (100%) rename {radius => resources/protocols/radius}/dictionary.alvarion.wimax.v2_2 (100%) rename {radius => resources/protocols/radius}/dictionary.apc (100%) rename {radius => resources/protocols/radius}/dictionary.aptilo (100%) rename {radius => resources/protocols/radius}/dictionary.aptis (100%) rename {radius => resources/protocols/radius}/dictionary.arbor (100%) rename {radius => resources/protocols/radius}/dictionary.aruba (100%) rename {radius => resources/protocols/radius}/dictionary.ascend (100%) rename {radius => resources/protocols/radius}/dictionary.asn (100%) rename {radius => resources/protocols/radius}/dictionary.audiocodes (100%) rename {radius => resources/protocols/radius}/dictionary.avaya (100%) rename {radius => resources/protocols/radius}/dictionary.azaire (100%) rename {radius => resources/protocols/radius}/dictionary.bay (100%) rename {radius => resources/protocols/radius}/dictionary.bintec (100%) rename {radius => resources/protocols/radius}/dictionary.bluecoat (100%) rename {radius => resources/protocols/radius}/dictionary.bristol (100%) rename {radius => resources/protocols/radius}/dictionary.broadsoft (100%) rename {radius => resources/protocols/radius}/dictionary.brocade (100%) rename {radius => resources/protocols/radius}/dictionary.bskyb (100%) rename {radius => resources/protocols/radius}/dictionary.bt (100%) rename {radius => resources/protocols/radius}/dictionary.cablelabs (100%) rename {radius => resources/protocols/radius}/dictionary.cabletron (100%) rename {radius => resources/protocols/radius}/dictionary.camiant (100%) rename {radius => resources/protocols/radius}/dictionary.chillispot (100%) rename {radius => resources/protocols/radius}/dictionary.cisco (100%) rename {radius => resources/protocols/radius}/dictionary.cisco.asa (100%) rename {radius => resources/protocols/radius}/dictionary.cisco.bbsm (100%) rename {radius => resources/protocols/radius}/dictionary.cisco.vpn3000 (100%) rename {radius => resources/protocols/radius}/dictionary.cisco.vpn5000 (100%) rename {radius => resources/protocols/radius}/dictionary.citrix (100%) rename {radius => resources/protocols/radius}/dictionary.clavister (100%) rename {radius => resources/protocols/radius}/dictionary.cnergee (100%) rename {radius => resources/protocols/radius}/dictionary.colubris (100%) rename {radius => resources/protocols/radius}/dictionary.columbia_university (100%) rename {radius => resources/protocols/radius}/dictionary.compat (100%) rename {radius => resources/protocols/radius}/dictionary.compatible (100%) rename {radius => resources/protocols/radius}/dictionary.cosine (100%) rename {radius => resources/protocols/radius}/dictionary.dante (100%) rename {radius => resources/protocols/radius}/dictionary.dellemc (100%) rename {radius => resources/protocols/radius}/dictionary.dhcp (100%) rename {radius => resources/protocols/radius}/dictionary.digium (100%) rename {radius => resources/protocols/radius}/dictionary.dlink (100%) rename {radius => resources/protocols/radius}/dictionary.dragonwave (100%) rename {radius => resources/protocols/radius}/dictionary.efficientip (100%) rename {radius => resources/protocols/radius}/dictionary.eltex (100%) rename {radius => resources/protocols/radius}/dictionary.enterasys (100%) rename {radius => resources/protocols/radius}/dictionary.epygi (100%) rename {radius => resources/protocols/radius}/dictionary.equallogic (100%) rename {radius => resources/protocols/radius}/dictionary.ericsson (100%) rename {radius => resources/protocols/radius}/dictionary.ericsson.ab (100%) rename {radius => resources/protocols/radius}/dictionary.ericsson.packet.core.networks (100%) rename {radius => resources/protocols/radius}/dictionary.extreme (100%) rename {radius => resources/protocols/radius}/dictionary.f5 (100%) rename {radius => resources/protocols/radius}/dictionary.fdxtended (100%) rename {radius => resources/protocols/radius}/dictionary.fortinet (100%) rename {radius => resources/protocols/radius}/dictionary.foundry (100%) rename {radius => resources/protocols/radius}/dictionary.freedhcp (100%) rename {radius => resources/protocols/radius}/dictionary.freeradius (100%) rename {radius => resources/protocols/radius}/dictionary.freeradius.internal (100%) rename {radius => resources/protocols/radius}/dictionary.freeswitch (100%) rename {radius => resources/protocols/radius}/dictionary.gandalf (100%) rename {radius => resources/protocols/radius}/dictionary.garderos (100%) rename {radius => resources/protocols/radius}/dictionary.gemtek (100%) rename {radius => resources/protocols/radius}/dictionary.h3c (100%) rename {radius => resources/protocols/radius}/dictionary.hp (100%) rename {radius => resources/protocols/radius}/dictionary.huawei (100%) rename {radius => resources/protocols/radius}/dictionary.iana (100%) rename {radius => resources/protocols/radius}/dictionary.identity_engines (100%) rename {radius => resources/protocols/radius}/dictionary.iea (100%) rename {radius => resources/protocols/radius}/dictionary.infoblox (100%) rename {radius => resources/protocols/radius}/dictionary.infonet (100%) rename {radius => resources/protocols/radius}/dictionary.ipunplugged (100%) rename {radius => resources/protocols/radius}/dictionary.issanni (100%) rename {radius => resources/protocols/radius}/dictionary.itk (100%) rename {radius => resources/protocols/radius}/dictionary.jradius (100%) rename {radius => resources/protocols/radius}/dictionary.juniper (100%) rename {radius => resources/protocols/radius}/dictionary.karlnet (100%) rename {radius => resources/protocols/radius}/dictionary.kineto (100%) rename {radius => resources/protocols/radius}/dictionary.lancom (100%) rename {radius => resources/protocols/radius}/dictionary.livingston (100%) rename {radius => resources/protocols/radius}/dictionary.localweb (100%) rename {radius => resources/protocols/radius}/dictionary.lucent (100%) rename {radius => resources/protocols/radius}/dictionary.manzara (100%) rename {radius => resources/protocols/radius}/dictionary.meinberg (100%) rename {radius => resources/protocols/radius}/dictionary.meraki (100%) rename {radius => resources/protocols/radius}/dictionary.merit (100%) rename {radius => resources/protocols/radius}/dictionary.meru (100%) rename {radius => resources/protocols/radius}/dictionary.microsemi (100%) rename {radius => resources/protocols/radius}/dictionary.microsoft (100%) rename {radius => resources/protocols/radius}/dictionary.mikrotik (100%) rename {radius => resources/protocols/radius}/dictionary.motorola (100%) rename {radius => resources/protocols/radius}/dictionary.motorola.wimax (100%) rename {radius => resources/protocols/radius}/dictionary.navini (100%) rename {radius => resources/protocols/radius}/dictionary.netscreen (100%) rename {radius => resources/protocols/radius}/dictionary.networkphysics (100%) rename {radius => resources/protocols/radius}/dictionary.nexans (100%) rename {radius => resources/protocols/radius}/dictionary.nokia (100%) rename {radius => resources/protocols/radius}/dictionary.nokia.conflict (100%) rename {radius => resources/protocols/radius}/dictionary.nomadix (100%) rename {radius => resources/protocols/radius}/dictionary.nortel (100%) rename {radius => resources/protocols/radius}/dictionary.ntua (100%) rename {radius => resources/protocols/radius}/dictionary.openser (100%) rename {radius => resources/protocols/radius}/dictionary.packeteer (100%) rename {radius => resources/protocols/radius}/dictionary.paloalto (100%) rename {radius => resources/protocols/radius}/dictionary.patton (100%) rename {radius => resources/protocols/radius}/dictionary.perle (100%) rename {radius => resources/protocols/radius}/dictionary.propel (100%) rename {radius => resources/protocols/radius}/dictionary.prosoft (100%) rename {radius => resources/protocols/radius}/dictionary.proxim (100%) rename {radius => resources/protocols/radius}/dictionary.purewave (100%) rename {radius => resources/protocols/radius}/dictionary.quiconnect (100%) rename {radius => resources/protocols/radius}/dictionary.quintum (100%) rename {radius => resources/protocols/radius}/dictionary.redcreek (100%) rename {radius => resources/protocols/radius}/dictionary.rfc2865 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc2866 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc2867 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc2868 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc2869 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc3162 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc3576 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc3580 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4072 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4372 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4603 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4675 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4679 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4818 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc4849 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5090 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5176 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5447 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5580 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5607 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc5904 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6519 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6572 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6677 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6911 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6929 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc6930 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc7055 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc7155 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc7268 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc7499 (100%) rename {radius => resources/protocols/radius}/dictionary.rfc7930 (100%) rename {radius => resources/protocols/radius}/dictionary.riverbed (100%) rename {radius => resources/protocols/radius}/dictionary.riverstone (100%) rename {radius => resources/protocols/radius}/dictionary.roaringpenguin (100%) rename {radius => resources/protocols/radius}/dictionary.ruckus (100%) rename {radius => resources/protocols/radius}/dictionary.ruggedcom (100%) rename {radius => resources/protocols/radius}/dictionary.sangoma (100%) rename {radius => resources/protocols/radius}/dictionary.sg (100%) rename {radius => resources/protocols/radius}/dictionary.shasta (100%) rename {radius => resources/protocols/radius}/dictionary.shiva (100%) rename {radius => resources/protocols/radius}/dictionary.siemens (100%) rename {radius => resources/protocols/radius}/dictionary.slipstream (100%) rename {radius => resources/protocols/radius}/dictionary.sofaware (100%) rename {radius => resources/protocols/radius}/dictionary.sonicwall (100%) rename {radius => resources/protocols/radius}/dictionary.springtide (100%) rename {radius => resources/protocols/radius}/dictionary.starent (100%) rename {radius => resources/protocols/radius}/dictionary.starent.vsa1 (100%) rename {radius => resources/protocols/radius}/dictionary.surfnet (100%) rename {radius => resources/protocols/radius}/dictionary.symbol (100%) rename {radius => resources/protocols/radius}/dictionary.t_systems_nova (100%) rename {radius => resources/protocols/radius}/dictionary.telebit (100%) rename {radius => resources/protocols/radius}/dictionary.telkom (100%) rename {radius => resources/protocols/radius}/dictionary.terena (100%) rename {radius => resources/protocols/radius}/dictionary.trapeze (100%) rename {radius => resources/protocols/radius}/dictionary.travelping (100%) rename {radius => resources/protocols/radius}/dictionary.tropos (100%) rename {radius => resources/protocols/radius}/dictionary.ukerna (100%) rename {radius => resources/protocols/radius}/dictionary.unisphere (100%) rename {radius => resources/protocols/radius}/dictionary.unix (100%) rename {radius => resources/protocols/radius}/dictionary.usr (100%) rename {radius => resources/protocols/radius}/dictionary.utstarcom (100%) rename {radius => resources/protocols/radius}/dictionary.valemount (100%) rename {radius => resources/protocols/radius}/dictionary.verizon (100%) rename {radius => resources/protocols/radius}/dictionary.versanet (100%) rename {radius => resources/protocols/radius}/dictionary.vqp (100%) rename {radius => resources/protocols/radius}/dictionary.walabi (100%) rename {radius => resources/protocols/radius}/dictionary.waverider (100%) rename {radius => resources/protocols/radius}/dictionary.wichorus (100%) rename {radius => resources/protocols/radius}/dictionary.wimax (100%) rename {radius => resources/protocols/radius}/dictionary.wimax.alvarion (100%) rename {radius => resources/protocols/radius}/dictionary.wimax.wichorus (100%) rename {radius => resources/protocols/radius}/dictionary.wispr (100%) rename {radius => resources/protocols/radius}/dictionary.xedia (100%) rename {radius => resources/protocols/radius}/dictionary.xylan (100%) rename {radius => resources/protocols/radius}/dictionary.yubico (100%) rename {radius => resources/protocols/radius}/dictionary.zeus (100%) rename {radius => resources/protocols/radius}/dictionary.zte (100%) rename {radius => resources/protocols/radius}/dictionary.zyxel (100%) rename {tpncp => resources/protocols/tpncp}/tpncp.dat (100%) rename {wimaxasncp => resources/protocols/wimaxasncp}/dictionary.dtd (100%) rename {wimaxasncp => resources/protocols/wimaxasncp}/dictionary.xml (100%) 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 similarity index 100% rename from diameter/AlcatelLucent.xml rename to resources/protocols/diameter/AlcatelLucent.xml diff --git a/diameter/Cisco.xml b/resources/protocols/diameter/Cisco.xml similarity index 100% rename from diameter/Cisco.xml rename to resources/protocols/diameter/Cisco.xml diff --git a/diameter/CiscoSystems.xml b/resources/protocols/diameter/CiscoSystems.xml similarity index 100% rename from diameter/CiscoSystems.xml rename to resources/protocols/diameter/CiscoSystems.xml diff --git a/diameter/Custom.xml b/resources/protocols/diameter/Custom.xml similarity index 100% rename from diameter/Custom.xml rename to resources/protocols/diameter/Custom.xml diff --git a/diameter/Ericsson.xml b/resources/protocols/diameter/Ericsson.xml similarity index 100% rename from diameter/Ericsson.xml rename to resources/protocols/diameter/Ericsson.xml diff --git a/diameter/HP.xml b/resources/protocols/diameter/HP.xml similarity index 100% rename from diameter/HP.xml rename to resources/protocols/diameter/HP.xml diff --git a/diameter/Huawei.xml b/resources/protocols/diameter/Huawei.xml similarity index 100% rename from diameter/Huawei.xml rename to resources/protocols/diameter/Huawei.xml diff --git a/diameter/Inovar.xml b/resources/protocols/diameter/Inovar.xml similarity index 100% rename from diameter/Inovar.xml rename to resources/protocols/diameter/Inovar.xml diff --git a/diameter/Juniper.xml b/resources/protocols/diameter/Juniper.xml similarity index 100% rename from diameter/Juniper.xml rename to resources/protocols/diameter/Juniper.xml diff --git a/diameter/Metaswitch.xml b/resources/protocols/diameter/Metaswitch.xml similarity index 100% rename from diameter/Metaswitch.xml rename to resources/protocols/diameter/Metaswitch.xml diff --git a/diameter/Microsoft.xml b/resources/protocols/diameter/Microsoft.xml similarity index 100% rename from diameter/Microsoft.xml rename to resources/protocols/diameter/Microsoft.xml diff --git a/diameter/Nokia.xml b/resources/protocols/diameter/Nokia.xml similarity index 100% rename from diameter/Nokia.xml rename to resources/protocols/diameter/Nokia.xml diff --git a/diameter/NokiaSolutionsAndNetworks.xml b/resources/protocols/diameter/NokiaSolutionsAndNetworks.xml similarity index 100% rename from diameter/NokiaSolutionsAndNetworks.xml rename to resources/protocols/diameter/NokiaSolutionsAndNetworks.xml diff --git a/diameter/Oracle.xml b/resources/protocols/diameter/Oracle.xml similarity index 100% rename from diameter/Oracle.xml rename to resources/protocols/diameter/Oracle.xml diff --git a/diameter/Siemens.xml b/resources/protocols/diameter/Siemens.xml similarity index 100% rename from diameter/Siemens.xml rename to resources/protocols/diameter/Siemens.xml diff --git a/diameter/Starent.xml b/resources/protocols/diameter/Starent.xml similarity index 100% rename from diameter/Starent.xml rename to resources/protocols/diameter/Starent.xml diff --git a/diameter/TGPP.xml b/resources/protocols/diameter/TGPP.xml similarity index 100% rename from diameter/TGPP.xml rename to resources/protocols/diameter/TGPP.xml diff --git a/diameter/TGPP2.xml b/resources/protocols/diameter/TGPP2.xml similarity index 100% rename from diameter/TGPP2.xml rename to resources/protocols/diameter/TGPP2.xml diff --git a/diameter/Telefonica.xml b/resources/protocols/diameter/Telefonica.xml similarity index 100% rename from diameter/Telefonica.xml rename to resources/protocols/diameter/Telefonica.xml diff --git a/diameter/VerizonWireless.xml b/resources/protocols/diameter/VerizonWireless.xml similarity index 100% rename from diameter/VerizonWireless.xml rename to resources/protocols/diameter/VerizonWireless.xml diff --git a/diameter/Vodafone.xml b/resources/protocols/diameter/Vodafone.xml similarity index 100% rename from diameter/Vodafone.xml rename to resources/protocols/diameter/Vodafone.xml diff --git a/diameter/chargecontrol.xml b/resources/protocols/diameter/chargecontrol.xml similarity index 100% rename from diameter/chargecontrol.xml rename to resources/protocols/diameter/chargecontrol.xml diff --git a/diameter/dictionary.dtd b/resources/protocols/diameter/dictionary.dtd similarity index 100% rename from diameter/dictionary.dtd rename to resources/protocols/diameter/dictionary.dtd diff --git a/diameter/dictionary.xml b/resources/protocols/diameter/dictionary.xml similarity index 100% rename from diameter/dictionary.xml rename to resources/protocols/diameter/dictionary.xml diff --git a/diameter/eap.xml b/resources/protocols/diameter/eap.xml similarity index 100% rename from diameter/eap.xml rename to resources/protocols/diameter/eap.xml diff --git a/diameter/etsie2e4.xml b/resources/protocols/diameter/etsie2e4.xml similarity index 100% rename from diameter/etsie2e4.xml rename to resources/protocols/diameter/etsie2e4.xml diff --git a/diameter/mobileipv4.xml b/resources/protocols/diameter/mobileipv4.xml similarity index 100% rename from diameter/mobileipv4.xml rename to resources/protocols/diameter/mobileipv4.xml diff --git a/diameter/mobileipv6.xml b/resources/protocols/diameter/mobileipv6.xml similarity index 100% rename from diameter/mobileipv6.xml rename to resources/protocols/diameter/mobileipv6.xml diff --git a/diameter/nasreq.xml b/resources/protocols/diameter/nasreq.xml similarity index 100% rename from diameter/nasreq.xml rename to resources/protocols/diameter/nasreq.xml diff --git a/diameter/sip.xml b/resources/protocols/diameter/sip.xml similarity index 100% rename from diameter/sip.xml rename to resources/protocols/diameter/sip.xml diff --git a/diameter/sunping.xml b/resources/protocols/diameter/sunping.xml similarity index 100% rename from diameter/sunping.xml rename to resources/protocols/diameter/sunping.xml diff --git a/dtds/dc.dtd b/resources/protocols/dtds/dc.dtd similarity index 100% rename from dtds/dc.dtd rename to resources/protocols/dtds/dc.dtd diff --git a/dtds/itunes.dtd b/resources/protocols/dtds/itunes.dtd similarity index 100% rename from dtds/itunes.dtd rename to resources/protocols/dtds/itunes.dtd diff --git a/dtds/mscml.dtd b/resources/protocols/dtds/mscml.dtd similarity index 100% rename from dtds/mscml.dtd rename to resources/protocols/dtds/mscml.dtd diff --git a/dtds/pocsettings.dtd b/resources/protocols/dtds/pocsettings.dtd similarity index 100% rename from dtds/pocsettings.dtd rename to resources/protocols/dtds/pocsettings.dtd diff --git a/dtds/presence.dtd b/resources/protocols/dtds/presence.dtd similarity index 100% rename from dtds/presence.dtd rename to resources/protocols/dtds/presence.dtd diff --git a/dtds/reginfo.dtd b/resources/protocols/dtds/reginfo.dtd similarity index 100% rename from dtds/reginfo.dtd rename to resources/protocols/dtds/reginfo.dtd diff --git a/dtds/rlmi.dtd b/resources/protocols/dtds/rlmi.dtd similarity index 100% rename from dtds/rlmi.dtd rename to resources/protocols/dtds/rlmi.dtd diff --git a/dtds/rss.dtd b/resources/protocols/dtds/rss.dtd similarity index 100% rename from dtds/rss.dtd rename to resources/protocols/dtds/rss.dtd diff --git a/dtds/smil.dtd b/resources/protocols/dtds/smil.dtd similarity index 100% rename from dtds/smil.dtd rename to resources/protocols/dtds/smil.dtd diff --git a/dtds/watcherinfo.dtd b/resources/protocols/dtds/watcherinfo.dtd similarity index 100% rename from dtds/watcherinfo.dtd rename to resources/protocols/dtds/watcherinfo.dtd diff --git a/dtds/xcap-caps.dtd b/resources/protocols/dtds/xcap-caps.dtd similarity index 100% rename from dtds/xcap-caps.dtd rename to resources/protocols/dtds/xcap-caps.dtd diff --git a/dtds/xcap-error.dtd b/resources/protocols/dtds/xcap-error.dtd similarity index 100% rename from dtds/xcap-error.dtd rename to resources/protocols/dtds/xcap-error.dtd diff --git a/protobuf/sparkplug_b.proto b/resources/protocols/protobuf/sparkplug_b.proto similarity index 100% rename from protobuf/sparkplug_b.proto rename to resources/protocols/protobuf/sparkplug_b.proto diff --git a/radius/README.radius_dictionary b/resources/protocols/radius/README.radius_dictionary similarity index 100% rename from radius/README.radius_dictionary rename to resources/protocols/radius/README.radius_dictionary diff --git a/radius/custom.includes b/resources/protocols/radius/custom.includes similarity index 100% rename from radius/custom.includes rename to resources/protocols/radius/custom.includes diff --git a/radius/dictionary b/resources/protocols/radius/dictionary similarity index 100% rename from radius/dictionary rename to resources/protocols/radius/dictionary diff --git a/radius/dictionary.3com b/resources/protocols/radius/dictionary.3com similarity index 100% rename from radius/dictionary.3com rename to resources/protocols/radius/dictionary.3com diff --git a/radius/dictionary.3gpp b/resources/protocols/radius/dictionary.3gpp similarity index 100% rename from radius/dictionary.3gpp rename to resources/protocols/radius/dictionary.3gpp diff --git a/radius/dictionary.3gpp2 b/resources/protocols/radius/dictionary.3gpp2 similarity index 100% rename from radius/dictionary.3gpp2 rename to resources/protocols/radius/dictionary.3gpp2 diff --git a/radius/dictionary.acc b/resources/protocols/radius/dictionary.acc similarity index 100% rename from radius/dictionary.acc rename to resources/protocols/radius/dictionary.acc diff --git a/radius/dictionary.acme b/resources/protocols/radius/dictionary.acme similarity index 100% rename from radius/dictionary.acme rename to resources/protocols/radius/dictionary.acme diff --git a/radius/dictionary.actelis b/resources/protocols/radius/dictionary.actelis similarity index 100% rename from radius/dictionary.actelis rename to resources/protocols/radius/dictionary.actelis diff --git a/radius/dictionary.aerohive b/resources/protocols/radius/dictionary.aerohive similarity index 100% rename from radius/dictionary.aerohive rename to resources/protocols/radius/dictionary.aerohive diff --git a/radius/dictionary.airespace b/resources/protocols/radius/dictionary.airespace similarity index 100% rename from radius/dictionary.airespace rename to resources/protocols/radius/dictionary.airespace diff --git a/radius/dictionary.alcatel b/resources/protocols/radius/dictionary.alcatel similarity index 100% rename from radius/dictionary.alcatel rename to resources/protocols/radius/dictionary.alcatel diff --git a/radius/dictionary.alcatel-lucent.aaa b/resources/protocols/radius/dictionary.alcatel-lucent.aaa similarity index 100% rename from radius/dictionary.alcatel-lucent.aaa rename to resources/protocols/radius/dictionary.alcatel-lucent.aaa diff --git a/radius/dictionary.alcatel.esam b/resources/protocols/radius/dictionary.alcatel.esam similarity index 100% rename from radius/dictionary.alcatel.esam rename to resources/protocols/radius/dictionary.alcatel.esam diff --git a/radius/dictionary.alcatel.sr b/resources/protocols/radius/dictionary.alcatel.sr similarity index 100% rename from radius/dictionary.alcatel.sr rename to resources/protocols/radius/dictionary.alcatel.sr diff --git a/radius/dictionary.alteon b/resources/protocols/radius/dictionary.alteon similarity index 100% rename from radius/dictionary.alteon rename to resources/protocols/radius/dictionary.alteon diff --git a/radius/dictionary.altiga b/resources/protocols/radius/dictionary.altiga similarity index 100% rename from radius/dictionary.altiga rename to resources/protocols/radius/dictionary.altiga diff --git a/radius/dictionary.alvarion b/resources/protocols/radius/dictionary.alvarion similarity index 100% rename from radius/dictionary.alvarion rename to resources/protocols/radius/dictionary.alvarion diff --git a/radius/dictionary.alvarion.wimax.v2_2 b/resources/protocols/radius/dictionary.alvarion.wimax.v2_2 similarity index 100% rename from radius/dictionary.alvarion.wimax.v2_2 rename to resources/protocols/radius/dictionary.alvarion.wimax.v2_2 diff --git a/radius/dictionary.apc b/resources/protocols/radius/dictionary.apc similarity index 100% rename from radius/dictionary.apc rename to resources/protocols/radius/dictionary.apc diff --git a/radius/dictionary.aptilo b/resources/protocols/radius/dictionary.aptilo similarity index 100% rename from radius/dictionary.aptilo rename to resources/protocols/radius/dictionary.aptilo diff --git a/radius/dictionary.aptis b/resources/protocols/radius/dictionary.aptis similarity index 100% rename from radius/dictionary.aptis rename to resources/protocols/radius/dictionary.aptis diff --git a/radius/dictionary.arbor b/resources/protocols/radius/dictionary.arbor similarity index 100% rename from radius/dictionary.arbor rename to resources/protocols/radius/dictionary.arbor diff --git a/radius/dictionary.aruba b/resources/protocols/radius/dictionary.aruba similarity index 100% rename from radius/dictionary.aruba rename to resources/protocols/radius/dictionary.aruba diff --git a/radius/dictionary.ascend b/resources/protocols/radius/dictionary.ascend similarity index 100% rename from radius/dictionary.ascend rename to resources/protocols/radius/dictionary.ascend diff --git a/radius/dictionary.asn b/resources/protocols/radius/dictionary.asn similarity index 100% rename from radius/dictionary.asn rename to resources/protocols/radius/dictionary.asn diff --git a/radius/dictionary.audiocodes b/resources/protocols/radius/dictionary.audiocodes similarity index 100% rename from radius/dictionary.audiocodes rename to resources/protocols/radius/dictionary.audiocodes diff --git a/radius/dictionary.avaya b/resources/protocols/radius/dictionary.avaya similarity index 100% rename from radius/dictionary.avaya rename to resources/protocols/radius/dictionary.avaya diff --git a/radius/dictionary.azaire b/resources/protocols/radius/dictionary.azaire similarity index 100% rename from radius/dictionary.azaire rename to resources/protocols/radius/dictionary.azaire diff --git a/radius/dictionary.bay b/resources/protocols/radius/dictionary.bay similarity index 100% rename from radius/dictionary.bay rename to resources/protocols/radius/dictionary.bay diff --git a/radius/dictionary.bintec b/resources/protocols/radius/dictionary.bintec similarity index 100% rename from radius/dictionary.bintec rename to resources/protocols/radius/dictionary.bintec diff --git a/radius/dictionary.bluecoat b/resources/protocols/radius/dictionary.bluecoat similarity index 100% rename from radius/dictionary.bluecoat rename to resources/protocols/radius/dictionary.bluecoat diff --git a/radius/dictionary.bristol b/resources/protocols/radius/dictionary.bristol similarity index 100% rename from radius/dictionary.bristol rename to resources/protocols/radius/dictionary.bristol diff --git a/radius/dictionary.broadsoft b/resources/protocols/radius/dictionary.broadsoft similarity index 100% rename from radius/dictionary.broadsoft rename to resources/protocols/radius/dictionary.broadsoft diff --git a/radius/dictionary.brocade b/resources/protocols/radius/dictionary.brocade similarity index 100% rename from radius/dictionary.brocade rename to resources/protocols/radius/dictionary.brocade diff --git a/radius/dictionary.bskyb b/resources/protocols/radius/dictionary.bskyb similarity index 100% rename from radius/dictionary.bskyb rename to resources/protocols/radius/dictionary.bskyb diff --git a/radius/dictionary.bt b/resources/protocols/radius/dictionary.bt similarity index 100% rename from radius/dictionary.bt rename to resources/protocols/radius/dictionary.bt diff --git a/radius/dictionary.cablelabs b/resources/protocols/radius/dictionary.cablelabs similarity index 100% rename from radius/dictionary.cablelabs rename to resources/protocols/radius/dictionary.cablelabs diff --git a/radius/dictionary.cabletron b/resources/protocols/radius/dictionary.cabletron similarity index 100% rename from radius/dictionary.cabletron rename to resources/protocols/radius/dictionary.cabletron diff --git a/radius/dictionary.camiant b/resources/protocols/radius/dictionary.camiant similarity index 100% rename from radius/dictionary.camiant rename to resources/protocols/radius/dictionary.camiant diff --git a/radius/dictionary.chillispot b/resources/protocols/radius/dictionary.chillispot similarity index 100% rename from radius/dictionary.chillispot rename to resources/protocols/radius/dictionary.chillispot diff --git a/radius/dictionary.cisco b/resources/protocols/radius/dictionary.cisco similarity index 100% rename from radius/dictionary.cisco rename to resources/protocols/radius/dictionary.cisco diff --git a/radius/dictionary.cisco.asa b/resources/protocols/radius/dictionary.cisco.asa similarity index 100% rename from radius/dictionary.cisco.asa rename to resources/protocols/radius/dictionary.cisco.asa diff --git a/radius/dictionary.cisco.bbsm b/resources/protocols/radius/dictionary.cisco.bbsm similarity index 100% rename from radius/dictionary.cisco.bbsm rename to resources/protocols/radius/dictionary.cisco.bbsm diff --git a/radius/dictionary.cisco.vpn3000 b/resources/protocols/radius/dictionary.cisco.vpn3000 similarity index 100% rename from radius/dictionary.cisco.vpn3000 rename to resources/protocols/radius/dictionary.cisco.vpn3000 diff --git a/radius/dictionary.cisco.vpn5000 b/resources/protocols/radius/dictionary.cisco.vpn5000 similarity index 100% rename from radius/dictionary.cisco.vpn5000 rename to resources/protocols/radius/dictionary.cisco.vpn5000 diff --git a/radius/dictionary.citrix b/resources/protocols/radius/dictionary.citrix similarity index 100% rename from radius/dictionary.citrix rename to resources/protocols/radius/dictionary.citrix diff --git a/radius/dictionary.clavister b/resources/protocols/radius/dictionary.clavister similarity index 100% rename from radius/dictionary.clavister rename to resources/protocols/radius/dictionary.clavister diff --git a/radius/dictionary.cnergee b/resources/protocols/radius/dictionary.cnergee similarity index 100% rename from radius/dictionary.cnergee rename to resources/protocols/radius/dictionary.cnergee diff --git a/radius/dictionary.colubris b/resources/protocols/radius/dictionary.colubris similarity index 100% rename from radius/dictionary.colubris rename to resources/protocols/radius/dictionary.colubris diff --git a/radius/dictionary.columbia_university b/resources/protocols/radius/dictionary.columbia_university similarity index 100% rename from radius/dictionary.columbia_university rename to resources/protocols/radius/dictionary.columbia_university diff --git a/radius/dictionary.compat b/resources/protocols/radius/dictionary.compat similarity index 100% rename from radius/dictionary.compat rename to resources/protocols/radius/dictionary.compat diff --git a/radius/dictionary.compatible b/resources/protocols/radius/dictionary.compatible similarity index 100% rename from radius/dictionary.compatible rename to resources/protocols/radius/dictionary.compatible diff --git a/radius/dictionary.cosine b/resources/protocols/radius/dictionary.cosine similarity index 100% rename from radius/dictionary.cosine rename to resources/protocols/radius/dictionary.cosine diff --git a/radius/dictionary.dante b/resources/protocols/radius/dictionary.dante similarity index 100% rename from radius/dictionary.dante rename to resources/protocols/radius/dictionary.dante diff --git a/radius/dictionary.dellemc b/resources/protocols/radius/dictionary.dellemc similarity index 100% rename from radius/dictionary.dellemc rename to resources/protocols/radius/dictionary.dellemc diff --git a/radius/dictionary.dhcp b/resources/protocols/radius/dictionary.dhcp similarity index 100% rename from radius/dictionary.dhcp rename to resources/protocols/radius/dictionary.dhcp diff --git a/radius/dictionary.digium b/resources/protocols/radius/dictionary.digium similarity index 100% rename from radius/dictionary.digium rename to resources/protocols/radius/dictionary.digium diff --git a/radius/dictionary.dlink b/resources/protocols/radius/dictionary.dlink similarity index 100% rename from radius/dictionary.dlink rename to resources/protocols/radius/dictionary.dlink diff --git a/radius/dictionary.dragonwave b/resources/protocols/radius/dictionary.dragonwave similarity index 100% rename from radius/dictionary.dragonwave rename to resources/protocols/radius/dictionary.dragonwave diff --git a/radius/dictionary.efficientip b/resources/protocols/radius/dictionary.efficientip similarity index 100% rename from radius/dictionary.efficientip rename to resources/protocols/radius/dictionary.efficientip diff --git a/radius/dictionary.eltex b/resources/protocols/radius/dictionary.eltex similarity index 100% rename from radius/dictionary.eltex rename to resources/protocols/radius/dictionary.eltex diff --git a/radius/dictionary.enterasys b/resources/protocols/radius/dictionary.enterasys similarity index 100% rename from radius/dictionary.enterasys rename to resources/protocols/radius/dictionary.enterasys diff --git a/radius/dictionary.epygi b/resources/protocols/radius/dictionary.epygi similarity index 100% rename from radius/dictionary.epygi rename to resources/protocols/radius/dictionary.epygi diff --git a/radius/dictionary.equallogic b/resources/protocols/radius/dictionary.equallogic similarity index 100% rename from radius/dictionary.equallogic rename to resources/protocols/radius/dictionary.equallogic diff --git a/radius/dictionary.ericsson b/resources/protocols/radius/dictionary.ericsson similarity index 100% rename from radius/dictionary.ericsson rename to resources/protocols/radius/dictionary.ericsson diff --git a/radius/dictionary.ericsson.ab b/resources/protocols/radius/dictionary.ericsson.ab similarity index 100% rename from radius/dictionary.ericsson.ab rename to resources/protocols/radius/dictionary.ericsson.ab diff --git a/radius/dictionary.ericsson.packet.core.networks b/resources/protocols/radius/dictionary.ericsson.packet.core.networks similarity index 100% rename from radius/dictionary.ericsson.packet.core.networks rename to resources/protocols/radius/dictionary.ericsson.packet.core.networks diff --git a/radius/dictionary.extreme b/resources/protocols/radius/dictionary.extreme similarity index 100% rename from radius/dictionary.extreme rename to resources/protocols/radius/dictionary.extreme diff --git a/radius/dictionary.f5 b/resources/protocols/radius/dictionary.f5 similarity index 100% rename from radius/dictionary.f5 rename to resources/protocols/radius/dictionary.f5 diff --git a/radius/dictionary.fdxtended b/resources/protocols/radius/dictionary.fdxtended similarity index 100% rename from radius/dictionary.fdxtended rename to resources/protocols/radius/dictionary.fdxtended diff --git a/radius/dictionary.fortinet b/resources/protocols/radius/dictionary.fortinet similarity index 100% rename from radius/dictionary.fortinet rename to resources/protocols/radius/dictionary.fortinet diff --git a/radius/dictionary.foundry b/resources/protocols/radius/dictionary.foundry similarity index 100% rename from radius/dictionary.foundry rename to resources/protocols/radius/dictionary.foundry diff --git a/radius/dictionary.freedhcp b/resources/protocols/radius/dictionary.freedhcp similarity index 100% rename from radius/dictionary.freedhcp rename to resources/protocols/radius/dictionary.freedhcp diff --git a/radius/dictionary.freeradius b/resources/protocols/radius/dictionary.freeradius similarity index 100% rename from radius/dictionary.freeradius rename to resources/protocols/radius/dictionary.freeradius diff --git a/radius/dictionary.freeradius.internal b/resources/protocols/radius/dictionary.freeradius.internal similarity index 100% rename from radius/dictionary.freeradius.internal rename to resources/protocols/radius/dictionary.freeradius.internal diff --git a/radius/dictionary.freeswitch b/resources/protocols/radius/dictionary.freeswitch similarity index 100% rename from radius/dictionary.freeswitch rename to resources/protocols/radius/dictionary.freeswitch diff --git a/radius/dictionary.gandalf b/resources/protocols/radius/dictionary.gandalf similarity index 100% rename from radius/dictionary.gandalf rename to resources/protocols/radius/dictionary.gandalf diff --git a/radius/dictionary.garderos b/resources/protocols/radius/dictionary.garderos similarity index 100% rename from radius/dictionary.garderos rename to resources/protocols/radius/dictionary.garderos diff --git a/radius/dictionary.gemtek b/resources/protocols/radius/dictionary.gemtek similarity index 100% rename from radius/dictionary.gemtek rename to resources/protocols/radius/dictionary.gemtek diff --git a/radius/dictionary.h3c b/resources/protocols/radius/dictionary.h3c similarity index 100% rename from radius/dictionary.h3c rename to resources/protocols/radius/dictionary.h3c diff --git a/radius/dictionary.hp b/resources/protocols/radius/dictionary.hp similarity index 100% rename from radius/dictionary.hp rename to resources/protocols/radius/dictionary.hp diff --git a/radius/dictionary.huawei b/resources/protocols/radius/dictionary.huawei similarity index 100% rename from radius/dictionary.huawei rename to resources/protocols/radius/dictionary.huawei diff --git a/radius/dictionary.iana b/resources/protocols/radius/dictionary.iana similarity index 100% rename from radius/dictionary.iana rename to resources/protocols/radius/dictionary.iana diff --git a/radius/dictionary.identity_engines b/resources/protocols/radius/dictionary.identity_engines similarity index 100% rename from radius/dictionary.identity_engines rename to resources/protocols/radius/dictionary.identity_engines diff --git a/radius/dictionary.iea b/resources/protocols/radius/dictionary.iea similarity index 100% rename from radius/dictionary.iea rename to resources/protocols/radius/dictionary.iea diff --git a/radius/dictionary.infoblox b/resources/protocols/radius/dictionary.infoblox similarity index 100% rename from radius/dictionary.infoblox rename to resources/protocols/radius/dictionary.infoblox diff --git a/radius/dictionary.infonet b/resources/protocols/radius/dictionary.infonet similarity index 100% rename from radius/dictionary.infonet rename to resources/protocols/radius/dictionary.infonet diff --git a/radius/dictionary.ipunplugged b/resources/protocols/radius/dictionary.ipunplugged similarity index 100% rename from radius/dictionary.ipunplugged rename to resources/protocols/radius/dictionary.ipunplugged diff --git a/radius/dictionary.issanni b/resources/protocols/radius/dictionary.issanni similarity index 100% rename from radius/dictionary.issanni rename to resources/protocols/radius/dictionary.issanni diff --git a/radius/dictionary.itk b/resources/protocols/radius/dictionary.itk similarity index 100% rename from radius/dictionary.itk rename to resources/protocols/radius/dictionary.itk diff --git a/radius/dictionary.jradius b/resources/protocols/radius/dictionary.jradius similarity index 100% rename from radius/dictionary.jradius rename to resources/protocols/radius/dictionary.jradius diff --git a/radius/dictionary.juniper b/resources/protocols/radius/dictionary.juniper similarity index 100% rename from radius/dictionary.juniper rename to resources/protocols/radius/dictionary.juniper diff --git a/radius/dictionary.karlnet b/resources/protocols/radius/dictionary.karlnet similarity index 100% rename from radius/dictionary.karlnet rename to resources/protocols/radius/dictionary.karlnet diff --git a/radius/dictionary.kineto b/resources/protocols/radius/dictionary.kineto similarity index 100% rename from radius/dictionary.kineto rename to resources/protocols/radius/dictionary.kineto diff --git a/radius/dictionary.lancom b/resources/protocols/radius/dictionary.lancom similarity index 100% rename from radius/dictionary.lancom rename to resources/protocols/radius/dictionary.lancom diff --git a/radius/dictionary.livingston b/resources/protocols/radius/dictionary.livingston similarity index 100% rename from radius/dictionary.livingston rename to resources/protocols/radius/dictionary.livingston diff --git a/radius/dictionary.localweb b/resources/protocols/radius/dictionary.localweb similarity index 100% rename from radius/dictionary.localweb rename to resources/protocols/radius/dictionary.localweb diff --git a/radius/dictionary.lucent b/resources/protocols/radius/dictionary.lucent similarity index 100% rename from radius/dictionary.lucent rename to resources/protocols/radius/dictionary.lucent diff --git a/radius/dictionary.manzara b/resources/protocols/radius/dictionary.manzara similarity index 100% rename from radius/dictionary.manzara rename to resources/protocols/radius/dictionary.manzara diff --git a/radius/dictionary.meinberg b/resources/protocols/radius/dictionary.meinberg similarity index 100% rename from radius/dictionary.meinberg rename to resources/protocols/radius/dictionary.meinberg diff --git a/radius/dictionary.meraki b/resources/protocols/radius/dictionary.meraki similarity index 100% rename from radius/dictionary.meraki rename to resources/protocols/radius/dictionary.meraki diff --git a/radius/dictionary.merit b/resources/protocols/radius/dictionary.merit similarity index 100% rename from radius/dictionary.merit rename to resources/protocols/radius/dictionary.merit diff --git a/radius/dictionary.meru b/resources/protocols/radius/dictionary.meru similarity index 100% rename from radius/dictionary.meru rename to resources/protocols/radius/dictionary.meru diff --git a/radius/dictionary.microsemi b/resources/protocols/radius/dictionary.microsemi similarity index 100% rename from radius/dictionary.microsemi rename to resources/protocols/radius/dictionary.microsemi diff --git a/radius/dictionary.microsoft b/resources/protocols/radius/dictionary.microsoft similarity index 100% rename from radius/dictionary.microsoft rename to resources/protocols/radius/dictionary.microsoft diff --git a/radius/dictionary.mikrotik b/resources/protocols/radius/dictionary.mikrotik similarity index 100% rename from radius/dictionary.mikrotik rename to resources/protocols/radius/dictionary.mikrotik diff --git a/radius/dictionary.motorola b/resources/protocols/radius/dictionary.motorola similarity index 100% rename from radius/dictionary.motorola rename to resources/protocols/radius/dictionary.motorola diff --git a/radius/dictionary.motorola.wimax b/resources/protocols/radius/dictionary.motorola.wimax similarity index 100% rename from radius/dictionary.motorola.wimax rename to resources/protocols/radius/dictionary.motorola.wimax diff --git a/radius/dictionary.navini b/resources/protocols/radius/dictionary.navini similarity index 100% rename from radius/dictionary.navini rename to resources/protocols/radius/dictionary.navini diff --git a/radius/dictionary.netscreen b/resources/protocols/radius/dictionary.netscreen similarity index 100% rename from radius/dictionary.netscreen rename to resources/protocols/radius/dictionary.netscreen diff --git a/radius/dictionary.networkphysics b/resources/protocols/radius/dictionary.networkphysics similarity index 100% rename from radius/dictionary.networkphysics rename to resources/protocols/radius/dictionary.networkphysics diff --git a/radius/dictionary.nexans b/resources/protocols/radius/dictionary.nexans similarity index 100% rename from radius/dictionary.nexans rename to resources/protocols/radius/dictionary.nexans diff --git a/radius/dictionary.nokia b/resources/protocols/radius/dictionary.nokia similarity index 100% rename from radius/dictionary.nokia rename to resources/protocols/radius/dictionary.nokia diff --git a/radius/dictionary.nokia.conflict b/resources/protocols/radius/dictionary.nokia.conflict similarity index 100% rename from radius/dictionary.nokia.conflict rename to resources/protocols/radius/dictionary.nokia.conflict diff --git a/radius/dictionary.nomadix b/resources/protocols/radius/dictionary.nomadix similarity index 100% rename from radius/dictionary.nomadix rename to resources/protocols/radius/dictionary.nomadix diff --git a/radius/dictionary.nortel b/resources/protocols/radius/dictionary.nortel similarity index 100% rename from radius/dictionary.nortel rename to resources/protocols/radius/dictionary.nortel diff --git a/radius/dictionary.ntua b/resources/protocols/radius/dictionary.ntua similarity index 100% rename from radius/dictionary.ntua rename to resources/protocols/radius/dictionary.ntua diff --git a/radius/dictionary.openser b/resources/protocols/radius/dictionary.openser similarity index 100% rename from radius/dictionary.openser rename to resources/protocols/radius/dictionary.openser diff --git a/radius/dictionary.packeteer b/resources/protocols/radius/dictionary.packeteer similarity index 100% rename from radius/dictionary.packeteer rename to resources/protocols/radius/dictionary.packeteer diff --git a/radius/dictionary.paloalto b/resources/protocols/radius/dictionary.paloalto similarity index 100% rename from radius/dictionary.paloalto rename to resources/protocols/radius/dictionary.paloalto diff --git a/radius/dictionary.patton b/resources/protocols/radius/dictionary.patton similarity index 100% rename from radius/dictionary.patton rename to resources/protocols/radius/dictionary.patton diff --git a/radius/dictionary.perle b/resources/protocols/radius/dictionary.perle similarity index 100% rename from radius/dictionary.perle rename to resources/protocols/radius/dictionary.perle diff --git a/radius/dictionary.propel b/resources/protocols/radius/dictionary.propel similarity index 100% rename from radius/dictionary.propel rename to resources/protocols/radius/dictionary.propel diff --git a/radius/dictionary.prosoft b/resources/protocols/radius/dictionary.prosoft similarity index 100% rename from radius/dictionary.prosoft rename to resources/protocols/radius/dictionary.prosoft diff --git a/radius/dictionary.proxim b/resources/protocols/radius/dictionary.proxim similarity index 100% rename from radius/dictionary.proxim rename to resources/protocols/radius/dictionary.proxim diff --git a/radius/dictionary.purewave b/resources/protocols/radius/dictionary.purewave similarity index 100% rename from radius/dictionary.purewave rename to resources/protocols/radius/dictionary.purewave diff --git a/radius/dictionary.quiconnect b/resources/protocols/radius/dictionary.quiconnect similarity index 100% rename from radius/dictionary.quiconnect rename to resources/protocols/radius/dictionary.quiconnect diff --git a/radius/dictionary.quintum b/resources/protocols/radius/dictionary.quintum similarity index 100% rename from radius/dictionary.quintum rename to resources/protocols/radius/dictionary.quintum diff --git a/radius/dictionary.redcreek b/resources/protocols/radius/dictionary.redcreek similarity index 100% rename from radius/dictionary.redcreek rename to resources/protocols/radius/dictionary.redcreek diff --git a/radius/dictionary.rfc2865 b/resources/protocols/radius/dictionary.rfc2865 similarity index 100% rename from radius/dictionary.rfc2865 rename to resources/protocols/radius/dictionary.rfc2865 diff --git a/radius/dictionary.rfc2866 b/resources/protocols/radius/dictionary.rfc2866 similarity index 100% rename from radius/dictionary.rfc2866 rename to resources/protocols/radius/dictionary.rfc2866 diff --git a/radius/dictionary.rfc2867 b/resources/protocols/radius/dictionary.rfc2867 similarity index 100% rename from radius/dictionary.rfc2867 rename to resources/protocols/radius/dictionary.rfc2867 diff --git a/radius/dictionary.rfc2868 b/resources/protocols/radius/dictionary.rfc2868 similarity index 100% rename from radius/dictionary.rfc2868 rename to resources/protocols/radius/dictionary.rfc2868 diff --git a/radius/dictionary.rfc2869 b/resources/protocols/radius/dictionary.rfc2869 similarity index 100% rename from radius/dictionary.rfc2869 rename to resources/protocols/radius/dictionary.rfc2869 diff --git a/radius/dictionary.rfc3162 b/resources/protocols/radius/dictionary.rfc3162 similarity index 100% rename from radius/dictionary.rfc3162 rename to resources/protocols/radius/dictionary.rfc3162 diff --git a/radius/dictionary.rfc3576 b/resources/protocols/radius/dictionary.rfc3576 similarity index 100% rename from radius/dictionary.rfc3576 rename to resources/protocols/radius/dictionary.rfc3576 diff --git a/radius/dictionary.rfc3580 b/resources/protocols/radius/dictionary.rfc3580 similarity index 100% rename from radius/dictionary.rfc3580 rename to resources/protocols/radius/dictionary.rfc3580 diff --git a/radius/dictionary.rfc4072 b/resources/protocols/radius/dictionary.rfc4072 similarity index 100% rename from radius/dictionary.rfc4072 rename to resources/protocols/radius/dictionary.rfc4072 diff --git a/radius/dictionary.rfc4372 b/resources/protocols/radius/dictionary.rfc4372 similarity index 100% rename from radius/dictionary.rfc4372 rename to resources/protocols/radius/dictionary.rfc4372 diff --git a/radius/dictionary.rfc4603 b/resources/protocols/radius/dictionary.rfc4603 similarity index 100% rename from radius/dictionary.rfc4603 rename to resources/protocols/radius/dictionary.rfc4603 diff --git a/radius/dictionary.rfc4675 b/resources/protocols/radius/dictionary.rfc4675 similarity index 100% rename from radius/dictionary.rfc4675 rename to resources/protocols/radius/dictionary.rfc4675 diff --git a/radius/dictionary.rfc4679 b/resources/protocols/radius/dictionary.rfc4679 similarity index 100% rename from radius/dictionary.rfc4679 rename to resources/protocols/radius/dictionary.rfc4679 diff --git a/radius/dictionary.rfc4818 b/resources/protocols/radius/dictionary.rfc4818 similarity index 100% rename from radius/dictionary.rfc4818 rename to resources/protocols/radius/dictionary.rfc4818 diff --git a/radius/dictionary.rfc4849 b/resources/protocols/radius/dictionary.rfc4849 similarity index 100% rename from radius/dictionary.rfc4849 rename to resources/protocols/radius/dictionary.rfc4849 diff --git a/radius/dictionary.rfc5090 b/resources/protocols/radius/dictionary.rfc5090 similarity index 100% rename from radius/dictionary.rfc5090 rename to resources/protocols/radius/dictionary.rfc5090 diff --git a/radius/dictionary.rfc5176 b/resources/protocols/radius/dictionary.rfc5176 similarity index 100% rename from radius/dictionary.rfc5176 rename to resources/protocols/radius/dictionary.rfc5176 diff --git a/radius/dictionary.rfc5447 b/resources/protocols/radius/dictionary.rfc5447 similarity index 100% rename from radius/dictionary.rfc5447 rename to resources/protocols/radius/dictionary.rfc5447 diff --git a/radius/dictionary.rfc5580 b/resources/protocols/radius/dictionary.rfc5580 similarity index 100% rename from radius/dictionary.rfc5580 rename to resources/protocols/radius/dictionary.rfc5580 diff --git a/radius/dictionary.rfc5607 b/resources/protocols/radius/dictionary.rfc5607 similarity index 100% rename from radius/dictionary.rfc5607 rename to resources/protocols/radius/dictionary.rfc5607 diff --git a/radius/dictionary.rfc5904 b/resources/protocols/radius/dictionary.rfc5904 similarity index 100% rename from radius/dictionary.rfc5904 rename to resources/protocols/radius/dictionary.rfc5904 diff --git a/radius/dictionary.rfc6519 b/resources/protocols/radius/dictionary.rfc6519 similarity index 100% rename from radius/dictionary.rfc6519 rename to resources/protocols/radius/dictionary.rfc6519 diff --git a/radius/dictionary.rfc6572 b/resources/protocols/radius/dictionary.rfc6572 similarity index 100% rename from radius/dictionary.rfc6572 rename to resources/protocols/radius/dictionary.rfc6572 diff --git a/radius/dictionary.rfc6677 b/resources/protocols/radius/dictionary.rfc6677 similarity index 100% rename from radius/dictionary.rfc6677 rename to resources/protocols/radius/dictionary.rfc6677 diff --git a/radius/dictionary.rfc6911 b/resources/protocols/radius/dictionary.rfc6911 similarity index 100% rename from radius/dictionary.rfc6911 rename to resources/protocols/radius/dictionary.rfc6911 diff --git a/radius/dictionary.rfc6929 b/resources/protocols/radius/dictionary.rfc6929 similarity index 100% rename from radius/dictionary.rfc6929 rename to resources/protocols/radius/dictionary.rfc6929 diff --git a/radius/dictionary.rfc6930 b/resources/protocols/radius/dictionary.rfc6930 similarity index 100% rename from radius/dictionary.rfc6930 rename to resources/protocols/radius/dictionary.rfc6930 diff --git a/radius/dictionary.rfc7055 b/resources/protocols/radius/dictionary.rfc7055 similarity index 100% rename from radius/dictionary.rfc7055 rename to resources/protocols/radius/dictionary.rfc7055 diff --git a/radius/dictionary.rfc7155 b/resources/protocols/radius/dictionary.rfc7155 similarity index 100% rename from radius/dictionary.rfc7155 rename to resources/protocols/radius/dictionary.rfc7155 diff --git a/radius/dictionary.rfc7268 b/resources/protocols/radius/dictionary.rfc7268 similarity index 100% rename from radius/dictionary.rfc7268 rename to resources/protocols/radius/dictionary.rfc7268 diff --git a/radius/dictionary.rfc7499 b/resources/protocols/radius/dictionary.rfc7499 similarity index 100% rename from radius/dictionary.rfc7499 rename to resources/protocols/radius/dictionary.rfc7499 diff --git a/radius/dictionary.rfc7930 b/resources/protocols/radius/dictionary.rfc7930 similarity index 100% rename from radius/dictionary.rfc7930 rename to resources/protocols/radius/dictionary.rfc7930 diff --git a/radius/dictionary.riverbed b/resources/protocols/radius/dictionary.riverbed similarity index 100% rename from radius/dictionary.riverbed rename to resources/protocols/radius/dictionary.riverbed diff --git a/radius/dictionary.riverstone b/resources/protocols/radius/dictionary.riverstone similarity index 100% rename from radius/dictionary.riverstone rename to resources/protocols/radius/dictionary.riverstone diff --git a/radius/dictionary.roaringpenguin b/resources/protocols/radius/dictionary.roaringpenguin similarity index 100% rename from radius/dictionary.roaringpenguin rename to resources/protocols/radius/dictionary.roaringpenguin diff --git a/radius/dictionary.ruckus b/resources/protocols/radius/dictionary.ruckus similarity index 100% rename from radius/dictionary.ruckus rename to resources/protocols/radius/dictionary.ruckus diff --git a/radius/dictionary.ruggedcom b/resources/protocols/radius/dictionary.ruggedcom similarity index 100% rename from radius/dictionary.ruggedcom rename to resources/protocols/radius/dictionary.ruggedcom diff --git a/radius/dictionary.sangoma b/resources/protocols/radius/dictionary.sangoma similarity index 100% rename from radius/dictionary.sangoma rename to resources/protocols/radius/dictionary.sangoma diff --git a/radius/dictionary.sg b/resources/protocols/radius/dictionary.sg similarity index 100% rename from radius/dictionary.sg rename to resources/protocols/radius/dictionary.sg diff --git a/radius/dictionary.shasta b/resources/protocols/radius/dictionary.shasta similarity index 100% rename from radius/dictionary.shasta rename to resources/protocols/radius/dictionary.shasta diff --git a/radius/dictionary.shiva b/resources/protocols/radius/dictionary.shiva similarity index 100% rename from radius/dictionary.shiva rename to resources/protocols/radius/dictionary.shiva diff --git a/radius/dictionary.siemens b/resources/protocols/radius/dictionary.siemens similarity index 100% rename from radius/dictionary.siemens rename to resources/protocols/radius/dictionary.siemens diff --git a/radius/dictionary.slipstream b/resources/protocols/radius/dictionary.slipstream similarity index 100% rename from radius/dictionary.slipstream rename to resources/protocols/radius/dictionary.slipstream diff --git a/radius/dictionary.sofaware b/resources/protocols/radius/dictionary.sofaware similarity index 100% rename from radius/dictionary.sofaware rename to resources/protocols/radius/dictionary.sofaware diff --git a/radius/dictionary.sonicwall b/resources/protocols/radius/dictionary.sonicwall similarity index 100% rename from radius/dictionary.sonicwall rename to resources/protocols/radius/dictionary.sonicwall diff --git a/radius/dictionary.springtide b/resources/protocols/radius/dictionary.springtide similarity index 100% rename from radius/dictionary.springtide rename to resources/protocols/radius/dictionary.springtide diff --git a/radius/dictionary.starent b/resources/protocols/radius/dictionary.starent similarity index 100% rename from radius/dictionary.starent rename to resources/protocols/radius/dictionary.starent diff --git a/radius/dictionary.starent.vsa1 b/resources/protocols/radius/dictionary.starent.vsa1 similarity index 100% rename from radius/dictionary.starent.vsa1 rename to resources/protocols/radius/dictionary.starent.vsa1 diff --git a/radius/dictionary.surfnet b/resources/protocols/radius/dictionary.surfnet similarity index 100% rename from radius/dictionary.surfnet rename to resources/protocols/radius/dictionary.surfnet diff --git a/radius/dictionary.symbol b/resources/protocols/radius/dictionary.symbol similarity index 100% rename from radius/dictionary.symbol rename to resources/protocols/radius/dictionary.symbol diff --git a/radius/dictionary.t_systems_nova b/resources/protocols/radius/dictionary.t_systems_nova similarity index 100% rename from radius/dictionary.t_systems_nova rename to resources/protocols/radius/dictionary.t_systems_nova diff --git a/radius/dictionary.telebit b/resources/protocols/radius/dictionary.telebit similarity index 100% rename from radius/dictionary.telebit rename to resources/protocols/radius/dictionary.telebit diff --git a/radius/dictionary.telkom b/resources/protocols/radius/dictionary.telkom similarity index 100% rename from radius/dictionary.telkom rename to resources/protocols/radius/dictionary.telkom diff --git a/radius/dictionary.terena b/resources/protocols/radius/dictionary.terena similarity index 100% rename from radius/dictionary.terena rename to resources/protocols/radius/dictionary.terena diff --git a/radius/dictionary.trapeze b/resources/protocols/radius/dictionary.trapeze similarity index 100% rename from radius/dictionary.trapeze rename to resources/protocols/radius/dictionary.trapeze diff --git a/radius/dictionary.travelping b/resources/protocols/radius/dictionary.travelping similarity index 100% rename from radius/dictionary.travelping rename to resources/protocols/radius/dictionary.travelping diff --git a/radius/dictionary.tropos b/resources/protocols/radius/dictionary.tropos similarity index 100% rename from radius/dictionary.tropos rename to resources/protocols/radius/dictionary.tropos diff --git a/radius/dictionary.ukerna b/resources/protocols/radius/dictionary.ukerna similarity index 100% rename from radius/dictionary.ukerna rename to resources/protocols/radius/dictionary.ukerna diff --git a/radius/dictionary.unisphere b/resources/protocols/radius/dictionary.unisphere similarity index 100% rename from radius/dictionary.unisphere rename to resources/protocols/radius/dictionary.unisphere diff --git a/radius/dictionary.unix b/resources/protocols/radius/dictionary.unix similarity index 100% rename from radius/dictionary.unix rename to resources/protocols/radius/dictionary.unix diff --git a/radius/dictionary.usr b/resources/protocols/radius/dictionary.usr similarity index 100% rename from radius/dictionary.usr rename to resources/protocols/radius/dictionary.usr diff --git a/radius/dictionary.utstarcom b/resources/protocols/radius/dictionary.utstarcom similarity index 100% rename from radius/dictionary.utstarcom rename to resources/protocols/radius/dictionary.utstarcom diff --git a/radius/dictionary.valemount b/resources/protocols/radius/dictionary.valemount similarity index 100% rename from radius/dictionary.valemount rename to resources/protocols/radius/dictionary.valemount diff --git a/radius/dictionary.verizon b/resources/protocols/radius/dictionary.verizon similarity index 100% rename from radius/dictionary.verizon rename to resources/protocols/radius/dictionary.verizon diff --git a/radius/dictionary.versanet b/resources/protocols/radius/dictionary.versanet similarity index 100% rename from radius/dictionary.versanet rename to resources/protocols/radius/dictionary.versanet diff --git a/radius/dictionary.vqp b/resources/protocols/radius/dictionary.vqp similarity index 100% rename from radius/dictionary.vqp rename to resources/protocols/radius/dictionary.vqp diff --git a/radius/dictionary.walabi b/resources/protocols/radius/dictionary.walabi similarity index 100% rename from radius/dictionary.walabi rename to resources/protocols/radius/dictionary.walabi diff --git a/radius/dictionary.waverider b/resources/protocols/radius/dictionary.waverider similarity index 100% rename from radius/dictionary.waverider rename to resources/protocols/radius/dictionary.waverider diff --git a/radius/dictionary.wichorus b/resources/protocols/radius/dictionary.wichorus similarity index 100% rename from radius/dictionary.wichorus rename to resources/protocols/radius/dictionary.wichorus diff --git a/radius/dictionary.wimax b/resources/protocols/radius/dictionary.wimax similarity index 100% rename from radius/dictionary.wimax rename to resources/protocols/radius/dictionary.wimax diff --git a/radius/dictionary.wimax.alvarion b/resources/protocols/radius/dictionary.wimax.alvarion similarity index 100% rename from radius/dictionary.wimax.alvarion rename to resources/protocols/radius/dictionary.wimax.alvarion diff --git a/radius/dictionary.wimax.wichorus b/resources/protocols/radius/dictionary.wimax.wichorus similarity index 100% rename from radius/dictionary.wimax.wichorus rename to resources/protocols/radius/dictionary.wimax.wichorus diff --git a/radius/dictionary.wispr b/resources/protocols/radius/dictionary.wispr similarity index 100% rename from radius/dictionary.wispr rename to resources/protocols/radius/dictionary.wispr diff --git a/radius/dictionary.xedia b/resources/protocols/radius/dictionary.xedia similarity index 100% rename from radius/dictionary.xedia rename to resources/protocols/radius/dictionary.xedia diff --git a/radius/dictionary.xylan b/resources/protocols/radius/dictionary.xylan similarity index 100% rename from radius/dictionary.xylan rename to resources/protocols/radius/dictionary.xylan diff --git a/radius/dictionary.yubico b/resources/protocols/radius/dictionary.yubico similarity index 100% rename from radius/dictionary.yubico rename to resources/protocols/radius/dictionary.yubico diff --git a/radius/dictionary.zeus b/resources/protocols/radius/dictionary.zeus similarity index 100% rename from radius/dictionary.zeus rename to resources/protocols/radius/dictionary.zeus diff --git a/radius/dictionary.zte b/resources/protocols/radius/dictionary.zte similarity index 100% rename from radius/dictionary.zte rename to resources/protocols/radius/dictionary.zte diff --git a/radius/dictionary.zyxel b/resources/protocols/radius/dictionary.zyxel similarity index 100% rename from radius/dictionary.zyxel rename to resources/protocols/radius/dictionary.zyxel diff --git a/tpncp/tpncp.dat b/resources/protocols/tpncp/tpncp.dat similarity index 100% rename from tpncp/tpncp.dat rename to resources/protocols/tpncp/tpncp.dat diff --git a/wimaxasncp/dictionary.dtd b/resources/protocols/wimaxasncp/dictionary.dtd similarity index 100% rename from wimaxasncp/dictionary.dtd rename to resources/protocols/wimaxasncp/dictionary.dtd diff --git a/wimaxasncp/dictionary.xml b/resources/protocols/wimaxasncp/dictionary.xml similarity index 100% rename from wimaxasncp/dictionary.xml rename to 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