From cd068899311edbb194d3ee79b70770614479a786 Mon Sep 17 00:00:00 2001 From: Daniel Fritzsche Date: Mon, 24 Jul 2017 17:25:24 +0200 Subject: [PATCH] queue_type be public enum --- src/rofl/common/crofconn.h | 20 ++++++++++---------- src/rofl/common/ctimespec.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/rofl/common/crofconn.h b/src/rofl/common/crofconn.h index 75618ebf..e30dbf99 100644 --- a/src/rofl/common/crofconn.h +++ b/src/rofl/common/crofconn.h @@ -118,14 +118,6 @@ class crofconn_env { * @brief A single OpenFlow control connection */ class crofconn : public cthread_env, public crofsock_env { - enum outqueue_type_t { - QUEUE_OAM = 0, // Echo.request/Echo.reply - QUEUE_MGMT = 1, // all remaining packets, except ... - QUEUE_FLOW = 2, // Flow-Mod/Flow-Removed - QUEUE_PKT = 3, // Packet-In/Packet-Out - QUEUE_MAX, // do not use - }; - enum msg_type_t { OFPT_HELLO = 0, OFPT_ERROR = 1, @@ -159,6 +151,14 @@ class crofconn : public cthread_env, public crofsock_env { }; public: + enum outqueue_type_t { + QUEUE_OAM, // Echo.request/Echo.reply + QUEUE_MGMT, // all remaining packets, except ... + QUEUE_FLOW, // Flow-Mod/Flow-Removed + QUEUE_PKT, // Packet-In/Packet-Out + QUEUE_MAX, // do not use + }; + enum crofconn_mode_t { MODE_UNKNOWN = 0, MODE_CONTROLLER = 1, @@ -312,7 +312,7 @@ class crofconn : public cthread_env, public crofsock_env { /** * @brief Returns capacity of reception queues in messages */ - size_t get_rxqueue_max_size(unsigned int queue_id) const { + size_t get_rxqueue_max_size(outqueue_type_t queue_id) const { if (rxqueues.size() <= queue_id) { throw eRofConnInvalid("crofconn::get_rxqueue_max_size() invalid queue_id") .set_func(__FUNCTION__) @@ -325,7 +325,7 @@ class crofconn : public cthread_env, public crofsock_env { /** * @brief Sets capacity of reception queues in messages */ - crofconn &set_rxqueue_max_size(unsigned int queue_id, + crofconn &set_rxqueue_max_size(outqueue_type_t queue_id, size_t rxqueue_max_size) { if (rxqueues.size() <= queue_id) { throw eRofConnInvalid("crofconn::set_rxqueue_max_size() invalid queue_id") diff --git a/src/rofl/common/ctimespec.cpp b/src/rofl/common/ctimespec.cpp index 0920e92c..7fb6907b 100644 --- a/src/rofl/common/ctimespec.cpp +++ b/src/rofl/common/ctimespec.cpp @@ -44,7 +44,7 @@ ctimespec ctimespec::operator-(const ctimespec &t) const { } else if (tspec.tv_sec == t.tspec.tv_sec) { if (tspec.tv_nsec > t.tspec.tv_nsec) { timer.tspec.tv_nsec = tspec.tv_nsec - t.tspec.tv_nsec; - //timer.tspec.tv_sec = tspec.tv_sec - t.tspec.tv_sec = 0 + // timer.tspec.tv_sec = tspec.tv_sec - t.tspec.tv_sec = 0 } }