fixup! Upgrade connection to websocket and provision new connection

Signed-off-by: Aleksey Mikhaylov <[email protected]>

Author: ttaym

fw/http.c

@@ -5919,6 +5919,42 @@ tfw_http_resp_terminate(TfwHttpMsg *hm)
 	tfw_http_resp_cache(hm);
 }
 
+/**
+ * Does websocket upgrade procedure.
+ *
+ * Marks current server and client connection as websocket connection. Starts
+ * reconnection with backend to restore full backend connection count.
+ *
+ * @return zero on success and negative otherwise
+ */
+static int
+tfw_http_websocket_upgrade(TfwHttpResp *resp)
+{
+	TfwServer *srv = (TfwServer *)resp->conn->peer;
+	TfwSrvConn *srv_conn;
+
+	/* Cannot proceed with upgrade websocket due to error
+	* in creation of new http connection. While it will not be
+	* inherently erroneous to upgrade existing connection, but
+	* we would pay for it with essentially dropping connection with
+	* server. Better just drop upgrade request and reestablish connection.
+	*/
+	if (!(srv_conn = tfw_sock_srv_new_conn(srv))) {
+		tfw_http_conn_error_log(resp->conn,
+					"Can't create new connection for "
+					"websocket upgrade response");
+		return TFW_BLOCK;
+	}
+
+	set_bit(TFW_CONN_B_UNSCHED, &((TfwSrvConn *)resp->conn)->flags);
+
+	tfw_sock_srv_connect_one(srv, srv_conn);
+
+	srv->sg->sched->upd_srv(srv);
+
+	return TFW_PASS;
+}
+
 /**
  * @return zero on success and negative value otherwise.
  * TODO enter the function depending on current GFSM state.
@@ -6111,30 +6147,9 @@ tfw_http_resp_process(TfwConn *conn, TfwStream *stream, struct sk_buff *skb)
 		     && test_bit(TFW_HTTP_B_UPGRADE_WEBSOCKET, hmresp->flags)
 		     && resp->status == 101))
 	{
-		TfwServer *srv = (TfwServer *)resp->conn->peer;
-		TfwSrvConn *srv_conn;
-
-		/* Cannot proceed with upgrade websocket due to error
-		 * in creation of new http connection. While it will not be
-		 * inherently erroneous to upgrade existing connection, but
-		 * we would pay for it with essentially dropping connection with
-		 * server. Better just drop upgrade request and
-		 * reestablish connection.
-		 */
-		if (!(srv_conn = tfw_sock_srv_new_conn(srv))) {
-			tfw_http_conn_error_log(conn, "Can't create new "
-						      "connection for websocket"
-						      " upgrade response");
+		r = tfw_http_websocket_upgrade(resp);
+		if (unlikely(r < TFW_PASS))
 			return TFW_BLOCK;
-		}
-
-		set_bit(TFW_CONN_B_UNSCHED,
-			&((TfwSrvConn *)hmresp->conn)->flags);
-
-		tfw_sock_srv_conn_activate(srv, srv_conn);
-		tfw_sock_srv_connect_try(srv_conn);
-
-		srv->sg->sched->upd_srv(srv);
 	}
 
 	/*

fw/server.h

@@ -345,8 +345,7 @@ int tfw_sched_register(TfwScheduler *sched);
 void tfw_sched_unregister(TfwScheduler *sched);
 
 /* Public sock_srv routings */
-void tfw_sock_srv_connect_try(TfwSrvConn *srv_conn);
-void tfw_sock_srv_conn_activate(TfwServer *srv, TfwSrvConn *srv_conn);
+void tfw_sock_srv_connect_one(TfwServer *srv, TfwSrvConn *srv_conn);
 TfwSrvConn *tfw_sock_srv_new_conn(TfwServer *srv);
 
 #endif /* __SERVER_H__ */

fw/sock_srv.c

@@ -524,15 +524,24 @@ tfw_sock_srv_disconnect(TfwConn *conn)
  * not-yet-established connections in the TfwServer->conn_list.
  */
 
+static inline void
+tfw_sock_srv_conn_activate(TfwServer *srv, TfwSrvConn *srv_conn)
+{
+	set_bit(TFW_CONN_B_ACTIVE, &srv_conn->flags);
+}
+
 /*
  * Get reference to server and mark the connection as active, which means
  * that server must be put during connection release procedure.
+ *
+ * And start connection attempt.
  */
 void
-tfw_sock_srv_conn_activate(TfwServer *srv, TfwSrvConn *srv_conn)
+tfw_sock_srv_connect_one(TfwServer * srv, TfwSrvConn *srv_conn)
 {
 	tfw_server_get(srv);
-	set_bit(TFW_CONN_B_ACTIVE, &srv_conn->flags);
+	tfw_sock_srv_conn_activate(srv, srv_conn);
+	tfw_sock_srv_connect_try_later(srv_conn);
 }
 
 static void
@@ -549,8 +558,7 @@ tfw_sock_srv_connect_srv(TfwServer *srv)
 	 * that parallel execution can't happen with the same socket.
 	 */
 	list_for_each_entry(srv_conn, &srv->conn_list, list) {
-		tfw_sock_srv_conn_activate(srv, srv_conn);
-		tfw_sock_srv_connect_try_later(srv_conn);
+		tfw_sock_srv_connect_one(srv, srv_conn);
 	}
 }
 
@@ -652,8 +660,7 @@ tfw_sock_srv_append_conns_n(TfwServer *srv, size_t conn_n)
 	for (i = 0; i < conn_n; ++i) {
 		if (!(srv_conn = tfw_sock_srv_new_conn(srv)))
 			return -ENOMEM;
-		tfw_sock_srv_conn_activate(srv, srv_conn);
-		tfw_sock_srv_connect_try_later(srv_conn);
+		tfw_sock_srv_connect_one(srv, srv_conn);
 		tfw_srv_loop_sched_rcu();
 	}