ieee80211: move llc ProtocolGroup from LlcProtocolTag.msg to ProtocolGroup.cc, .h

Author: ZoltanBojthe

src/inet/common/ProtocolGroup.cc

@@ -187,6 +187,11 @@ static const ProtocolGroup::Protocols inetPhyProtocols {
     { 1015, &Protocol::ieee802154 },
 };
 
+static const ProtocolGroup::Protocols ieee80211LlcProtocols {
+    { 0, &Protocol::ieee8022llc },
+    { 1, &Protocol::ieee802epd }
+};
+
 ProtocolGroup *ProtocolGroup::getEthertypeProtocolGroup()
 {
     static int handle = cSimulationOrSharedDataManager::registerSharedVariableName("inet::ProtocolGroup::ethertype");
@@ -235,5 +240,11 @@ ProtocolGroup *ProtocolGroup::getUdpProtocolGroup()
     return &getSimulationOrSharedDataManager()->getSharedVariable<ProtocolGroup>(handle, "udp", udpProtocols);
 }
 
+ProtocolGroup *ProtocolGroup::getIeee80211LlcProtocolGroup()
+{
+    static int handle = cSimulationOrSharedDataManager::registerSharedVariableName("inet::ProtocolGroup::ieee80211Llc");
+    return &getSimulationOrSharedDataManager()->getSharedVariable<ProtocolGroup>(handle, "ieee80211Llc", ieee80211LlcProtocols);
+}
+
 } // namespace inet
 

src/inet/common/ProtocolGroup.h

@@ -47,11 +47,11 @@ class INET_API ProtocolGroup
     static ProtocolGroup *getSnapOuiProtocolGroup();
     static ProtocolGroup *getTcpProtocolGroup();
     static ProtocolGroup *getUdpProtocolGroup();
+    static ProtocolGroup *getIeee80211LlcProtocolGroup();
 };
 
 inline std::ostream& operator<<(std::ostream& o, const ProtocolGroup& t) { o << t.str(); return o; }
 
 } // namespace inet
 
 #endif
-

src/inet/linklayer/ieee80211/llc/LlcProtocolTag.msg

@@ -9,18 +9,6 @@ cplusplus {{
 
 namespace inet::ieee80211;
 
-//
-// LLC protocols available in IEEE 802.11
-//
-cplusplus {{
-
-static ProtocolGroup llc("llc", {
-    { 0, &Protocol::ieee8022llc },
-    { 1, &Protocol::ieee802epd }
-});
-
-}}
-
 enum LlcProtocolId
 {
     LPD = 0; // IEEE 802.2 LLC header (with SNAP)
@@ -37,6 +25,6 @@ class LlcProtocolTag extends TagBase
 }
 
 cplusplus(LlcProtocolTag) {{
-    virtual const Protocol *getProtocol() const { return llc.findProtocol(getProtocolId()); }
-    virtual void setProtocol(const Protocol *protocol) { setProtocolId(llc.getProtocolNumber(protocol)); }
+    virtual const Protocol *getProtocol() const { return ProtocolGroup::getIeee80211LlcProtocolGroup()->findProtocol(getProtocolId()); }
+    virtual void setProtocol(const Protocol *protocol) { setProtocolId(ProtocolGroup::getIeee80211LlcProtocolGroup()->getProtocolNumber(protocol)); }
 }}