--- a/src/Common/ConnectionId.cc
+++ b/src/Common/ConnectionId.cc
@@ -1,28 +1,33 @@
+// The MIT License (MIT)
//
-// Copyright Š 2014 PRISTINE Consortium (http://ict-pristine.eu)
-//
-// 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/.
-//
+// Copyright (c) 2014-2016 Brno University of Technology, PRISTINE project
+//
+// 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 "ConnectionId.h"
//Consts
-const unsigned short VAL_RESERVEDQOSID = 0;
const int VAL_UNDEF_CEPID = -1;
+const int VAL_MGMT_CEPID = 0;
ConnectionId::ConnectionId() :
- qosId(VAL_RESERVEDQOSID), srcCEPId(VAL_UNDEF_CEPID), dstCEPId(VAL_UNDEF_CEPID)
+ qosId(VAL_UNDEF_QOSID), srcCEPId(VAL_UNDEF_CEPID), dstCEPId(VAL_UNDEF_CEPID)
{
}
@@ -36,12 +41,12 @@
dstCEPId = destCepId;
}
-unsigned short ConnectionId::getQoSId() const
+std::string ConnectionId::getQoSId() const
{
return qosId;
}
-void ConnectionId::setQoSId(unsigned short qoSId)
+void ConnectionId::setQoSId(std::string qoSId)
{
this->qosId = qoSId;
}
@@ -58,7 +63,7 @@
ConnectionId::~ConnectionId()
{
- qosId = 0;
+ qosId = VAL_UNDEF_QOSID;
srcCEPId = 0;
dstCEPId = 0;
}
@@ -100,3 +105,17 @@
dstCEPId = tmp;
return *this;
}
+
+std::string ConnectionId::info() const
+{
+ std::ostringstream os;
+
+ os << srcCEPId << ":" << dstCEPId << ":" << qosId;
+ return os.str();
+}
+
+std::ostream& operator <<(std::ostream& os, const ConnectionId& connId)
+{
+ return os << connId.info();
+}
+