From 95dab4f0cf2db4b4dc814113862b08c49746b292 Mon Sep 17 00:00:00 2001
From: zhouhuang <assouan@sohu.com>
Date: Mon, 16 Dec 2024 14:44:16 +0800
Subject: [PATCH] update

---
 das-dn/cmg/ry.cpp                                      | 10 +++++-----
 das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp
index a5569823..fbac8272 100644
--- a/das-dn/cmg/ry.cpp
+++ b/das-dn/cmg/ry.cpp
@@ -1256,12 +1256,12 @@ BOOLEAN CRYDevice::processRyFTP2MinioParam(const Json::Value jsonRoot, int pid)
     config_config.processes[pid].option.ftp2minio.net.bind_addr       = INADDR_ANY;
     config_config.processes[pid].option.ftp2minio.net.bind_port       = 0;
     config_config.processes[pid].option.ftp2minio.net.target_addr     = INADDR_ANY;
-    config_config.processes[pid].option.ftp2minio.net.target_port     = 502;
+    config_config.processes[pid].option.ftp2minio.net.target_port     = 21;
 
-    if (jsonRoot["targetAddr"].isInt()) {
-        config_config.processes[pid].option.ftp2minio.net.target_addr =  jsonRoot["targetAddr"].asInt();
-    } else if (jsonRoot["targetAddr"].isString()) {
-        if (inet_pton(AF_INET, jsonRoot["targetAddr"].asCString(), &config_config.processes[pid].option.ftp2minio.net.target_addr) == 1) {
+    if (jsonRoot["ftpHost"].isInt()) {
+        config_config.processes[pid].option.ftp2minio.net.target_addr =  jsonRoot["ftpHost"].asInt();
+    } else if (jsonRoot["ftpHost"].isString()) {
+        if (inet_pton(AF_INET, jsonRoot["ftpHost"].asCString(), &config_config.processes[pid].option.ftp2minio.net.target_addr) == 1) {
             vLog(LOG_DEBUG, "IPv4 地址转换成功，网络字节序为: %u.\n", config_config.processes[pid].option.ftp2minio.net.target_addr);
         } else {
             vLog(LOG_ERROR, "inet_pton error(%d,%s).\n", errno, strerror(errno));
diff --git a/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp b/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
index 298c991f..3ef91c9f 100644
--- a/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
+++ b/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
@@ -79,6 +79,10 @@ AmsConnection::AmsConnection(Router& __router, const struct addrinfo* const dest
         struct in_addr ss{htonl(remoteIp)};
         LOG_INFO("Socket connect["<<std::string(inet_ntoa(ss))<<"] is done.");
     }
+    else 
+    {
+        socket.Shutdown();
+    }
 }
 
 AmsConnection::~AmsConnection()