Persist sorry server connection.

[ultramonkey-l7/ultramonkey-l7-v2.git] / src / sched.c

diff --git a/src/sched.c b/src/sched.c
index 671c63b..d11d741 100644 (file)
--- a/src/sched.c
+++ b/src/sched.c
@@ -454,14 +454,13 @@ sorry_check_out:
 }
 
 /*!
- * Get sorry-server destination or old real-server destination.
+ * Get sorry-server destination
  * @param[in]  *srv            service pointer
  * @param[in]  *conn           connection pointer
- * @param[in]  reverse         specification which get sorry-server or old real-server
  * @return     l7vs_dest*      sorry-server or old real-server destination
  */
 struct l7vs_dest *
-l7vs_sched_sorry_dest(struct l7vs_service *srv, struct l7vs_conn *conn, int reverse)
+l7vs_sched_sorry_dest(struct l7vs_service *srv, struct l7vs_conn *conn)
 {
        struct l7vs_dest* dest = NULL;
 
@@ -473,33 +472,18 @@ l7vs_sched_sorry_dest(struct l7vs_service *srv, struct l7vs_conn *conn, int reve
                l7vs_conn_c_str(conn_str, conn);
                LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SCHEDULE,21,
                    "in_function: struct l7vs_dest* l7vs_sched_sorry_dest(struct l7vs_service* srv, "
-                   "struct l7vs_conn* conn, int reverse): srv=&(%s), conn=&(%s), reverse=%d",
-                   srv_str, conn_str, reverse);
+                   "struct l7vs_conn* conn, int reverse): srv=&(%s), conn=&(%s)",
+                   srv_str, conn_str);
        }
        /*------ DEBUG LOG END ------*/
 
        // argument check
-       if (reverse != 0 && reverse != 1) {
-               LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SCHEDULE,13,"Invalid reverse value");
+       if (!srv) {
+               LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SCHEDULE,14,"Argument srv is NULL pointer");
                goto sorry_dest_out;
        }
-       if (!reverse) {
-               // argument check
-               if (!srv) {
-                       LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SCHEDULE,14,"Argument srv is NULL pointer");
-                       goto sorry_dest_out;
-               }
-               // return sorry-server destination
-               dest = srv->sorry_dest;
-       } else {
-               // argument check
-               if (!conn) {
-                       LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SCHEDULE,15,"Argument srv is NULL pointer");
-                       goto sorry_dest_out;
-               }
-               // return old real-server destination
-               dest = conn->old_dest;
-       }
+       // return sorry-server destination
+       dest = srv->sorry_dest;
 
 sorry_dest_out:
 
@@ -515,7 +499,7 @@ sorry_dest_out:
                l7vs_dest_c_str(dest_str, dest);
                LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SCHEDULE,22,
                    "out_function: struct l7vs_dest* l7vs_sched_sorry_dest(struct l7vs_service* srv, "
-                   "struct l7vs_conn* conn, int reverse): return_value=&(%s)", dest_str);
+                   "struct l7vs_conn* conn): return_value=&(%s)", dest_str);
        }
        /*------ DEBUG LOG END ------*/