diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 7d0fb1f3e..ce2bb4573 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -2,6 +2,12 @@ = History +== 10.2.6 +* Changed trial broker on `mqtt.redboltz.net` ws and wss port. #430 + * ws was 10080 but Chrome block it by default. Updated to 80. + * wss was 10443 but Chrome doesn't block it by default. But for consistency, updated to 443. + * system_test still uses 10080 and 10443 to avoid conflict. + == 10.2.5 * Fixed missing server_keep_alive timer operation for CONNACK packet sending. #429 diff --git a/README.md b/README.md index 751ecdfb9..9c15597ac 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ - I/O independent (also known as Sans-I/O) MQTT protocol library for C++17. - Asynchronous MQTT communication library using the MQTT protocol library and Boost.Asio. -Version 10.2.5 [![Actions Status](https://github.com/redboltz/async_mqtt/workflows/CI/badge.svg)](https://github.com/redboltz/async_mqtt/actions)[![codecov](https://codecov.io/gh/redboltz/async_mqtt/branch/main/graph/badge.svg)](https://codecov.io/gh/redboltz/async_mqtt) +Version 10.2.6 [![Actions Status](https://github.com/redboltz/async_mqtt/workflows/CI/badge.svg)](https://github.com/redboltz/async_mqtt/actions)[![codecov](https://codecov.io/gh/redboltz/async_mqtt/branch/main/graph/badge.svg)](https://codecov.io/gh/redboltz/async_mqtt) ## Document diff --git a/doc/modules/ROOT/pages/tool/trial.adoc b/doc/modules/ROOT/pages/tool/trial.adoc index 0ac0c7738..71a0b980b 100644 --- a/doc/modules/ROOT/pages/tool/trial.adoc +++ b/doc/modules/ROOT/pages/tool/trial.adoc @@ -7,8 +7,8 @@ You can connect to the broker `async-mqtt.redboltz.net` for testing. |1883|MQTT on TCP|./client_cli.sh --host async-mqtt.redboltz.net --port 1883 --protocol mqtt |8883|MQTT on TLS|./client_cli.sh --host async-mqtt.redboltz.net --port 8883 --protocol mqtts -|10080|MQTT on Websocket|./client_cli.sh --host async-mqtt.redboltz.net --port 10080 --protocol ws -|10443|MQTT on Websocket(TLS)|./client_cli.sh --host async-mqtt.redboltz.net --port 10443 --protocol wss +|80|MQTT on Websocket|./client_cli.sh --host async-mqtt.redboltz.net --port 80 --protocol ws +|443|MQTT on Websocket(TLS)|./client_cli.sh --host async-mqtt.redboltz.net --port 443 --protocol wss |=== == Important notice diff --git a/docker/README.md b/docker/README.md index 3602276d1..7404fafa7 100644 --- a/docker/README.md +++ b/docker/README.md @@ -89,8 +89,8 @@ Protocol | Host | Container ---|---|--- mqtt|1883|1883 mqtts|8883|8883 -ws|10080|10080 -wss|10443|10443 +ws|80|80 +wss|443|443 The ports on the host need to be usable. You can change the ports of the host by editing `broker.sh`. diff --git a/docker/broker.sh b/docker/broker.sh index f884cb279..375cc1b03 100755 --- a/docker/broker.sh +++ b/docker/broker.sh @@ -7,4 +7,4 @@ then fi echo "tag $TAG is used" docker pull redboltz/async_mqtt:$TAG -docker run -v $PWD/conf:/var/async_mqtt_build/tool/conf -p 1883:1883 -p 8883:8883 -p 10080:10080 -p 10443:10443 -it redboltz/async_mqtt:$TAG ../broker $@ +docker run -v $PWD/conf:/var/async_mqtt_build/tool/conf -p 1883:1883 -p 8883:8883 -p80:80 -p 443:443 -it redboltz/async_mqtt:$TAG ../broker $@ diff --git a/docker/conf/broker.conf b/docker/conf/broker.conf index 0ca9b0cc3..12d4129eb 100644 --- a/docker/conf/broker.conf +++ b/docker/conf/broker.conf @@ -52,8 +52,8 @@ port=8883 # Configuration for Websocket [ws] -port=10080 +port=80 # Configuration for Websocket with TLS [wss] -port=10443 +port=443 diff --git a/tool/broker.conf b/tool/broker.conf index 0ca9b0cc3..12d4129eb 100644 --- a/tool/broker.conf +++ b/tool/broker.conf @@ -52,8 +52,8 @@ port=8883 # Configuration for Websocket [ws] -port=10080 +port=80 # Configuration for Websocket with TLS [wss] -port=10443 +port=443