Fix merge conflict, and enable SOL
A merge conflict caused the SOL websocket code to get removed from
master. This resolves the merge conflict, and reenables SOL in bmcweb.
Tested By: Launched SOL console in phosphor-webui, and observed
appropriate behavior.
Change-Id: I88116fdfb488b6c41aa859e4904b38e918111d04
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 051b1fe..d141841 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -7,6 +7,7 @@
#include <dbus_singleton.hpp>
#include <image_upload.hpp>
#include <memory>
+#include <obmc_console.hpp>
#include <openbmc_dbus_rest.hpp>
#include <persistent_data_middleware.hpp>
#include <redfish.hpp>
@@ -90,6 +91,10 @@
crow::openbmc_mapper::requestRoutes(app);
#endif
+#ifdef BMCWEB_ENABLE_HOST_SERIAL_WEBSOCKET
+ crow::obmc_console::requestRoutes(app);
+#endif
+
crow::token_authorization::requestRoutes(app);
BMCWEB_LOG_INFO << "bmcweb (" << __DATE__ << ": " << __TIME__ << ')';