Skip to content

Provide wl_tcp_state as tcp_state alias #8609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2022
Merged

Provide wl_tcp_state as tcp_state alias #8609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba01af1
Provide wl_tcp_state as tcp_state alias
mcspr Jun 19, 2022
e29633f
Merge branch 'master' into no-internal-tcp-state
d-a-v Jun 23, 2022
803820e
Merge branch 'master' into no-internal-tcp-state
d-a-v Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions cores/esp8266/wl_definitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,8 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
ENC_TYPE_AUTO = 8
};

#if !defined(LWIP_INTERNAL) && !defined(__LWIP_TCP_H__) && !defined(LWIP_HDR_TCPBASE_H)
enum wl_tcp_state {
CLOSED = 0,
LISTEN = 1,
SYN_SENT = 2,
SYN_RCVD = 3,
ESTABLISHED = 4,
FIN_WAIT_1 = 5,
FIN_WAIT_2 = 6,
CLOSE_WAIT = 7,
CLOSING = 8,
LAST_ACK = 9,
TIME_WAIT = 10
};
#endif
#include <lwip/init.h>
#include <lwip/tcpbase.h>
using wl_tcp_state = tcp_state;

#endif /* WL_DEFINITIONS_H_ */
2 changes: 0 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#define LWIP_INTERNAL

extern "C"
{
#include "wl_definitions.h"
Expand Down
2 changes: 0 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#define LWIP_INTERNAL

#include <list>
#include <errno.h>
#include <algorithm>
Expand Down
2 changes: 0 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*/


#define LWIP_INTERNAL

extern "C" {
#include "osapi.h"
#include "ets_sys.h"
Expand Down
2 changes: 0 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#define LWIP_INTERNAL

extern "C" {
#include "osapi.h"
#include "ets_sys.h"
Expand Down
1 change: 0 additions & 1 deletion libraries/ESP8266WiFi/src/WiFiUdp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#define LWIP_INTERNAL
#include <functional>

extern "C"
Expand Down