topic reflection in aws bridge & docs update

docs/en_US/bridges/aws-iot-core-bridge.md

@@ -56,13 +56,13 @@ Here's how to configure it on the AWS IoT Core side. Note: The Configuration pre
 
 
 
-2. Download your Certificates at **Security** -> **Certificates** page. 
+2. Download your Certificates at **Security** -> **Certificates** page. Attach Policy to Certificates and attach Certificates to Things.
 
    ![Certification](./assets/certs.png)
 
 
 
-3. Create a corresponding MQTT client behavior authentication policy at  **Security **-> **Policies**  page. And defines the client identifier, publish/subscribe topics, these parameters will be used in NanoMQ Bridge.
+3. Create a corresponding MQTT client behavior authentication policy at  **Security**-> **Policies**  page. And defines the client identifier, publish/subscribe topics, these parameters will be used in NanoMQ Bridge.
 
    ![Policy](./assets/policy.png)
 
@@ -126,12 +126,12 @@ bridges.aws.c1 {
 	subscription = [
 		{
 			remote_topic = "cmd/topic1"
-			local_topic = "topic1"
+			local_topic = "topic3"
 			qos = 0
 		},
 		{
 			remote_topic = "cmd/topic2"
-			local_topic = "topic2"
+			local_topic = "topic4"
 			qos = 1
 		}
 	]
@@ -230,10 +230,10 @@ $ nanomq start --old_conf nanomq.conf
 
 Now you can verify whether the bridging channel is working by publishing a message to NanoMQ. Then check on the MQTT test client tool in AWS IoT Core.
 
-For example, publish a message `hello` locally to the bridge topic `topic_1` of NanoMQ,
+For example, publish a message `hello` locally to the bridge topic `topic1` of NanoMQ,
 
 ```bash
-$ ./nanomq_cli pub -h "local.broker.address"  -t "topic_1" -m "hello" -q 1
+$ ./nanomq_cli pub -h "local.broker.address"  -t "topic1" -m "hello" -q 1
 ```
 
 On AWS MQTT test client menu：

docs/zh_CN/bridges/aws-iot-core-bridge.md

@@ -55,7 +55,7 @@ sudo ninja install
 
 
 
-2. 在 **安全性** -> **证书** 处下载相关的 CRT 证书。
+2. 在 **安全性** -> **证书** 处下载相关的 CRT 证书，并将策略附加到证书上，证书附加到物品上。
 
    ![Certification](./assets/certs.png)
 
@@ -123,12 +123,12 @@ bridges.aws.c1 {
 	subscription = [
 		{
 			remote_topic = "cmd/topic1"
-			local_topic = "topic1"
+			local_topic = "topic3"
 			qos = 0
 		},
 		{
 			remote_topic = "cmd/topic2"
-			local_topic = "topic2"
+			local_topic = "topic4"
 			qos = 1
 		}
 	]
@@ -222,10 +222,10 @@ $ nanomq start --old_conf nanomq.conf
 
 用户可以在 AWS IoT Core 的 MQTT 测试客户端工具上验证桥接是否成功。
 
-如在本地向 NanoMQ 的桥接主题 `topic_1`发布一条消息 `hello`：
+如在本地向 NanoMQ 的桥接主题 `topic1`发布一条消息 `hello`：
 
 ```bash
-$ ./nanomq_cli pub -h "local.broker.address"  -t "topic_1" -m "hello" -q 1
+$ ./nanomq_cli pub -h "local.broker.address"  -t "topic1" -m "hello" -q 1
 ```
 
 即可在AWS 界面看到：

nanomq/aws_bridge.c

@@ -278,10 +278,19 @@ handle_recv_publish(MQTTPublishInfo_t *pub_info, uint16_t packet_id,
 	nng_mqtt_msg_set_publish_payload(
 	    pub_msg, (uint8_t *) pub_info->pPayload, pub_info->payloadLength);
 
-	nng_mqtt_msg_set_publish_qos(pub_msg, pub_info->qos);
 	nng_mqtt_msg_set_publish_retain(pub_msg, pub_info->retain);
-	nng_mqtt_msg_set_publish_topic(pub_msg, pub_info->pTopicName);
-	nng_mqtt_msg_set_publish_topic_len(pub_msg, pub_info->topicNameLength);
+	for (int i = 0; i < node->sub_count; i++) {
+		if (strncmp(pub_info->pTopicName,
+		        node->sub_list[i]->remote_topic,
+		        node->sub_list[i]->remote_topic_len) == 0) {
+			nng_mqtt_msg_set_publish_topic(
+			    pub_msg, node->sub_list[i]->local_topic);
+			nng_mqtt_msg_set_publish_topic_len(
+			    pub_msg, node->sub_list[i]->local_topic_len);
+			nng_mqtt_msg_set_publish_qos(
+			    pub_msg, node->sub_list[i]->qos);
+		}
+	}
 
 	nng_msg *msg = NULL;
 	if ((rv = encode_common_mqtt_msg(

nanomq/tests/bridge_aws_test.c

@@ -4,7 +4,7 @@
 int
 main()
 {
-	char *cmd_sub[] = {"mosquitto_sub", "-h", "127.0.0.1", "-p", "1881", "-t", "nmqtest", "-V", "mqttv5", NULL};
+	char *cmd_sub[] = {"mosquitto_sub", "-h", "127.0.0.1", "-p", "1881", "-t", "nmqtest_sub", "-V", "mqttv5", NULL};
 
 	char *cmd_pub= "mosquitto_pub -h 127.0.0.1 -p 1881 -t nmqtest_lo -m message-to-aws -V mqttv5";
 

nanomq/tests/nanomq_aws_test.conf

@@ -101,7 +101,7 @@ bridges.aws.c1 {
 		},
 		{
 			remote_topic = "nmqtest"
-			local_topic = "nmqtest2"
+			local_topic = "nmqtest_sub"
 			qos = 0
 		}
 	]