Ipv4Header, Ipv6Header: added custom dscp and ecn calculated fields for readability

Author: ZoltanBojthe

src/inet/networklayer/ipv4/Ipv4Header.msg

@@ -173,10 +173,10 @@ class Ipv4Header extends NetworkHeaderBase
 
     short version = 4;      // @bit(4)
     B headerLength = IPv4_MIN_HEADER_LENGTH;         // @bit(4), bytes, must be multiple of 4
-    short typeOfService;    // @bit(8)
-    // OMNeT++ 6.0:
-    // short __dscp @custom @getter(getDscp) @setter(setDscp);  // @bit(6), maps to bits 0-5 of ToS, stored in typeOfService
-    // short __ecn @custom @getter(getEcn) @setter(setEcn);  // @bit(2),  maps to bits 6-7 of ToS, stored in typeOfService
+    short typeOfService @bit(8);
+
+    short dscp @custom @getter(getDscp) @setter(setDscp) @bit(6);  // maps to bits 0-5 of typeOfService
+    short ecn @custom @getter(getEcn) @setter(setEcn) @bit(2);  // maps to bits 6-7 of typeOfService
 
     B totalLengthField;    // @byte(2)
 

src/inet/networklayer/ipv6/Ipv6Header.msg

@@ -34,10 +34,10 @@ class Ipv6Header extends NetworkHeaderBase
     Ipv6Address srcAddress;
     Ipv6Address destAddress;
     B payloadLength = B(-1);    // The size of the payload in octets, including any extension headers. The length is set to zero when a Hop-by-Hop extension header carries a Jumbo Payload option.
-    short trafficClass;    // @bits(8) Traffic Class
-    // OMNeT++ 6.0:
-    // short __dscp @custom @getter(getDscp) @setter(setDscp);  // @bit(6), maps to bits 0-5 of trafficClass
-    // short __ecn @custom @getter(getEcn) @setter(setEcn);  // @bit(2),  maps to bits 6-7 of trafficClass
+    short trafficClass @bit(8);  // Traffic Class
+
+    short dscp @custom @getter(getDscp) @setter(setDscp) @bit(6);  // maps to bits 0-5 of trafficClass
+    short ecn @custom @getter(getEcn) @setter(setEcn) @bit(2);  //  maps to bits 6-7 of trafficClass
 
     unsigned int flowLabel;
     short hopLimit = 0;