Merge pull request #94 from DFritzsche/fix_occurred_functions

Fix occurred functions

src/rofl/common/crofbase.cc

@@ -518,7 +518,7 @@ void crofbase::handle_negotiation_failed(crofctl &ctl, crofconn &conn) {
   handle_conn_negotiation_failed(ctl, conn.get_auxid());
 }
 
-void crofbase::congestion_occured_indication(crofctl &ctl, crofconn &conn) {
+void crofbase::congestion_occurred_indication(crofctl &ctl, crofconn &conn) {
   VLOG(2) << __FUNCTION__ << " connection negotiation failed: ctlid="
           << ctl.get_ctlid().str().c_str()
           << ", auxid=" << conn.get_auxid().str().c_str()
@@ -594,7 +594,7 @@ void crofbase::handle_negotiation_failed(crofdpt &dpt, crofconn &conn) {
   handle_conn_negotiation_failed(dpt, conn.get_auxid());
 }
 
-void crofbase::congestion_occured_indication(crofdpt &dpt, crofconn &conn) {
+void crofbase::congestion_occurred_indication(crofdpt &dpt, crofconn &conn) {
   VLOG(2) << __FUNCTION__
           << " connection congestion occurred: dptid=" << dpt.get_dptid()
           << ", auxid=" << conn.get_auxid().str().c_str()

src/rofl/common/crofbase.h

@@ -2180,7 +2180,7 @@ class crofbase : public virtual rofl::cthread_env,
 
   virtual void handle_negotiation_failed(crofdpt &dpt, crofconn &conn);
 
-  virtual void congestion_occured_indication(crofdpt &dpt, crofconn &conn);
+  virtual void congestion_occurred_indication(crofdpt &dpt, crofconn &conn);
 
   virtual void congestion_solved_indication(crofdpt &dpt, crofconn &conn);
 
@@ -2202,7 +2202,7 @@ class crofbase : public virtual rofl::cthread_env,
 
   virtual void handle_negotiation_failed(crofctl &ctl, crofconn &conn);
 
-  virtual void congestion_occured_indication(crofctl &ctl, crofconn &conn);
+  virtual void congestion_occurred_indication(crofctl &ctl, crofconn &conn);
 
   virtual void congestion_solved_indication(crofctl &ctl, crofconn &conn);
 
@@ -2223,7 +2223,7 @@ class crofbase : public virtual rofl::cthread_env,
     delete msg;
   };
 
-  virtual void congestion_occured_indication(crofconn &conn){};
+  virtual void congestion_occurred_indication(crofconn &conn){};
 
   virtual void congestion_solved_indication(crofconn &conn){};
 

src/rofl/common/crofchan.h

@@ -109,8 +109,8 @@ class crofchan_env {
   virtual void handle_recv(crofchan &chan, crofconn &conn,
                            rofl::openflow::cofmsg *msg) = 0;
 
-  virtual void congestion_occured_indication(crofchan &chan,
-                                             crofconn &conn) = 0;
+  virtual void congestion_occurred_indication(crofchan &chan,
+                                              crofconn &conn) = 0;
 
   virtual void congestion_solved_indication(crofchan &chan, crofconn &conn) = 0;
 
@@ -527,8 +527,8 @@ class crofchan : public cthread_env, public rofl::crofconn_env {
     crofchan_env::call_env(env).handle_recv(*this, conn, msg);
   };
 
-  virtual void congestion_occured_indication(crofconn &conn) {
-    crofchan_env::call_env(env).congestion_occured_indication(*this, conn);
+  virtual void congestion_occurred_indication(crofconn &conn) {
+    crofchan_env::call_env(env).congestion_occurred_indication(*this, conn);
   };
 
   virtual void congestion_solved_indication(crofconn &conn) {

src/rofl/common/crofconn.cc

@@ -829,10 +829,10 @@ void crofconn::congestion_solved_indication(crofsock &rofsock) {
   crofconn_env::call_env(env).congestion_solved_indication(*this);
 };
 
-void crofconn::congestion_occured_indication(crofsock &rofsock) {
+void crofconn::congestion_occurred_indication(crofsock &rofsock) {
   VLOG(2) << __FUNCTION__ << " congestion occurred indication; action: message "
                              "transmission blocked";
-  crofconn_env::call_env(env).congestion_occured_indication(*this);
+  crofconn_env::call_env(env).congestion_occurred_indication(*this);
 };
 
 void crofconn::handle_recv(crofsock &socket, rofl::openflow::cofmsg *msg) {

src/rofl/common/crofconn.h

@@ -100,7 +100,7 @@ class crofconn_env {
 
   virtual void handle_recv(crofconn &conn, rofl::openflow::cofmsg *msg) = 0;
 
-  virtual void congestion_occured_indication(crofconn &conn) = 0;
+  virtual void congestion_occurred_indication(crofconn &conn) = 0;
 
   virtual void congestion_solved_indication(crofconn &conn) = 0;
 
@@ -694,7 +694,7 @@ class crofconn : public cthread_env, public crofsock_env {
 
   virtual void handle_recv(crofsock &socket, rofl::openflow::cofmsg *msg);
 
-  virtual void congestion_occured_indication(crofsock &socket);
+  virtual void congestion_occurred_indication(crofsock &socket);
 
   virtual void congestion_solved_indication(crofsock &rofsock);
 

src/rofl/common/crofctl.h

@@ -216,7 +216,7 @@ class crofctl_env {
    * @param ctl controller instance
    * @param conn control connection instance
    */
-  virtual void congestion_occured_indication(crofctl &ctl, crofconn &conn){};
+  virtual void congestion_occurred_indication(crofctl &ctl, crofconn &conn){};
 
   /**
    * @brief	Called when a congestion situation on the control connection has
@@ -1283,8 +1283,8 @@ class crofctl : public rofl::crofchan_env {
     crofctl_env::call_env(env).handle_negotiation_failed(*this, conn);
   };
 
-  virtual void congestion_occured_indication(crofchan &chan, crofconn &conn) {
-    crofctl_env::call_env(env).congestion_occured_indication(*this, conn);
+  virtual void congestion_occurred_indication(crofchan &chan, crofconn &conn) {
+    crofctl_env::call_env(env).congestion_occurred_indication(*this, conn);
   };
 
   virtual void congestion_solved_indication(crofchan &chan, crofconn &conn) {

src/rofl/common/crofdpt.h

@@ -217,7 +217,7 @@ class crofdpt_env {
    * @param dpt datapath instance
    * @param conn control connection instance
    */
-  virtual void congestion_occured_indication(crofdpt &dpt, crofconn &conn){};
+  virtual void congestion_occurred_indication(crofdpt &dpt, crofconn &conn){};
 
   /**
    * @brief	Called when a congestion situation on the control connection has
@@ -1704,8 +1704,8 @@ class crofdpt : public rofl::crofchan_env {
     crofdpt_env::call_env(env).handle_negotiation_failed(*this, conn);
   };
 
-  virtual void congestion_occured_indication(crofchan &chan, crofconn &conn) {
-    crofdpt_env::call_env(env).congestion_occured_indication(*this, conn);
+  virtual void congestion_occurred_indication(crofchan &chan, crofconn &conn) {
+    crofdpt_env::call_env(env).congestion_occurred_indication(*this, conn);
   };
 
   virtual void congestion_solved_indication(crofchan &chan, crofconn &conn) {

src/rofl/common/crofsock.cc

@@ -1517,7 +1517,7 @@ void crofsock::send_from_queue() {
                       << txqueue_size_tx_threshold << " laddr=" << laddr.str()
                       << " raddr=" << raddr.str();
 
-              crofsock_env::call_env(env).congestion_occured_indication(*this);
+              crofsock_env::call_env(env).congestion_occurred_indication(*this);
             }
           }
             return;

src/rofl/common/crofsock.h

@@ -205,7 +205,7 @@ class crofsock_env {
 
   virtual void handle_recv(crofsock &socket, rofl::openflow::cofmsg *msg) = 0;
 
-  virtual void congestion_occured_indication(crofsock &socket) = 0;
+  virtual void congestion_occurred_indication(crofsock &socket) = 0;
 
   virtual void congestion_solved_indication(crofsock &socket) = 0;
 

test/rofl/common/crofchan/crofchantest.cpp

@@ -466,8 +466,8 @@ void crofchantest::congestion_solved_indication(rofl::crofchan &chan,
   }
 }
 
-void crofchantest::congestion_occured_indication(rofl::crofchan &chan,
-                                                 rofl::crofconn &conn) {
+void crofchantest::congestion_occurred_indication(rofl::crofchan &chan,
+                                                  rofl::crofconn &conn) {
   congested = true;
   std::cerr << "crofchan::congestion_occurred_indication: ";
   std::cerr << "num_of_pkts_sent=" << num_of_pkts_sent

test/rofl/common/crofchan/crofchantest.hpp

@@ -143,8 +143,8 @@ class crofchantest : public CppUnit::TestFixture,
     std::cerr << "crofchan::release_sync_xid" << std::endl;
   };
 
-  virtual void congestion_occured_indication(rofl::crofchan &chan,
-                                             rofl::crofconn &conn);
+  virtual void congestion_occurred_indication(rofl::crofchan &chan,
+                                              rofl::crofconn &conn);
 
   virtual void handle_transaction_timeout(rofl::crofchan &chan,
                                           rofl::crofconn &conn, uint32_t xid,
@@ -185,7 +185,7 @@ class crofchantest : public CppUnit::TestFixture,
     std::cerr << "crofconn::handle_recv" << std::endl;
   };
 
-  virtual void congestion_occured_indication(rofl::crofconn &conn) {
+  virtual void congestion_occurred_indication(rofl::crofconn &conn) {
     std::cerr << "crofconn::congestion_occurred_indication" << std::endl;
   };
 
@@ -254,7 +254,7 @@ class crofchantest : public CppUnit::TestFixture,
     std::cerr << "crofsock::handle_recv" << std::endl;
   };
 
-  virtual void congestion_occured_indication(rofl::crofsock &socket) {
+  virtual void congestion_occurred_indication(rofl::crofsock &socket) {
     std::cerr << "crofsock::congestion_occurred_indication" << std::endl;
   };
 };

test/rofl/common/crofconn/crofconntest.cpp

@@ -183,7 +183,7 @@ void crofconntest::congestion_solved_indication(rofl::crofconn &conn) {
   std::cerr << "crofconntest::handle_send()" << std::endl << conn;
 }
 
-void crofconntest::congestion_occured_indication(rofl::crofconn &conn) {
+void crofconntest::congestion_occurred_indication(rofl::crofconn &conn) {
   std::cerr << "crofconntest::congestion_indication()" << std::endl << conn;
 }
 

test/rofl/common/crofconn/crofconntest.hpp

@@ -59,7 +59,7 @@ class crofconntest : public CppUnit::TestFixture,
   virtual void handle_recv(rofl::crofsock &socket,
                            rofl::openflow::cofmsg *msg){};
 
-  virtual void congestion_occured_indication(rofl::crofsock &socket){};
+  virtual void congestion_occurred_indication(rofl::crofsock &socket){};
 
 private:
   virtual void handle_established(rofl::crofconn &conn, uint8_t ofp_version);
@@ -78,7 +78,7 @@ class crofconntest : public CppUnit::TestFixture,
 
   virtual void handle_recv(rofl::crofconn &conn, rofl::openflow::cofmsg *msg);
 
-  virtual void congestion_occured_indication(rofl::crofconn &conn);
+  virtual void congestion_occurred_indication(rofl::crofconn &conn);
 
   virtual void handle_transaction_timeout(rofl::crofconn &conn, uint32_t xid,
                                           uint8_t type,

test/rofl/common/crofsock/crofsocktest.cpp

@@ -240,7 +240,7 @@ void crofsocktest::congestion_solved_indication(rofl::crofsock &socket) {
   std::cerr << "handle send" << std::endl;
 }
 
-void crofsocktest::congestion_occured_indication(rofl::crofsock &socket) {
+void crofsocktest::congestion_occurred_indication(rofl::crofsock &socket) {
   std::cerr << "congestion indication" << std::endl;
 }
 

test/rofl/common/crofsock/crofsocktest.hpp

@@ -58,7 +58,7 @@ class crofsocktest : public CppUnit::TestFixture, public rofl::crofsock_env {
 
   virtual void handle_recv(rofl::crofsock &socket, rofl::openflow::cofmsg *msg);
 
-  virtual void congestion_occured_indication(rofl::crofsock &socket);
+  virtual void congestion_occurred_indication(rofl::crofsock &socket);
 
 private:
   enum crofsock_test_mode_t {