--- a/src/Common/ConnectionId.h
+++ b/src/Common/ConnectionId.h
@@ -1,19 +1,24 @@
+// 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.
#ifndef CONNECTIONID_H_
#define CONNECTIONID_H_
@@ -26,8 +31,8 @@
#include "QoSCube.h"
//Consts
-extern const unsigned short VAL_RESERVEDQOSID;
extern const int VAL_UNDEF_CEPID;
+extern const int VAL_MGMT_CEPID;
/**
* @brief Connection identifier as defined in specifications
@@ -63,13 +68,13 @@
* @brief Getter of selected QoS-cube identifier
* @return Returns QoS-cube identifier
*/
- unsigned short getQoSId() const;
+ std::string getQoSId() const;
/**
* @brief Setter of selected QoS-cube identifier
* @param qoSId A new QoS-cube id value
*/
- void setQoSId(unsigned short qoSId);
+ void setQoSId(std::string qoSId);
/**
* @brief Getter of source Connection-Endpoint identifier
@@ -111,11 +116,18 @@
*/
ConnectionId& swapCepIds();
+
+ /**
+ * @brief Info text outpu suitable for << strinng streams and WATCH
+ * @return
+ */
+ std::string info() const;
+
protected:
/**
* @brief QoS-cube identifier
*/
- unsigned short qosId;
+ std::string qosId;
/**
* @brief Source Connection-Endpoint identifier
@@ -129,4 +141,7 @@
};
+
+std::ostream& operator<< (std::ostream& os, const ConnectionId& connId);
+
#endif /* CONNECTIONID_H_ */