Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
428d3b37
Commit
428d3b37
authored
Aug 03, 2015
by
Robert Foss
Browse files
Merge branch 'dev' of github.com:robertfoss/nodemcu-firmware into dev
Conflicts: app/lwip/app/dhcpserver.c
parents
579dc27e
8f05556a
Changes
1
Show whitespace changes
Inline
Side-by-side
app/lwip/app/dhcpserver.c
View file @
428d3b37
...
...
@@ -108,7 +108,7 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
ipadd
.
addr
=
*
(
(
uint32_t
*
)
&
server_address
);
#if
def
USE_CLASS_B_NET
#if USE_CLASS_B_NET
*
optptr
++
=
DHCP_OPTION_SUBNET_MASK
;
*
optptr
++
=
4
;
//length
*
optptr
++
=
255
;
...
...
@@ -154,7 +154,11 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*
optptr
++
=
ip4_addr4
(
&
ipadd
);
#endif
<<<<<<<
HEAD
#ifdef USE_CLASS_B_NET
=======
#if USE_CLASS_B_NET
>>>>>>>
8
f05556ab903e6db4977095d508204103beba95a
*
optptr
++
=
DHCP_OPTION_BROADCAST_ADDRESS
;
*
optptr
++
=
4
;
*
optptr
++
=
ip4_addr1
(
&
ipadd
);
...
...
@@ -172,7 +176,11 @@ static uint8_t* ICACHE_FLASH_ATTR add_offer_options(uint8_t *optptr)
*
optptr
++
=
DHCP_OPTION_INTERFACE_MTU
;
*
optptr
++
=
2
;
<<<<<<<
HEAD
#ifdef USE_CLASS_B_NET
=======
#if USE_CLASS_B_NET
>>>>>>>
8
f05556ab903e6db4977095d508204103beba95a
*
optptr
++
=
0x05
;
*
optptr
++
=
0xdc
;
#else
...
...
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