LlcProtocolTag: rename protocolId to protocolNumber

ZoltanBojthe · ZoltanBojthe · commit 8ec88877c90c · 2025-10-01T11:01:27.000+02:00
diff --git a/src/inet/linklayer/ieee80211/llc/LlcProtocolTag.msg b/src/inet/linklayer/ieee80211/llc/LlcProtocolTag.msg
@@ -21,10 +21,10 @@ enum LlcProtocolId
 //
 class LlcProtocolTag extends TagBase
 {
-    int protocolId @enum(LlcProtocolId);
+    int protocolNumber @enum(LlcProtocolId);
 }
 
 cplusplus(LlcProtocolTag) {{
-    virtual const Protocol *getProtocol() const { return ProtocolGroup::getIeee80211LlcProtocolGroup()->findProtocol(getProtocolId()); }
-    virtual void setProtocol(const Protocol *protocol) { setProtocolId(ProtocolGroup::getIeee80211LlcProtocolGroup()->getProtocolNumber(protocol)); }
+    virtual const Protocol *getProtocol() const { return ProtocolGroup::getIeee80211LlcProtocolGroup()->findProtocol(getProtocolNumber()); }
+    virtual void setProtocol(const Protocol *protocol) { setProtocolNumber(ProtocolGroup::getIeee80211LlcProtocolGroup()->getProtocolNumber(protocol)); }
 }}

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ enum LlcProtocolId`
`21`	`21`	`//`
`22`	`22`	`class LlcProtocolTag extends TagBase`
`23`	`23`	`{`
`24`		`- int protocolId @enum(LlcProtocolId);`
	`24`	`+ int protocolNumber @enum(LlcProtocolId);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`cplusplus(LlcProtocolTag) {{`
`28`		`- virtual const Protocol *getProtocol() const { return ProtocolGroup::getIeee80211LlcProtocolGroup()->findProtocol(getProtocolId()); }`
`29`		`- virtual void setProtocol(const Protocol *protocol) { setProtocolId(ProtocolGroup::getIeee80211LlcProtocolGroup()->getProtocolNumber(protocol)); }`
	`28`	`+ virtual const Protocol *getProtocol() const { return ProtocolGroup::getIeee80211LlcProtocolGroup()->findProtocol(getProtocolNumber()); }`
	`29`	`+ virtual void setProtocol(const Protocol *protocol) { setProtocolNumber(ProtocolGroup::getIeee80211LlcProtocolGroup()->getProtocolNumber(protocol)); }`
`30`	`30`	`}}`