--- a/src/DIF/RA/NM1FlowTable.cc
+++ b/src/DIF/RA/NM1FlowTable.cc
@@ -1,19 +1,24 @@
+// The MIT License (MIT)
//
-// Copyright Š 2014 - 2015 PRISTINE Consortium (http://ict-pristine.eu)
+// Copyright (c) 2014-2016 Brno University of Technology, PRISTINE project
//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see http://www.gnu.org/licenses/.
-//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
#include "NM1FlowTable.h"
@@ -26,6 +31,7 @@
void NM1FlowTable::handleMessage(cMessage *msg)
{
+
}
void NM1FlowTable::insert(const NM1FlowTableItem* entry)
@@ -52,13 +58,13 @@
return NULL;
}
-NM1FlowTableItem* NM1FlowTable::findFlowByDstApni(std::string addr, unsigned short qosId)
+NM1FlowTableItem* NM1FlowTable::findFlowByDstApni(std::string addr, std::string qosId)
{
for(FlTableIter it = flows.begin(); it != flows.end(); ++it )
{
NM1FlowTableItem a = *it;
if ((a.getFlow()->getDstApni().getApn().getName() == addr) &&
- a.getFlow()->getConId().getQoSId() == qosId)
+ !a.getFlow()->getConId().getQoSId().compare(qosId) )
{
return &(*it);
}
@@ -66,13 +72,13 @@
return NULL;
}
-NM1FlowTableItem* NM1FlowTable::findFlowByDstAddr(std::string addr, unsigned short qosId)
+NM1FlowTableItem* NM1FlowTable::findFlowByDstAddr(std::string addr, std::string qosId)
{
for(FlTableIter it = flows.begin(); it != flows.end(); ++it )
{
NM1FlowTableItem a = *it;
- if ((a.getFlow()->getDstAddr().getApname().getName() == addr) &&
- a.getFlow()->getConId().getQoSId() == qosId)
+ if ((a.getFlow()->getDstAddr().getApn().getName() == addr) &&
+ !a.getFlow()->getConId().getQoSId().compare(qosId) )
{
return &(*it);
}
@@ -95,3 +101,4 @@
}
}
}
+