diff --git a/examples/diameter/results/General-0.vci b/examples/diameter/results/General-0.vci index 307b913ad8cfafd20128da91ab24c38ab2e71b0e..c154e34207b3ada2920df6f79fe206beb809b170 100644 --- a/examples/diameter/results/General-0.vci +++ b/examples/diameter/results/General-0.vci @@ -1,4 +1,4 @@ -file 13724 1347998739 +file 13724 1346233640 version 2 run General-0-20120709-16:16:37-6492 attr configname General diff --git a/src/linklayer/lte/LTERadioModel.h b/src/linklayer/lte/LTERadioModel.h index afa53d08ecd946c7d14adffe116c13f7eb02f029..22f96548e24c1f29f4c3af13781f272d9db5e3a8 100644 --- a/src/linklayer/lte/LTERadioModel.h +++ b/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); diff --git a/src/networklayer/gtp/GTPUtils.cc b/src/networklayer/gtp/GTPUtils.cc index d9708498c84dbc36d893e74277d76b0bb825bee2..b9fc3cf0a6df58577248c27b0ae52df26ac4c944 100644 --- a/src/networklayer/gtp/GTPUtils.cc +++ b/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);