diff --git a/wifi/frameworks/native/interfaces/wifi_msg.h b/wifi/frameworks/native/interfaces/wifi_msg.h index 277308255f32a978844a4393e05729bf04257da8..7ce3a5ce76993254dd52d88673b386e3a78f97fc 100644 --- a/wifi/frameworks/native/interfaces/wifi_msg.h +++ b/wifi/frameworks/native/interfaces/wifi_msg.h @@ -207,8 +207,10 @@ public: void SetIpv4Address(const std::string &address) { - family = IPV4_ADDRESS_TYPE; addressIpv4 = IpTools::ConvertIpv4Address(address); + if (addressIpv4 != 0) { + family = IPV4_ADDRESS_TYPE; + } return; } @@ -219,8 +221,10 @@ public: void SetIpv6Address(const std::string &address) { - family = IPV6_ADDRESS_TYPE; IpTools::ConvertIpv6Address(address, addressIpv6); + if (addressIpv6.size() != 0) { + family = IPV6_ADDRESS_TYPE; + } return; } }; 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 ca79bfdd5218446ac4200c65384615dbc7d3daff..b0e3031eb7c4fb3defe0c14f4477ae8aa03ef21b 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 @@ -66,7 +66,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( int score = 0; AppraiseDeviceQuality(score, scanInfo, device, info); - WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score is %{public}d, rssi is %{public}d.", + WIFI_LOGI("The device networkId:%{public}d ssid:%{public}s score:%{public}d rssi:%{public}d.", device.networkId, SsidAnonymize(scanInfo.ssid).c_str(), score, scanInfo.rssi); if (score > highestScore || (score == highestScore && scanInfo.rssi > scanInfoElected.rssi)) { @@ -74,6 +74,7 @@ ErrCode StaSavedDeviceAppraisal::DeviceAppraisals( scanInfoElected.rssi = scanInfo.rssi; electedDevice = device; sign = 1; + WIFI_LOGI("set highestScore: %{public}d, ssid: %{public}s", highestScore, SsidAnonymize(device.ssid).c_str()); } else { WIFI_LOGI("The config %{public}s is ignored!\n", scanInfo.ssid.c_str()); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index 713144621c569693252a11bbba4cc02bb822073f..526c8679845a2ca6ffe202c7f75989d45f7f4059 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -1803,6 +1803,7 @@ bool StaStateMachine::ConfigStaticIpAddress(StaticIpAddress &staticIpAddress) } default: + WIFI_LOGE("Invalid currentTpType: %{public}d", currentTpType); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c index 5512dfdaa45a2d36ceed871e74201f080835d553..863dbaf9aa6e3eaecc9b9b413cf6f042d592cb79 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c @@ -186,17 +186,20 @@ int InitHostapdCtrl(const char *ifname, int id) } int flag = 0; do { - g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv = wpa_ctrl_open(ifname); - if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn == NULL || - g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv == NULL) { - LOGE("open hostapd control interface failed!"); + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv == NULL) { + LOGE("open hostapd control interface ctrlRecv failed!"); break; } if (wpa_ctrl_attach(g_hostapdHalDevInfo[id].hostapdHalDev->ctrlRecv) != 0) { LOGE("attach hostapd monitor interface failed!"); break; } + g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn = wpa_ctrl_open(ifname); + if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn == NULL) { + LOGE("open hostapd control interface ctrlConn failed!"); + break; + } flag += 1; } while (0); if (!flag) { @@ -214,6 +217,7 @@ void GetDestPort(char *destPort, size_t len, int id) static int HostapdCliConnect(int id) { if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { + LOGE("hostapdHalDev is NULL!"); return -1; } if (g_hostapdHalDevInfo[id].hostapdHalDev->ctrlConn != NULL) { @@ -226,7 +230,7 @@ static int HostapdCliConnect(int id) while (retryCount-- > 0) { int ret = InitHostapdCtrl(ifname, id); if (ret == 0) { - LOGD("Global hostapd interface connect successfully!"); + LOGI("Global hostapd interface connect successfully!"); break; } else { LOGD("Init hostapd ctrl failed: %{public}d", ret); @@ -234,6 +238,7 @@ static int HostapdCliConnect(int id) usleep(SLEEP_TIME_100_MS); } if (retryCount <= 0) { + LOGD("Retry init hostapd ctrl failed, retryCount: %{public}d", retryCount); return -1; } g_hostapdHalDevInfo[id].hostapdHalDev->threadRunFlag = 1; @@ -710,6 +715,7 @@ static int InitHostapdHal(int id) WifiHostapdHalDevice *GetWifiHostapdDev(int id) { if (id < 0 || id >= AP_MAX_INSTANCE) { + LOGE("Invalid id: %{public}d!", id); return NULL; } @@ -719,6 +725,7 @@ WifiHostapdHalDevice *GetWifiHostapdDev(int id) g_hostapdHalDevInfo[id].hostapdHalDev = (WifiHostapdHalDevice *)calloc(1, sizeof(WifiHostapdHalDevice)); if (g_hostapdHalDevInfo[id].hostapdHalDev == NULL) { + LOGE("hostapdHalDev is NULL"); return NULL; } @@ -735,6 +742,7 @@ WifiHostapdHalDevice *GetWifiHostapdDev(int id) g_hostapdHalDevInfo[id].hostapdHalDev->setCountryCode = SetCountryCode; if (InitHostapdHal(id) != 0) { + LOGE("InitHostapdHal return failed!!"); free(g_hostapdHalDevInfo[id].hostapdHalDev); g_hostapdHalDevInfo[id].hostapdHalDev = NULL; return NULL; diff --git a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c index 421c23b718f3dff40b067936293bd3036227fd16..61f457a957871aaf8edad5228510363284f64938 100644 --- a/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c +++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c @@ -1166,6 +1166,9 @@ static int WpaCliCmdScanInfo(WifiWpaStaInterface *this, ScanInfo *pcmd, int *siz LOGE("parse scan result line failed!"); break; } + LOGD("-->>%{public}2d %{public}s %{public}s %{public}d %{public}d %{public}d %{public}d %{public}d", + j, pcmd[j].ssid, pcmd[j].bssid, pcmd[j].freq, pcmd[j].siglv, + pcmd[j].centerFrequency0, pcmd[j].centerFrequency1, pcmd[j].channelWidth); token = strtok_r(NULL, "\n", &savedPtr); j++; }