Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
a32df175
Commit
a32df175
authored
Jun 27, 2015
by
vowstar
Browse files
Fixed net.dns.getdnsserver() by @md5crypt.
parent
11ca2bc0
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/modules/net.c
View file @
a32df175
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
#include "c_types.h"
#include "c_types.h"
#include "mem.h"
#include "mem.h"
#include "espconn.h"
#include "espconn.h"
#include "lwip/dns.h"
#ifdef CLIENT_SSL_ENABLE
#ifdef CLIENT_SSL_ENABLE
unsigned
char
*
default_certificate
;
unsigned
char
*
default_certificate
;
...
@@ -1447,14 +1448,16 @@ static int net_getdnsserver( lua_State* L )
...
@@ -1447,14 +1448,16 @@ static int net_getdnsserver( lua_State* L )
if
(
numdns
>=
DNS_MAX_SERVERS
)
if
(
numdns
>=
DNS_MAX_SERVERS
)
return
luaL_error
(
L
,
"server index out of range [0-%d]"
,
DNS_MAX_SERVERS
-
1
);
return
luaL_error
(
L
,
"server index out of range [0-%d]"
,
DNS_MAX_SERVERS
-
1
);
ip_addr_t
ipaddr
;
// ip_addr_t ipaddr;
dns_getserver
(
numdns
,
&
ipaddr
);
// dns_getserver(numdns,&ipaddr);
// Bug fix by @md5crypt https://github.com/nodemcu/nodemcu-firmware/pull/500
ip_addr_t
ipaddr
=
dns_getserver
(
numdns
);
if
(
ip_addr_isany
(
&
ipaddr
)
)
{
if
(
ip_addr_isany
(
&
ipaddr
)
)
{
lua_pushnil
(
L
);
lua_pushnil
(
L
);
}
else
{
}
else
{
char
temp
[
20
]
=
{
0
};
char
temp
[
20
]
=
{
0
};
c_sprintf
(
temp
,
IPSTR
,
IP2STR
(
&
ipaddr
)
);
c_sprintf
(
temp
,
IPSTR
,
IP2STR
(
&
ipaddr
.
addr
)
);
lua_pushstring
(
L
,
temp
);
lua_pushstring
(
L
,
temp
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment