Commit a5fc13f

committed

SocketWrapper MbedClient debugging readSocket

1 parent 2ece915 commit a5fc13fCopy full SHA for a5fc13f

File tree

1 file changed

+18

-9

lines changed

libraries/SocketWrapper/src
- MbedClient.cpp

1 file changed

+18

-9

lines changed

`‎libraries/SocketWrapper/src/MbedClient.cpp‎`

Lines changed: 18 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,28 +22,31 @@ void arduino::MbedClient::readSocket() {`
`22`	`22`	`int ret = NSAPI_ERROR_WOULD_BLOCK;`
`23`	`23`	`do {`
`24`	`24`	`mutex->lock();`
`25`		`- if (sock != nullptr && rxBuffer.availableForStore() == 0) {`
	`25`	`+ if (sock == nullptr) {`
	`26`	`+ mutex->unlock();`
	`27`	`+ goto cleanup;`
	`28`	`+ }`
	`29`	`+ if (rxBuffer.availableForStore() == 0) {`
`26`	`30`	`mutex->unlock();`
`27`	`31`	`yield();`
`28`	`32`	`continue;`
`29`		`- } else if (sock == nullptr) {`
`30`		`- goto cleanup;`
`31`	`33`	`}`
`32`	`34`	`ret = sock->recv(data, rxBuffer.availableForStore());`
`33`	`35`	`if (ret < 0 && ret != NSAPI_ERROR_WOULD_BLOCK) {`
	`36`	`+ mutex->unlock();`
`34`	`37`	`goto cleanup;`
`35`	`38`	`}`
`36`	`39`	`if (ret == NSAPI_ERROR_WOULD_BLOCK \|\| ret == 0) {`
`37`		`- yield();`
`38`	`40`	`mutex->unlock();`
`39`		`- continue;`
	`41`	`+ yield();`
	`42`	`+ break;`
`40`	`43`	`}`
`41`	`44`	`for (int i = 0; i < ret; i++) {`
`42`	`45`	`rxBuffer.store_char(data[i]);`
`43`	`46`	`}`
`44`	`47`	`mutex->unlock();`
`45`	`48`	`_status = true;`
`46`		`- } while (ret == NSAPI_ERROR_WOULD_BLOCK \|\| ret > 0);`
	`49`	`+ } while (true);`
`47`	`50`	`}`
`48`	`51`	`cleanup:`
`49`	`52`	`_status = false;`
`@@ -98,6 +101,7 @@ int arduino::MbedClient::connect(SocketAddress socketAddress) {`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`if (static_cast<TCPSocket *>(sock)->open(getNetwork()) != NSAPI_ERROR_OK) {`
	`104`	`+ _status = false;`
`101`	`105`	`return 0;`
`102`	`106`	`}`
`103`	`107`
`@@ -117,6 +121,7 @@ int arduino::MbedClient::connect(SocketAddress socketAddress) {`
`117`	`121`	`configureSocket(sock);`
`118`	`122`	`_status = true;`
`119`	`123`	`} else {`
	`124`	`+ sock->close();`
`120`	`125`	`_status = false;`
`121`	`126`	`}`
`122`	`127`
`@@ -148,6 +153,7 @@ int arduino::MbedClient::connectSSL(SocketAddress socketAddress) {`
`148`	`153`	`}`
`149`	`154`
`150`	`155`	`if (static_cast<TLSSocket *>(sock)->open(getNetwork()) != NSAPI_ERROR_OK) {`
	`156`	`+ _status = false;`
`151`	`157`	`return 0;`
`152`	`158`	`}`
`153`	`159`
`@@ -179,6 +185,7 @@ int arduino::MbedClient::connectSSL(SocketAddress socketAddress) {`
`179`	`185`	`configureSocket(sock);`
`180`	`186`	`_status = true;`
`181`	`187`	`} else {`
	`188`	`+ sock->close();`
`182`	`189`	`_status = false;`
`183`	`190`	`}`
`184`	`191`
`@@ -209,12 +216,14 @@ size_t arduino::MbedClient::write(uint8_t c) {`
`209`	`216`	`}`
`210`	`217`
`211`	`218`	`size_t arduino::MbedClient::write(const uint8_t *buf, size_t size) {`
`212`		`- if (sock == nullptr)`
	`219`	`+ if (_status == false)`
`213`	`220`	`return 0;`
`214`	`221`
	`222`	`+ mutex->lock();`
`215`	`223`	`sock->set_timeout(_timeout);`
`216`	`224`	`int ret = sock->send(buf, size);`
`217`	`225`	`sock->set_blocking(false);`
	`226`	`+ mutex->unlock();`
`218`	`227`	`return ret >= 0 ? ret : 0;`
`219`	`228`	`}`
`220`	`229`
`@@ -224,7 +233,7 @@ int arduino::MbedClient::available() {`
`224`	`233`	`}`
`225`	`234`
`226`	`235`	`int arduino::MbedClient::read() {`
`227`		`- if (sock == nullptr)`
	`236`	`+ if (sock == nullptr \|\| mutex == nullptr)`
`228`	`237`	`return -1;`
`229`	`238`	`mutex->lock();`
`230`	`239`	`if (!available()) {`
`@@ -238,7 +247,7 @@ int arduino::MbedClient::read() {`
`238`	`247`	`}`
`239`	`248`
`240`	`249`	`int arduino::MbedClient::read(uint8_t *data, size_t len) {`
`241`		`- if (sock == nullptr)`
	`250`	`+ if (sock == nullptr \|\| mutex == nullptr)`
`242`	`251`	`return 0;`
`243`	`252`	`mutex->lock();`
`244`	`253`	`int avail = available();`

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!

Uh oh!

Commit a5fc13f

File tree

1 file changed

1 file changed

`‎libraries/SocketWrapper/src/MbedClient.cpp‎`

0 commit comments