diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp index fbac8272..a6f60a60 100644 --- a/das-dn/cmg/ry.cpp +++ b/das-dn/cmg/ry.cpp @@ -1387,6 +1387,15 @@ BOOLEAN CRYDevice::processRyADSParam(const Json::Value jsonRoot, int pid) vLog(LOG_ERROR, "inet_pton error(%d,%s).\n", errno, strerror(errno)); } } + //ads添加路由的用户名密码 + //用户名 + if (jsonRoot["adsUser"].isString()) { + config_config.processes[pid].option.ryads.user = atoi(jsonRoot["adsUser"].asCString()); + } + //密码 + if (jsonRoot["adsPassword"].isString()) { + config_config.processes[pid].option.ryads.password = atoi(jsonRoot["adsPassword"].asCString()); + } return TRUE; } diff --git a/das-dn/hostadsbf/hostadsbf.cpp b/das-dn/hostadsbf/hostadsbf.cpp index 0b4f78dd..350580b8 100644 --- a/das-dn/hostadsbf/hostadsbf.cpp +++ b/das-dn/hostadsbf/hostadsbf.cpp @@ -883,6 +883,9 @@ BOOLEAN CHostADSBFProcess::OnPreCreate(int id) //目标端口 m_remotePort = m_nOptions.net.target_port; + m_user = std::string(m_nOptions.user); + m_password = std::string(m_nOptions.password); + m_bHaveFTP = m_nOptions.bHaveFTP; calc(); @@ -974,7 +977,7 @@ BOOLEAN CHostADSBFProcess::OnTimer(void) //先添加一条路由 if (m_bRouteAdded == FALSE) { - long ret = AddRemoteRoute(m_remoteIp, AmsNetId(m_localNetId), m_localIp, std::string("isoftstone"), std::string("admin"), std::string("admin")); + long ret = AddRemoteRoute(m_remoteIp, AmsNetId(m_localNetId), m_localIp, std::string("isoftstone"), m_user, m_password); vLog(LOG_DEBUG, "%s add route(%s to %s) return value is: %d\n", m_pidName.c_str(), m_localIp.c_str(), m_remoteIp.c_str(), ret); if (ret != 0) return TRUE; } diff --git a/das-dn/hostadsbf/hostadsbf.h b/das-dn/hostadsbf/hostadsbf.h index 6e6cdd14..4f3b2485 100644 --- a/das-dn/hostadsbf/hostadsbf.h +++ b/das-dn/hostadsbf/hostadsbf.h @@ -43,6 +43,8 @@ private: std::string m_localNetId; //本机IP地址 std::string m_remoteIp; //PLC设备ip地址 std::string m_remoteNetId; + std::string m_user; + std::string m_password; AdsDevice *m_turbine; BOOLEAN m_bRouteAdded; //路由是否添加成功 diff --git a/das-dn/inc/public.h b/das-dn/inc/public.h index 5fb18517..45492fe5 100644 --- a/das-dn/inc/public.h +++ b/das-dn/inc/public.h @@ -626,6 +626,8 @@ typedef struct struNetWorkOption net; BOOLEAN bHaveFTP; struFTPOption ftp; + char user[64]; + char password[64]; } struRYADSOption; typedef struct