Revert "MQTT 5 publish topic alias support" (#14145)
Revert "MQTT 5 publish topic alias support (#14067)" This reverts commit a749ab00a63b229d99f6bc82a965206e5481db3e.
Emmanuel Vasilakis committed
Dec 14, 2022 at 18:41 UTC
14474803db200ce3c2321c8b3de1ac04625b2d39
5 files changed
+3
-32
Makefile.am
+2
-5
@@ -733,12 +733,9 @@ libmqttwebsockets_a_SOURCES = \
733
mqtt_websockets/c-rbuf/include/ringbuffer.h \
734
mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \
735
mqtt_websockets/MQTT-C/src/mqtt.c \
736
- mqtt_websockets/MQTT-C/include/mqtt.h \
737
- mqtt_websockets/c_rhash/src/c_rhash.c \
738
- mqtt_websockets/c_rhash/include/c_rhash.h \
739
- mqtt_websockets/c_rhash/src/c_rhash_internal.h
736
+ mqtt_websockets/MQTT-C/include/mqtt.h
737
741
-libmqttwebsockets_a_CFLAGS = $(CFLAGS) -DMQTT_WSS_CUSTOM_ALLOC -DRBUF_CUSTOM_MALLOC -I$(srcdir)/aclk/helpers -I$(srcdir)/mqtt_websockets/c_rhash/include
738
+libmqttwebsockets_a_CFLAGS = $(CFLAGS) -DMQTT_WSS_CUSTOM_ALLOC -DRBUF_CUSTOM_MALLOC -I$(srcdir)/aclk/helpers
739
740
if MQTT_WSS_DEBUG
741
libmqttwebsockets_a_CFLAGS += -DMQTT_WSS_DEBUG
aclk/aclk.c
-4
@@ -385,10 +385,6 @@ static inline void mqtt_connected_actions(mqtt_wss_client client)
385
aclk_rcvd_cloud_msgs = 0;
386
aclk_connection_counter++;
387
388
- aclk_topic_cache_iter_t iter = ACLK_TOPIC_CACHE_ITER_T_INITIALIZER;
389
- while ((topic = (char*)aclk_topic_cache_iterate(&iter)) != NULL)
390
- mqtt_wss_set_topic_alias(client, topic);
391
-
388
aclk_send_agent_connection_update(client, 1);
389
}
390
aclk/aclk_util.c
-18
@@ -307,24 +307,6 @@ const char *aclk_get_topic(enum aclk_topics topic)
307
return NULL;
308
}
309
310
-/*
311
- * Allows iterating all topics in topic cache without
312
- * having to resort to callbacks.
313
- */
314
-
315
-const char *aclk_topic_cache_iterate(aclk_topic_cache_iter_t *iter)
316
-{
317
- if (!aclk_topic_cache) {
318
- error("Topic cache not initialized when %s was called.", __FUNCTION__);
319
- return NULL;
320
- }
321
-
322
- if (*iter >= aclk_topic_cache_items)
323
- return NULL;
324
-
325
- return aclk_topic_cache[(*iter)++]->topic;
326
-}
327
-
310
/*
311
* TBEB with randomness
312
*
aclk/aclk_util.h
-4
@@ -93,13 +93,9 @@ enum aclk_topics {
93
ACLK_TOPICID_CTXS_UPDATED = 20
94
};
95
96
-typedef size_t aclk_topic_cache_iter_t;
97
-#define ACLK_TOPIC_CACHE_ITER_T_INITIALIZER (0)
98
-
96
const char *aclk_get_topic(enum aclk_topics topic);
97
int aclk_generate_topic_cache(struct json_object *json);
98
void free_topic_cache(void);
102
-const char *aclk_topic_cache_iterate(aclk_topic_cache_iter_t *iter);
99
// TODO
100
// aclk_topics_reload //when claim id changes
101
mqtt_websockets
+1
-1
@@ -1 +1 @@
1
-Subproject commit 8869ab354d10c071c1e5e33602cc6b7940b4427c
1
+Subproject commit d1e30f55e2c21e3c8982c76e6a969a1e65292d90