From 53a2c81affb19f8b03f5434e789b49135e1749cc Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Sat, 17 Jul 2021 17:08:53 +0900
Subject: [PATCH] Added topic_alias_maximum for CONNACK.

---
 include/mqtt/endpoint.hpp | 52 +++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/include/mqtt/endpoint.hpp b/include/mqtt/endpoint.hpp
index e3d8456e0..ee328958e 100644
--- a/include/mqtt/endpoint.hpp
+++ b/include/mqtt/endpoint.hpp
@@ -8858,21 +8858,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             );
             break;
         case protocol_version::v5:
-            if (auto ta_max = get_topic_alias_maximum_from_props(props)) {
-                if (ta_max.value() == 0) {
-                    topic_alias_recv_ = nullopt;
-                }
-                else {
-                    topic_alias_recv_.emplace(ta_max.value());
-                }
-            }
-            else {
-                if (topic_alias_recv_&& topic_alias_recv_.value().max() != 0) {
-                    props.emplace_back(
-                        MQTT_NS::v5::property::topic_alias_maximum(topic_alias_recv_.value().max())
-                    );
-                }
-            }
+            update_topic_alias_maximum_recv(props);
             do_sync_write(
                 v5::connect_message(
                     keep_alive_sec,
@@ -8906,6 +8892,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             );
             break;
         case protocol_version::v5:
+            update_topic_alias_maximum_recv(props);
             do_sync_write(
                 v5::connack_message(
                     session_present,
@@ -9540,21 +9527,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             );
             break;
         case protocol_version::v5:
-            if (auto ta_max = get_topic_alias_maximum_from_props(props)) {
-                if (ta_max.value() == 0) {
-                    topic_alias_recv_ = nullopt;
-                }
-                else {
-                    topic_alias_recv_.emplace(ta_max.value());
-                }
-            }
-            else {
-                if (topic_alias_recv_&& topic_alias_recv_.value().max() != 0) {
-                    props.emplace_back(
-                        MQTT_NS::v5::property::topic_alias_maximum(topic_alias_recv_.value().max())
-                    );
-                }
-            }
+            update_topic_alias_maximum_recv(props);
             do_async_write(
                 v5::connect_message(
                     keep_alive_sec,
@@ -9591,6 +9564,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             );
             break;
         case protocol_version::v5:
+            update_topic_alias_maximum_recv(props);
             do_async_write(
                 v5::connack_message(
                     session_present,
@@ -10277,6 +10251,24 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
         );
     }
 
+    void update_topic_alias_maximum_recv(v5::properties& props) {
+        if (auto ta_max = get_topic_alias_maximum_from_props(props)) {
+            if (ta_max.value() == 0) {
+                topic_alias_recv_ = nullopt;
+            }
+            else {
+                topic_alias_recv_.emplace(ta_max.value());
+            }
+        }
+        else {
+            if (topic_alias_recv_&& topic_alias_recv_.value().max() != 0) {
+                props.emplace_back(
+                    MQTT_NS::v5::property::topic_alias_maximum(topic_alias_recv_.value().max())
+                );
+            }
+        }
+    }
+
     static optional<topic_alias_t> get_topic_alias_maximum_from_prop(v5::property_variant const& prop) {
         optional<topic_alias_t> val;
         MQTT_NS::visit(