Commit febcda0

copercinime-no-dev

authored and

committed

add WiFiClientSecure::peek(); (#1310)

1 parent 69f72ec commit febcda0Copy full SHA for febcda0

File tree

2 files changed

+29

-9

lines changed

libraries/WiFiClientSecure/src
- WiFiClientSecure.cpp
- WiFiClientSecure.h

2 files changed

+29

-9

lines changed

`‎libraries/WiFiClientSecure/src/WiFiClientSecure.cpp‎`

Lines changed: 27 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ WiFiClientSecure::WiFiClientSecure()`
`39`	`39`	`_CA_cert = NULL;`
`40`	`40`	`_cert = NULL;`
`41`	`41`	`_private_key = NULL;`
`42`		`-next = NULL;`
	`42`	`+next = NULL;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`
`@@ -58,13 +58,13 @@ WiFiClientSecure::WiFiClientSecure(int sock)`
`58`	`58`	`_CA_cert = NULL;`
`59`	`59`	`_cert = NULL;`
`60`	`60`	`_private_key = NULL;`
`61`		`- next = NULL;`
	`61`	`+ next = NULL;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`WiFiClientSecure::~WiFiClientSecure()`
`65`	`65`	`{`
`66`	`66`	`stop();`
`67`		`-delete sslclient;`
	`67`	`+delete sslclient;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`WiFiClientSecure &WiFiClientSecure::operator=(const WiFiClientSecure &other)`
`@@ -113,14 +113,29 @@ int WiFiClientSecure::connect(const char host, uint16_t port, const char _CA_c`
`113`	`113`	`return 1;`
`114`	`114`	`}`
`115`	`115`
	`116`	`+int WiFiClientSecure::peek(){`
	`117`	`+ if(_peek >= 0){`
	`118`	`+ return _peek;`
	`119`	`+ }`
	`120`	`+ _peek = read();`
	`121`	`+ return _peek;`
	`122`	`+}`
	`123`	`+`
`116`	`124`	`size_t WiFiClientSecure::write(uint8_t data)`
`117`	`125`	`{`
`118`	`126`	`return write(&data, 1);`
`119`	`127`	`}`
`120`	`128`
`121`	`129`	`int WiFiClientSecure::read()`
`122`	`130`	`{`
`123`		`- uint8_t data = 0;`
	`131`	`+ uint8_t data = -1;`
	`132`	`+`
	`133`	`+ if(_peek >= 0){`
	`134`	`+ data = _peek;`
	`135`	`+ _peek = -1;`
	`136`	`+ return data;`
	`137`	`+ }`
	`138`	`+`
`124`	`139`	`int res = read(&data, 1);`
`125`	`140`	`if (res < 0) {`
`126`	`141`	`return res;`
`@@ -143,6 +158,13 @@ size_t WiFiClientSecure::write(const uint8_t *buf, size_t size)`
`143`	`158`
`144`	`159`	`int WiFiClientSecure::read(uint8_t *buf, size_t size)`
`145`	`160`	`{`
	`161`	`+ if(_peek >= 0){`
	`162`	`+ uint8_t data = -1;`
	`163`	`+ data = _peek;`
	`164`	`+ _peek = -1;`
	`165`	`+ return data;`
	`166`	`+ }`
	`167`	`+`
`146`	`168`	`if (!available()) {`
`147`	`169`	`return -1;`
`148`	`170`	`}`
`@@ -161,7 +183,7 @@ int WiFiClientSecure::available()`
`161`	`183`	`int res = data_to_read(sslclient);`
`162`	`184`	`if (res < 0 ) {`
`163`	`185`	`stop();`
`164`		`- }`
	`186`	`+ }`
`165`	`187`	`return res;`
`166`	`188`	`}`
`167`	`189`

`‎libraries/WiFiClientSecure/src/WiFiClientSecure.h‎`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class WiFiClientSecure : public WiFiClient`
`31`	`31`	`sslclient_context *sslclient;`
`32`	`32`
`33`	`33`	`int _lastError = 0;`
	`34`	`+ int _peek = -1;`
`34`	`35`	`const char *_CA_cert;`
`35`	`36`	`const char *_cert;`
`36`	`37`	`const char *_private_key;`
`@@ -44,15 +45,12 @@ class WiFiClientSecure : public WiFiClient`
`44`	`45`	`int connect(const char *host, uint16_t port);`
`45`	`46`	`int connect(IPAddress ip, uint16_t port, const char rootCABuff, const char cli_cert, const char *cli_key);`
`46`	`47`	`int connect(const char host, uint16_t port, const char rootCABuff, const char cli_cert, const char cli_key);`
	`48`	`+ int peek();`
`47`	`49`	`size_t write(uint8_t data);`
`48`	`50`	`size_t write(const uint8_t *buf, size_t size);`
`49`	`51`	`int available();`
`50`	`52`	`int read();`
`51`	`53`	`int read(uint8_t *buf, size_t size);`
`52`		`- int peek()`
`53`		`- {`
`54`		`- return 0;`
`55`		`- }`
`56`	`54`	`void flush() {}`
`57`	`55`	`void stop();`
`58`	`56`	`uint8_t connected();`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit febcda0

File tree

2 files changed

2 files changed

`‎libraries/WiFiClientSecure/src/WiFiClientSecure.cpp‎`

`‎libraries/WiFiClientSecure/src/WiFiClientSecure.h‎`

0 commit comments