src: compatibility fixes to build and run with inet-4.6.0

Author: rhornig

src/simu5g/apps/vod/VodUdpClient.h

@@ -19,7 +19,6 @@
 #include "simu5g/common/LteDefs.h"
 #include "simu5g/apps/vod/VoDPacket_m.h"
 #include "simu5g/apps/vod/VoDUDPStruct.h"
-#include <inet/transportlayer/contract/udp/UdpControlInfo.h>
 #include <inet/transportlayer/contract/udp/UdpSocket.h>
 #include <inet/networklayer/common/L3AddressResolver.h>
 

src/simu5g/apps/vod/VodUdpServer.h

@@ -14,7 +14,6 @@
 
 #include <fstream>
 
-#include <inet/transportlayer/contract/udp/UdpControlInfo.h>
 #include <inet/transportlayer/contract/udp/UdpSocket.h>
 #include <inet/networklayer/common/L3AddressResolver.h>
 

src/simu5g/mec/vi/VirtualisationInfrastructure.ned

@@ -14,7 +14,8 @@ package simu5g.mec.vi;
 import inet.common.MessageDispatcher;
 import inet.linklayer.contract.IEthernetInterface;
 import inet.linklayer.contract.ILoopbackInterface;
-import inet.linklayer.ethernet.contract.IEthernetLayer;
+import inet.linklayer.ethernet.contract.IEthernetLayer; // for inet-4.5
+import inet.linklayer.contract.IEthernetLayer; // for inet-4.6
 import inet.linklayer.ppp.PppInterface;
 import inet.networklayer.common.InterfaceTable;
 import inet.networklayer.contract.INetworkLayer;

src/simu5g/nodes/LteUe.ned

@@ -16,7 +16,8 @@ import inet.applications.contract.IApp;
 import inet.common.MessageDispatcher;
 import simu5g.stack.ICellularNic;
 import inet.common.packet.recorder.PcapRecorder;
-import inet.linklayer.ethernet.contract.IEthernetLayer;
+import inet.linklayer.contract.IEthernetLayer; // for inet-4.6
+import inet.linklayer.ethernet.contract.IEthernetLayer; // for inet-4.5
 import inet.linklayer.contract.IEthernetInterface;
 import inet.linklayer.contract.ILoopbackInterface;
 import inet.mobility.contract.IMobility;

src/simu5g/stack/mac/packet/LteMacPdu.msg

@@ -144,7 +144,8 @@ cplusplus(LteMacPdu::copy) {{
         Packet *p1 = sdu[idx];
         Packet *p2 = other.sdu[idx];
         if (p1->getControlInfo() == nullptr && p2->getControlInfo() != nullptr) {
-            p1->setControlInfo(p2->getControlInfo()->dup());
+            // FIXME: this never worked. implement proper duplication
+            // p1->setControlInfo(p2->getControlInfo()->dup());
         }
     }
 }}