Tidy up error types:

* Restructure header material * Clean up namespace type injections * Remove extraneous 'success' constants
2017-07-20 08:12:12 -07:00
parent f2a283ed10
commit 6b0b016b21
23 changed files with 260 additions and 292 deletions
@@ -5,20 +5,93 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //

-#ifndef BEAST_WEBSOCKET_IMPL_ERROR_IPP_HPP
-#define BEAST_WEBSOCKET_IMPL_ERROR_IPP_HPP
+#ifndef BEAST_WEBSOCKET_IMPL_ERROR_IPP
+#define BEAST_WEBSOCKET_IMPL_ERROR_IPP

-#include <beast/websocket/detail/error.hpp>
+namespace boost {
+namespace system {
+template<>
+struct is_error_code_enum<beast::websocket::error>
+{
+    static bool const value = true;
+};
+} // system
+} // boost

 namespace beast {
 namespace websocket {
+namespace detail {
+
+class websocket_error_category : public error_category
+{
+public:
+    const char*
+    name() const noexcept override
+    {
+        return "websocket";
+    }
+
+    std::string
+    message(int ev) const override
+    {
+        switch(static_cast<error>(ev))
+        {
+        case error::closed: return "WebSocket connection closed normally";
+        case error::failed: return "WebSocket connection failed due to a protocol violation";
+        case error::handshake_failed: return "WebSocket Upgrade handshake failed";
+        case error::keep_alive: return "WebSocket Upgrade handshake failed but connection is still open";
+
+        case error::response_malformed: return "malformed HTTP response";
+        case error::response_failed: return "upgrade request failed";
+        case error::response_denied: return "upgrade request denied";
+        case error::request_malformed: return "malformed HTTP request";
+        case error::request_invalid: return "upgrade request invalid";
+        case error::request_denied: return "upgrade request denied";
+        default:
+            return "websocket error";
+        }
+    }
+
+    error_condition
+    default_error_condition(int ev) const noexcept override
+    {
+        return error_condition(ev, *this);
+    }
+
+    bool
+    equivalent(int ev,
+        error_condition const& condition
+            ) const noexcept override
+    {
+        return condition.value() == ev &&
+            &condition.category() == this;
+    }
+
+    bool
+    equivalent(error_code const& error, int ev) const noexcept override
+    {
+        return error.value() == ev &&
+            &error.category() == this;
+    }
+};
+
+inline
+error_category const&
+get_error_category()
+{
+    static detail::websocket_error_category const cat{};
+    return cat;
+}
+
+} // detail

 inline
 error_code
 make_error_code(error e)
 {
    return error_code(
-        static_cast<int>(e), detail::get_error_category());
+        static_cast<std::underlying_type<error>::type>(e),
+            detail::get_error_category());
 }

 } // websocket