From 88b3460715a25a52545382adb079ce0a6ddcc88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E5=8D=9A?= <349832309@qq.com>
Date: Wed, 12 Sep 2018 15:17:18 +0800
Subject: [PATCH] Add feature for issue#1809

---
 etc/emqx.conf          | 10 ++++++++++
 priv/emqx.schema       | 13 ++++++++++++-
 src/emqx_listeners.erl | 10 ++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/etc/emqx.conf b/etc/emqx.conf
index deb702211..5d54389dc 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -1207,6 +1207,11 @@ listener.ssl.external.reuseaddr = true
 ## Examples: 8083, 127.0.0.1:8083, ::1:8083
 listener.ws.external = 8083
 
+## Whether the client must include "mqtt" in the list of WebSocket Sub Protocols it offers
+##
+## Value: true | false
+listener.ws.external.standard_mqtt = true
+
 ## The acceptor pool for external MQTT/WebSocket listener.
 ##
 ## Value: Number
@@ -1346,6 +1351,11 @@ listener.ws.external.nodelay = true
 ## Examples: 8084, 127.0.0.1:8084, ::1:8084
 listener.wss.external = 8084
 
+## Whether the client must include "mqtt" in the list of WebSocket Sub Protocols it offers
+##
+## Value: true | false
+listener.wss.external.standard_mqtt = true
+
 ## The acceptor pool for external MQTT/WebSocket/SSL listener.
 ##
 ## Value: Number
diff --git a/priv/emqx.schema b/priv/emqx.schema
index e9f4932c4..8e8979908 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -1094,6 +1094,11 @@ end}.
   {datatype, [integer, ip]}
 ]}.
 
+{mapping, "listener.ws.$name.standard_mqtt", "emqx.listeners", [
+  {default, true},
+  {datatype, {enum, [true, false]}}
+]}.
+
 {mapping, "listener.ws.$name.acceptors", "emqx.listeners", [
   {default, 8},
   {datatype, integer}
@@ -1195,6 +1200,11 @@ end}.
   {datatype, [integer, ip]}
 ]}.
 
+{mapping, "listener.wss.$name.standard_mqtt", "emqx.listeners", [
+  {default, true},
+  {datatype, {enum, [true, false]}}
+]}.
+
 {mapping, "listener.wss.$name.acceptors", "emqx.listeners", [
   {default, 8},
   {datatype, integer}
@@ -1365,7 +1375,8 @@ end}.
                 end,
 
     LisOpts = fun(Prefix) ->
-                  Filter([{acceptors,   cuttlefish:conf_get(Prefix ++ ".acceptors", Conf)},
+                  Filter([{standard_mqtt, cuttlefish:conf_get(Prefix ++ ".standard_mqtt", Conf, undefined)},
+                          {acceptors, cuttlefish:conf_get(Prefix ++ ".acceptors", Conf)},
                           {max_connections, cuttlefish:conf_get(Prefix ++ ".max_connections", Conf)},
                           {max_conn_rate, cuttlefish:conf_get(Prefix ++ ".max_conn_rate", Conf, undefined)},
                           {tune_buffer, cuttlefish:conf_get(Prefix ++ ".tune_buffer", Conf, undefined)},
diff --git a/src/emqx_listeners.erl b/src/emqx_listeners.erl
index 421304f3a..127c62b39 100644
--- a/src/emqx_listeners.erl
+++ b/src/emqx_listeners.erl
@@ -51,12 +51,12 @@ start_listener(Proto, ListenOn, Options) when Proto == ssl; Proto == tls ->
 
 %% Start MQTT/WS listener
 start_listener(Proto, ListenOn, Options) when Proto == http; Proto == ws ->
-    Dispatch = cowboy_router:compile([{'_', [{"/mqtt", emqx_ws_connection, Options}]}]),
+    Dispatch = cowboy_router:compile([{'_', [{subprotocol_name(Options), emqx_ws_connection, Options}]}]),
     start_http_listener(fun cowboy:start_clear/3, 'mqtt:ws', ListenOn, ranch_opts(Options), Dispatch);
 
 %% Start MQTT/WSS listener
 start_listener(Proto, ListenOn, Options) when Proto == https; Proto == wss ->
-    Dispatch = cowboy_router:compile([{'_', [{"/mqtt",  emqx_ws_connection, Options}]}]),
+    Dispatch = cowboy_router:compile([{'_', [{subprotocol_name(Options),  emqx_ws_connection, Options}]}]),
     start_http_listener(fun cowboy:start_tls/3, 'mqtt:wss', ListenOn, ranch_opts(Options), Dispatch).
 
 start_mqtt_listener(Name, ListenOn, Options) ->
@@ -67,6 +67,12 @@ start_mqtt_listener(Name, ListenOn, Options) ->
 start_http_listener(Start, Name, ListenOn, RanchOpts, Dispatch) ->
     Start(Name, with_port(ListenOn, RanchOpts), #{env => #{dispatch => Dispatch}}).
 
+subprotocol_name(Options) ->
+    case proplists:get_value(standard_mqtt, Options, true) of
+        true -> "/mqtt";
+        false -> "/"
+    end.
+
 ranch_opts(Options) ->
     NumAcceptors = proplists:get_value(acceptors, Options, 4),
     MaxConnections = proplists:get_value(max_connections, Options, 1024),