From 96f74692c7a99e9f803aa5985f6184c2b680f804 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 14:09:27 +0800 Subject: [PATCH 1/5] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../dhcp_server/include/dhcp_logger.h | 2 +- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 25 +++++++++++++------ .../mgr_service/src/dhcp_server_service.cpp | 1 + .../wifi_sta/sta_saved_device_appraisal.cpp | 7 ++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dhcp/services/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h index 1aa882003..9176e985d 100644 --- a/dhcp/services/dhcp_server/include/dhcp_logger.h +++ b/dhcp/services/dhcp_server/include/dhcp_logger.h @@ -27,7 +27,7 @@ #define LOG_TAG "DhcpServer" #undef LOG_DOMAIN -#define LOG_DOMAIN 0x0000000 +#define LOG_DOMAIN 0xD001560 #define LOGD(...) ((void)HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 6c80d69d9..a99950b37 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -92,6 +92,10 @@ static int InitNetworkAbout(DhcpConfig *config) LOGE("error gateway argument."); return RET_FAILED; } + } else { + config->gateway = config->serverId; + LOGW("InitNetworkAbout, set gateway to serverId:%{public}x as default.", + config->serverId); } return RET_SUCCESS; } @@ -146,10 +150,9 @@ static int InitAddressRange(DhcpConfig *config) static int InitDomainNameServer(DhcpConfig *config) { + DhcpOption argOpt = {DOMAIN_NAME_SERVER_OPTION, 0, {0}}; ArgumentInfo *arg = GetArgument("dns"); if (arg) { - DhcpOption argOpt = {DOMAIN_NAME_SERVER_OPTION, 0, {0}}; - char *pSave = NULL; char *pTok = strtok_r(arg->value, ",", &pSave); if ((pTok == NULL) || (strlen(pTok) == 0)) { @@ -164,15 +167,21 @@ static int InitDomainNameServer(DhcpConfig *config) } if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { LOGW("failed to append dns option."); - }; + } pTok = strtok_r(NULL, ",", &pSave); } - - if (GetOption(&config->options, argOpt.code) != NULL) { - RemoveOption(&config->options, DOMAIN_NAME_SERVER_OPTION); + } else { + LOGW("%{public}s, set dns to serverId:0x%{public}x for default.", __func__, config->serverId); + uint32_t dnsAddress = config->serverId; + if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { + LOGW("failed to append dns option."); } - PushBackOption(&config->options, &argOpt); } + + if (GetOption(&config->options, argOpt.code) != NULL) { + RemoveOption(&config->options, DOMAIN_NAME_SERVER_OPTION); + } + PushBackOption(&config->options, &argOpt); return RET_SUCCESS; } @@ -343,7 +352,7 @@ static int InitializeDhcpConfig(const char *ifname, DhcpConfig *config) return RET_FAILED; } } - LOGD("load local config file:%s", configFile); + LOGI("load local dhcp config file:%s", configFile); if (LoadConfig(configFile, ifname, config) != RET_SUCCESS) { LOGE("failed to load configure file."); return RET_FAILED; diff --git a/dhcp/services/mgr_service/src/dhcp_server_service.cpp b/dhcp/services/mgr_service/src/dhcp_server_service.cpp index 743f0b429..4d85f4215 100644 --- a/dhcp/services/mgr_service/src/dhcp_server_service.cpp +++ b/dhcp/services/mgr_service/src/dhcp_server_service.cpp @@ -314,6 +314,7 @@ int DhcpServerService::SetDhcpRange(const std::string &ifname, const std::string WIFI_LOGE("SetDhcpRange tag m_mapTagDhcpRange no find tagName:%{public}s.", tagName.c_str()); return DHCP_OPT_FAILED; } + int nSize = (int)iterTag->second.size(); if (nSize != 1) { WIFI_LOGE("SetDhcpRange tag %{public}s range size:%{public}d error.", tagName.c_str(), nSize); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 2f81222fd..5107e1803 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -65,8 +65,8 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( int score = 0; AppraiseDeviceQuality(score, scanInfo, device, info); - WIFI_LOGI("The device %{public}s score is %{public}d.rssi is %{public}d.\n", - scanInfo.ssid.c_str(), score, scanInfo.rssi); + WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score is %{public}d, rssi is %{public}d.", + device.networkId, SsidAnonymize(scanInfo.ssid).c_str(), score, scanInfo.rssi); if (score > highestScore || (score == highestScore && scanInfo.rssi > scanInfoElected.rssi)) { highestScore = score; @@ -78,6 +78,9 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}s, ssid:%{public}s, bssid:%{public}d.", + electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), + MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { WifiDeviceConfig networkInfo; electedDevice = networkInfo; -- Gitee From dded3f47da135910717524ab5ef15b9b6a2cc41e Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 16:16:17 +0800 Subject: [PATCH 2/5] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 2 +- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index a99950b37..1ccb629b2 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -352,7 +352,7 @@ static int InitializeDhcpConfig(const char *ifname, DhcpConfig *config) return RET_FAILED; } } - LOGI("load local dhcp config file:%s", configFile); + LOGD("load local dhcp config file:%s", configFile); if (LoadConfig(configFile, ifname, config) != RET_SUCCESS) { LOGE("failed to load configure file."); return RET_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index 5107e1803..a4e6c0476 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -15,6 +15,7 @@ #include "sta_saved_device_appraisal.h" #include "wifi_logger.h" #include "wifi_settings.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaSavedDeviceAppraisal"); -- Gitee From 9c0630697a0ed0c87fe91e5d2da757e61d411f1a Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 17:27:59 +0800 Subject: [PATCH 3/5] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- dhcp/services/dhcp_server/src/dhcp_dhcpd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c index 1ccb629b2..3aaac43c4 100644 --- a/dhcp/services/dhcp_server/src/dhcp_dhcpd.c +++ b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c @@ -94,8 +94,7 @@ static int InitNetworkAbout(DhcpConfig *config) } } else { config->gateway = config->serverId; - LOGW("InitNetworkAbout, set gateway to serverId:%{public}x as default.", - config->serverId); + LOGW("InitNetworkAbout, set gateway to serverId as default."); } return RET_SUCCESS; } @@ -171,7 +170,7 @@ static int InitDomainNameServer(DhcpConfig *config) pTok = strtok_r(NULL, ",", &pSave); } } else { - LOGW("%{public}s, set dns to serverId:0x%{public}x for default.", __func__, config->serverId); + LOGW("%{public}s, set dns to serverId as default.", __func__); uint32_t dnsAddress = config->serverId; if (AppendAddressOption(&argOpt, dnsAddress) != RET_SUCCESS) { LOGW("failed to append dns option."); -- Gitee From da2d53925d52207d2c13c1f414cc5e2f5882d826 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 17:29:47 +0800 Subject: [PATCH 4/5] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index a4e6c0476..ce21201ed 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -79,7 +79,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { - WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}s, ssid:%{public}s, bssid:%{public}d.", + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}d.", electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { -- Gitee From 96e0709427dbfe6092d78b04369612efb3d2aea5 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 5 Sep 2022 20:04:13 +0800 Subject: [PATCH 5/5] set dns & gateway to serverId for default 0905 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp index ce21201ed..ca79bfdd5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp @@ -79,7 +79,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( } } if (sign == 1) { - WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}d.", + WIFI_LOGI("DeviceAppraisals, Selected device, networkId:%{public}d, ssid:%{public}s, bssid:%{public}s.", electedDevice.networkId, SsidAnonymize(electedDevice.ssid).c_str(), MacAnonymize(electedDevice.bssid).c_str()); if (info.connState == ConnState::CONNECTED && electedDevice.networkId == info.networkId) { -- Gitee