Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
逍遥°懒人
arduino
提交
807ed51d
A
arduino
项目概览
逍遥°懒人
/
arduino
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
807ed51d
编写于
3月 03, 2021
作者:
D
david gauchard
提交者:
GitHub
3月 03, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
AP & dhcp-server: fix uninitialized variables (#7905)
上级
e3fe7a57
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
10 deletion
+3
-10
cores/esp8266/LwipDhcpServer.cpp
cores/esp8266/LwipDhcpServer.cpp
+1
-8
libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
+2
-2
未找到文件。
cores/esp8266/LwipDhcpServer.cpp
浏览文件 @
807ed51d
...
@@ -1140,16 +1140,9 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please)
...
@@ -1140,16 +1140,9 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please)
// logic below is subject for improvement
// logic below is subject for improvement
// - is wrong
// - is wrong
// - limited to /24 address plans
// - limited to /24 address plans
#if 1
softap_ip
=
htonl
(
ip_2_ip4
(
&
_netif
->
ip_addr
)
->
addr
);
softap_ip
=
ip_2_ip4
(
&
_netif
->
ip_addr
)
->
addr
;
#else
struct
ip_info
info
;
bzero
(
&
info
,
sizeof
(
struct
ip_info
));
wifi_get_ip_info
(
SOFTAP_IF
,
&
info
);
softap_ip
=
htonl
(
info
.
ip
.
addr
);
start_ip
=
htonl
(
please
->
start_ip
.
addr
);
start_ip
=
htonl
(
please
->
start_ip
.
addr
);
end_ip
=
htonl
(
please
->
end_ip
.
addr
);
end_ip
=
htonl
(
please
->
end_ip
.
addr
);
#endif
/*config ip information can't contain local ip*/
/*config ip information can't contain local ip*/
if
((
start_ip
<=
softap_ip
)
&&
(
softap_ip
<=
end_ip
))
if
((
start_ip
<=
softap_ip
)
&&
(
softap_ip
<=
end_ip
))
{
{
...
...
libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
浏览文件 @
807ed51d
...
@@ -224,6 +224,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
...
@@ -224,6 +224,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
}
}
struct
dhcps_lease
dhcp_lease
;
struct
dhcps_lease
dhcp_lease
;
dhcp_lease
.
enable
=
true
;
IPAddress
ip
=
local_ip
;
IPAddress
ip
=
local_ip
;
ip
[
3
]
+=
99
;
ip
[
3
]
+=
99
;
dhcp_lease
.
start_ip
.
addr
=
ip
.
v4
();
dhcp_lease
.
start_ip
.
addr
=
ip
.
v4
();
...
@@ -264,8 +265,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
...
@@ -264,8 +265,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
DEBUG_WIFI
(
"[APConfig] IP config Invalid?!
\n
"
);
DEBUG_WIFI
(
"[APConfig] IP config Invalid?!
\n
"
);
ret
=
false
;
ret
=
false
;
}
else
if
(
local_ip
.
v4
()
!=
info
.
ip
.
addr
)
{
}
else
if
(
local_ip
.
v4
()
!=
info
.
ip
.
addr
)
{
ip
=
info
.
ip
.
addr
;
DEBUG_WIFI
(
"[APConfig] IP config not set correct?! new IP: %s
\n
"
,
IPAddress
(
info
.
ip
.
addr
).
toString
().
c_str
());
DEBUG_WIFI
(
"[APConfig] IP config not set correct?! new IP: %s
\n
"
,
ip
.
toString
().
c_str
());
ret
=
false
;
ret
=
false
;
}
}
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录