From 63d400dc50cff8920d0b65f8f72532bc492d8dcf Mon Sep 17 00:00:00 2001
From: Chris Elston <chris.elston@sancloud.co.uk>
Date: Fri, 17 Sep 2021 13:02:51 +0100
Subject: [PATCH] Additional bridge parameters for dynamic bridges

Signed-off-by: Chris Elston <chris.elston@sancloud.com>

Adds the following bridge configuration as parameters for dynamic
bridges:
- remote_username
- try_private
- notification_topic
- remote_clientid
---
 src/bridge_dynamic.c | 101 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/src/bridge_dynamic.c b/src/bridge_dynamic.c
index dfe51182..90cbe167 100644
--- a/src/bridge_dynamic.c
+++ b/src/bridge_dynamic.c
@@ -152,6 +152,10 @@ int bridge__dynamic_parse_payload_new_json(struct mosquitto_db *db, void* payloa
 	const cJSON *qos_json= NULL;
 	const cJSON *local_prefix_json = NULL;
 	const cJSON *remote_prefix_json = NULL;
+	const cJSON *remote_username = NULL;
+	const cJSON *try_private = NULL;
+	const cJSON *notification_topic = NULL;
+	const cJSON *remote_clientid = NULL;
 
 	connection_json = cJSON_GetObjectItemCaseSensitive(bridge_json, "connection");
 	if(cJSON_IsString(connection_json) && (connection_json->valuestring != NULL)) {
@@ -326,6 +330,49 @@ int bridge__dynamic_parse_payload_new_json(struct mosquitto_db *db, void* payloa
 			}
 		}
 	}
+	remote_username = cJSON_GetObjectItemCaseSensitive(bridge_json, "remote_username");
+	if(cJSON_IsString(remote_username) && (remote_username->valuestring != NULL)) {
+		if(!strcmp(remote_username->valuestring, "\"\"")){
+			cur_bridge->remote_username = NULL;
+		}else{
+			cur_bridge->remote_username = mosquitto__strdup(remote_username->valuestring);
+			if(!cur_bridge->remote_username){
+				log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
+				cJSON_Delete(message_json);
+				return MOSQ_ERR_NOMEM;
+			}
+		}
+	}
+	try_private = cJSON_GetObjectItemCaseSensitive(bridge_json, "try_private");
+	if(cJSON_IsBool(try_private)){
+		cur_bridge->try_private = cJSON_IsTrue(try_private) ? true : false;
+	}
+	notification_topic = cJSON_GetObjectItemCaseSensitive(bridge_json, "notification_topic");
+	if(cJSON_IsString(notification_topic) && (notification_topic->valuestring != NULL)) {
+		if(!strcmp(notification_topic->valuestring, "\"\"")){
+			cur_bridge->notification_topic = NULL;
+		}else{
+			cur_bridge->notification_topic = mosquitto__strdup(notification_topic->valuestring);
+			if(!cur_bridge->notification_topic){
+				log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
+				cJSON_Delete(message_json);
+				return MOSQ_ERR_NOMEM;
+			}
+		}
+	}
+	remote_clientid = cJSON_GetObjectItemCaseSensitive(bridge_json, "remote_clientid");
+	if(cJSON_IsString(remote_clientid) && (remote_clientid->valuestring != NULL)) {
+		if(!strcmp(remote_clientid->valuestring, "\"\"")){
+			cur_bridge->remote_clientid = NULL;
+		}else{
+			cur_bridge->remote_clientid = mosquitto__strdup(remote_clientid->valuestring);
+			if(!cur_bridge->remote_clientid){
+				log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
+				cJSON_Delete(message_json);
+				return MOSQ_ERR_NOMEM;
+			}
+		}
+	}
 
   //Last verification
 	if(cur_bridge->address_count == 0){
@@ -515,6 +562,60 @@ int bridge__dynamic_parse_payload_new(struct mosquitto_db *db, void* payload, st
 						return MOSQ_ERR_INVAL;
 					}
 				}
+				else if(!strcmp(token, "try_private"))
+				{
+					nb_param ++;
+					if(!cur_bridge){
+						log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
+						return MOSQ_ERR_INVAL;
+					}
+					token = strtok_r(NULL, " ", &saveptr);
+					if(token){
+						if(!strcmp(token,"false")){
+							cur_bridge->try_private = false;
+						}else if(strcmp(token,"true")){
+							log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
+							return MOSQ_ERR_INVAL;
+						}
+					}
+				}
+				else if(!strcmp(token, "notification_topic"))
+				{
+					nb_param ++;
+					if(!cur_bridge){
+						log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
+						return MOSQ_ERR_INVAL;
+					}
+					token = strtok_r(NULL, " ", &saveptr);
+					if(token){
+						cur_bridge->notification_topic = mosquitto__strdup(token);
+					}
+				}
+				else if(!strcmp(token, "remote_username"))
+				{
+					log__printf(NULL, MOSQ_LOG_INFO, "Found remote_username");
+					nb_param ++;
+					if(!cur_bridge){
+						log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
+						return MOSQ_ERR_INVAL;
+					}
+					token = strtok_r(NULL, " ", &saveptr);
+					if(token){
+						cur_bridge->remote_username = mosquitto__strdup(token);
+					}
+				}
+				else if(!strcmp(token, "remote_clientid"))
+				{
+					nb_param ++;
+					if(!cur_bridge){
+						log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
+						return MOSQ_ERR_INVAL;
+					}
+					token = strtok_r(NULL, " ", &saveptr);
+					if(token){
+						cur_bridge->remote_clientid = mosquitto__strdup(token);
+					}
+				}
 				else if(!strcmp(token, "topic"))
 				{
 					nb_param ++;