sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2024-12-16 14:44:16 +08:00
parent 20706b8b96
commit 95dab4f0cf
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
das-dn/cmg/ry.cpp
View File

@ -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_addr = INADDR_ANY;
config_config.processes[pid].option.ftp2minio.net.bind_port = 0; 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_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()) { if (jsonRoot["ftpHost"].isInt()) {
config_config.processes[pid].option.ftp2minio.net.target_addr = jsonRoot["targetAddr"].asInt(); config_config.processes[pid].option.ftp2minio.net.target_addr = jsonRoot["ftpHost"].asInt();
} else if (jsonRoot["targetAddr"].isString()) { } else if (jsonRoot["ftpHost"].isString()) {
if (inet_pton(AF_INET, jsonRoot["targetAddr"].asCString(), &config_config.processes[pid].option.ftp2minio.net.target_addr) == 1) { 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); vLog(LOG_DEBUG, "IPv4 地址转换成功，网络字节序为: %u.\n", config_config.processes[pid].option.ftp2minio.net.target_addr);
} else { } else {
vLog(LOG_ERROR, "inet_pton error(%d,%s).\n", errno, strerror(errno)); vLog(LOG_ERROR, "inet_pton error(%d,%s).\n", errno, strerror(errno));

4
das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp vendored
View File

@ -79,6 +79,10 @@ AmsConnection::AmsConnection(Router& __router, const struct addrinfo* const dest
struct in_addr ss{htonl(remoteIp)}; struct in_addr ss{htonl(remoteIp)};
LOG_INFO("Socket connect["<<std::string(inet_ntoa(ss))<<"] is done."); LOG_INFO("Socket connect["<<std::string(inet_ntoa(ss))<<"] is done.");
} }
else
{
socket.Shutdown();
}
} }
AmsConnection::~AmsConnection() AmsConnection::~AmsConnection()