[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/lib/libwlan_interface/broadcom_interface.c b/ap/lib/libwlan_interface/broadcom_interface.c
index 76492f3..2947c17 100755
--- a/ap/lib/libwlan_interface/broadcom_interface.c
+++ b/ap/lib/libwlan_interface/broadcom_interface.c
@@ -273,11 +273,11 @@
if(authMode != NULL && encrypType != NULL)
{
- printf("zte_wlan_ssid1_security_set authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_set authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
if(NULL == password && (!(!strcmp(authMode, WF_AU_OPEN) && !strcmp(encrypType, WF_ENCRY_NONE))))
{
- printf("zte_wlan_ssid1_security_set password is null\n");
+ printf("wlan_ssid1_security_set password is null\n");
return -1;
}
@@ -290,7 +290,7 @@
len = strlen(password);
if(len != 5 || len != 10 || len != 13 || len != 26)
{
- printf("zte_wlan_ssid1_security_set wep psk len = [%s]\n", len);
+ printf("wlan_ssid1_security_set wep psk len = [%s]\n", len);
return -1;
}
@@ -310,7 +310,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -325,7 +325,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -340,7 +340,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -355,7 +355,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -489,8 +489,8 @@
if(authMode != NULL && encrypType != NULL)
{
- printf("zte_wlan_ssid1_security_get authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_get authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
if((!strcmp(authMode, WF_AU_OPEN)) || (!strcmp(authMode, WF_AU_SHARE)) || (!strcmp(authMode, WF_AU_WEPAUTO)))
{
@@ -605,13 +605,13 @@
ret_for_basic = zte_wlan_ssid1_basic_set(ssid);
if(-1 == ret_for_basic)
{
- printf("zte_wlan_ssid1_basic_set is false\n");
+ printf("wlan_ssid1_basic_set is false\n");
return -1;
}
ret_for_security = zte_wlan_ssid1_security_set(password);
if(-1 == ret_for_security)
{
- printf("call zte_lan_ssid1_security_set failure .\n");
+ printf("call lan_ssid1_security_set failure .\n");
return -1;
}
@@ -624,7 +624,7 @@
}
else
{
- printf("wifi set cmd zte_wlan_ssid1_set error!\n");
+ printf("wifi set cmd wlan_ssid1_set error!\n");
return -1;
}
}
diff --git a/ap/lib/libwlan_interface/esp8089_interface.c b/ap/lib/libwlan_interface/esp8089_interface.c
index efa60d6..7677606 100755
--- a/ap/lib/libwlan_interface/esp8089_interface.c
+++ b/ap/lib/libwlan_interface/esp8089_interface.c
@@ -81,11 +81,11 @@
if (authMode != NULL && encrypType != NULL)
{
- printf("zte_wlan_ssid1_security_set authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_set authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
if(NULL == password)//&& (!(!strcmp(authMode, WF_AU_OPEN) && !strcmp(encrypType, WF_ENCRY_NONE))))
{
- printf("zte_wlan_ssid1_security_set password is null\n");
+ printf("wlan_ssid1_security_set password is null\n");
return -1;
}
@@ -132,7 +132,7 @@
len = strlen(password);
if(len != 5 || len != 10 || len != 13 || len != 26)
{
- printf("zte_wlan_ssid1_security_set wep psk len = [%s]\n", len);
+ printf("wlan_ssid1_security_set wep psk len = [%s]\n", len);
return -1;
}
sc_cfg_get("DefaultKeyID",DefaultKeyID,sizeof(DefaultKeyID));
@@ -150,7 +150,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -165,7 +165,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -179,7 +179,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -193,7 +193,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -335,8 +335,8 @@
if(authMode != NULL && encrypType != NULL)
{
- printf("zte_wlan_ssid1_security_get authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_get authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
if((!strcmp(authMode, WF_AU_OPEN)) || (!strcmp(authMode, WF_AU_SHARE)) || (!strcmp(authMode, WF_AU_WEPAUTO)))
{
@@ -451,13 +451,13 @@
ret_for_basic = zte_wlan_ssid1_basic_set(ssid);
if(-1 == ret_for_basic)
{
- printf("zte_wlan_ssid1_basic_set is false\n");
+ printf("wlan_ssid1_basic_set is false\n");
return -1;
}
ret_for_security = zte_wlan_ssid1_security_set(password);
if(-1 == ret_for_security)
{
- printf("call zte_lan_ssid1_security_set failure .\n");
+ printf("call lan_ssid1_security_set failure .\n");
}
if(ret_for_basic == -1 && ret_for_security == -1)
{
@@ -473,7 +473,7 @@
}
else
{
- printf("wifi set cmd zte_wlan_ssid1_set error!\n");
+ printf("wifi set cmd wlan_ssid1_set error!\n");
return -1;
}
}
diff --git a/ap/lib/libwlan_interface/hostapd_interface.c b/ap/lib/libwlan_interface/hostapd_interface.c
index 6c6e3d2..c2958a1 100644
--- a/ap/lib/libwlan_interface/hostapd_interface.c
+++ b/ap/lib/libwlan_interface/hostapd_interface.c
@@ -80,11 +80,11 @@
sc_cfg_get("EncrypType", encrypType, sizeof(encrypType));
//kw 3
- printf("zte_wlan_ssid1_security_set authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_set authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
if(NULL == password)//&& (!(!strcmp(authMode, WF_AU_OPEN) && !strcmp(encrypType, WF_ENCRY_NONE))))
{
- printf("zte_wlan_ssid1_security_set password is null\n");
+ printf("wlan_ssid1_security_set password is null\n");
return -1;
}
#if 0 //kw 3
@@ -131,7 +131,7 @@
len = strlen(password);
if(len != 5 && len != 10 && len != 13 && len != 26) //kw 3 ;wep 5,13(no 16)
{
- printf("zte_wlan_ssid1_security_set wep psk len = [%d]\n", len);
+ printf("wlan_ssid1_security_set wep psk len = [%d]\n", len);
return -1;
}
sc_cfg_get("DefaultKeyID",DefaultKeyID,sizeof(DefaultKeyID));
@@ -148,7 +148,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -163,7 +163,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -177,7 +177,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -191,7 +191,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -296,8 +296,8 @@
sc_cfg_get("AuthMode",authMode,sizeof(authMode));
sc_cfg_get("EncrypType",encrypType,sizeof(encrypType));
- printf("zte_wlan_ssid1_security_get authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_get authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
if((!strcmp(authMode, WF_AU_OPEN)) || (!strcmp(authMode, WF_AU_SHARE)) || (!strcmp(authMode, WF_AU_WEPAUTO)))
{
@@ -358,13 +358,13 @@
ret_for_basic = zte_wlan_ssid1_basic_set(ssid);
if(-1 == ret_for_basic)
{
- printf("zte_wlan_ssid1_basic_set is false\n");
+ printf("wlan_ssid1_basic_set is false\n");
return -1;
}
ret_for_security = zte_wlan_ssid1_security_set(password);
if(-1 == ret_for_security)
{
- printf("call zte_lan_ssid1_security_set failure .\n");
+ printf("call lan_ssid1_security_set failure .\n");
return -1;//kw 3
}
@@ -377,7 +377,7 @@
}
else
{
- printf("wifi set cmd zte_wlan_ssid1_set error!\n");
+ printf("wifi set cmd wlan_ssid1_set error!\n");
return -1;
}
}
diff --git a/ap/lib/libwlan_interface/realtek_interface.c b/ap/lib/libwlan_interface/realtek_interface.c
index e1725d7..ec79bf3 100755
--- a/ap/lib/libwlan_interface/realtek_interface.c
+++ b/ap/lib/libwlan_interface/realtek_interface.c
@@ -82,11 +82,11 @@
sc_cfg_get("EncrypType", encrypType, sizeof(encrypType));
//kw 3
- printf("zte_wlan_ssid1_security_set authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_set authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_set encrypType = [%s]\n", encrypType);
if(NULL == password)//&& (!(!strcmp(authMode, WF_AU_OPEN) && !strcmp(encrypType, WF_ENCRY_NONE))))
{
- printf("zte_wlan_ssid1_security_set password is null\n");
+ printf("wlan_ssid1_security_set password is null\n");
return -1;
}
#if 0 //kw 3
@@ -133,7 +133,7 @@
len = strlen(password);
if(len != 5 && len != 10 && len != 13 && len != 26) //kw 3 ;wep 5,13(no 16)
{
- printf("zte_wlan_ssid1_security_set wep psk len = [%d]\n", len);
+ printf("wlan_ssid1_security_set wep psk len = [%d]\n", len);
return -1;
}
sc_cfg_get("DefaultKeyID",DefaultKeyID,sizeof(DefaultKeyID));
@@ -150,7 +150,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -165,7 +165,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -179,7 +179,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -193,7 +193,7 @@
}
else
{
- printf("zte_wlan_ssid1_security_set wep psk is same\n");
+ printf("wlan_ssid1_security_set wep psk is same\n");
return 1;
}
}
@@ -298,8 +298,8 @@
sc_cfg_get("AuthMode",authMode,sizeof(authMode));
sc_cfg_get("EncrypType",encrypType,sizeof(encrypType));
- printf("zte_wlan_ssid1_security_get authMode = [%s]\n", authMode);
- printf("zte_wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
+ printf("wlan_ssid1_security_get authMode = [%s]\n", authMode);
+ printf("wlan_ssid1_security_get encrypType = [%s]\n", encrypType);
if((!strcmp(authMode, WF_AU_OPEN)) || (!strcmp(authMode, WF_AU_SHARE)) || (!strcmp(authMode, WF_AU_WEPAUTO)))
{
@@ -360,13 +360,13 @@
ret_for_basic = zte_wlan_ssid1_basic_set(ssid);
if(-1 == ret_for_basic)
{
- printf("zte_wlan_ssid1_basic_set is false\n");
+ printf("wlan_ssid1_basic_set is false\n");
return -1;
}
ret_for_security = zte_wlan_ssid1_security_set(password);
if(-1 == ret_for_security)
{
- printf("call zte_lan_ssid1_security_set failure .\n");
+ printf("call lan_ssid1_security_set failure .\n");
return -1;//kw 3
}
@@ -379,7 +379,7 @@
}
else
{
- printf("wifi set cmd zte_wlan_ssid1_set error!\n");
+ printf("wifi set cmd wlan_ssid1_set error!\n");
return -1;
}
}
@@ -665,26 +665,26 @@
fp = fopen("/tmp/stalist1", "r");
if(NULL == fp)
{
- printf("[zte_get_sta_info_to_file]can not open file /tmp/stalist1.");
+ printf("[get_sta_info_to_file]can not open file /tmp/stalist1.");
goto END;
}
if((tmp_fp1 = fopen("/tmp/maclist", "w+")) == NULL){
- printf("[zte_get_sta_info_to_file] can not open /tmp/maclist\n");
+ printf("[get_sta_info_to_file] can not open /tmp/maclist\n");
goto END;
}
if((tmp_fp2 = fopen("/tmp/expiredtime", "w+")) == NULL){
- printf("[zte_get_sta_info_to_file] can not open /tmp/expiredtime\n");
+ printf("[get_sta_info_to_file] can not open /tmp/expiredtime\n");
goto END;
}
if((tmp_fp3 = fopen("/tmp/statelist", "w+")) == NULL) {
- printf("[zte_get_sta_info_to_file] can not open /tmp/statelist\n");
+ printf("[get_sta_info_to_file] can not open /tmp/statelist\n");
goto END;
}
if((tmp_fp4 = fopen("/tmp/timelist", "w+")) ==NULL){
- printf("[zte_get_sta_info_to_file] can not open /tmp/timelist\n");
+ printf("[get_sta_info_to_file] can not open /tmp/timelist\n");
goto END;
}