commit 1c99da037b2242c6fbad3441038081c5703dc1e9
author Snehalatha Venkatesh <snehalathax.v@intel.com> Tue Dec 27 06:45:35 2022 +0000
committer Ed Tanous <ed@tanous.net> Wed Dec 28 19:44:28 2022 +0000
tree b2a8a9f422325f94fe09265bba2232116991b2ed
parent 618c14b4d77bd89c6b2e421bce0576e357b5a33b

Add missing usage of new verb class in router

Despite introduction of a new enum class containing method verbs,
some functions were still using the one from Boost. This had caused
erratic behaviour when trying to create a websocket
(e.g. /nbd/<str>), because enum value of old type was compared to the
one of new type. This change fixes that.

Tested:
Verified that websockets are now created without errors.

Change-Id: I52c874de9b02463618143d3b031f5c795dd42ad8
Signed-off-by: Michal Orzel <michalx.orzel@intel.com>
Signed-off-by: Snehalatha Venkatesh <snehalathax.v@intel.com>

http/routing.hpp

diff --git a/http/routing.hpp b/http/routing.hpp
index ed1b7e4..8d5def6 100644
--- a/http/routing.hpp
+++ b/http/routing.hpp
@@ -1267,11 +1267,11 @@
         }
 
         if ((rules[ruleIndex]->getMethods() &
-             (1U << static_cast<size_t>(req.method()))) == 0)
+             (1U << static_cast<size_t>(*verb))) == 0)
         {
             BMCWEB_LOG_DEBUG << "Rule found but method mismatch: " << req.url
                              << " with " << req.methodString() << "("
-                             << static_cast<uint32_t>(req.method()) << ") / "
+                             << static_cast<uint32_t>(*verb) << ") / "
                              << rules[ruleIndex]->getMethods();
             res.result(boost::beast::http::status::not_found);
             res.end();
@@ -1279,7 +1279,7 @@
         }
 
         BMCWEB_LOG_DEBUG << "Matched rule (upgrade) '" << rules[ruleIndex]->rule
-                         << "' " << static_cast<uint32_t>(req.method()) << " / "
+                         << "' " << static_cast<uint32_t>(*verb) << " / "
                          << rules[ruleIndex]->getMethods();
 
         // any uncaught exceptions become 500s
@@ -1362,7 +1362,7 @@
         RoutingParams params = std::move(foundRoute.route.params);
 
         BMCWEB_LOG_DEBUG << "Matched rule '" << rule.rule << "' "
-                         << static_cast<uint32_t>(req.method()) << " / "
+                         << static_cast<uint32_t>(*verb) << " / "
                          << rule.getMethods();
 
         if (req.session == nullptr)