porting to INET 2.0

examples/diameter/results/General-0.vci

-file 13724 1347998739                                           
+file 13724 1346233640                                           
 version 2
 run General-0-20120709-16:16:37-6492
 attr configname General

src/linklayer/lte/LTERadioModel.h

@@ -41,6 +41,11 @@ class INET_API LTERadioModel : public IRadioModel
 
     virtual bool isReceivedCorrectly(AirFrame *airframe, const SnrList& receivedList);
 
+    // used by the Airtime Link Metric computation
+    virtual bool haveTestFrame() {return false;}
+    virtual double calculateDurationTestFrame(AirFrame *airframe) {return 0;}
+    virtual double getTestFrameError(double snirMin, double bitrate) {return 0;}
+    virtual int getTestFrameSize() {return 0;}
   protected:
     // utility
     virtual bool isPacketOK(double snirMin, int length, double bitrate);

src/networklayer/gtp/GTPUtils.cc

@@ -174,7 +174,7 @@ IPvXAddress GTPUtils::processAddrIE(GTPInfoElem *addr) {
 		p++;
 		unsigned addr = ntohl(*((unsigned*)(p)));
 		p += 4;
-		return IPvXAddress(IPAddress(addr));
+		return IPvXAddress(IPv4Address(addr));
 	} else if ((*p & 0x02)) {	// ipv6 not supported
 
 	}
@@ -195,7 +195,7 @@ TunnelEndpoint *GTPUtils::processFteidIE(GTPInfoElem *fteid) {
 		unsigned addr = ntohl(*((unsigned*)(p)));
 		p += 4;
 		GTPPath *path = new GTPPath();
-		path->setRemoteAddr(IPvXAddress(addr));
+		path->setRemoteAddr(IPvXAddress(IPv4Address(addr)));
 		path->setType(type);
 		TunnelEndpoint *te = new TunnelEndpoint();
 		te->setPath(path);