private fork
Fork of GSwifiInterface by
Diff: GSwifi/GSwifi_msg.cpp
- Revision:
- 15:086d1a33a197
- Parent:
- 14:1e89a3f0282d
- Child:
- 16:105b56570533
diff -r 1e89a3f0282d -r 086d1a33a197 GSwifi/GSwifi_msg.cpp --- a/GSwifi/GSwifi_msg.cpp Fri Jan 10 14:23:33 2014 +0000 +++ b/GSwifi/GSwifi_msg.cpp Thu Jan 30 15:10:14 2014 +0000 @@ -27,10 +27,10 @@ static int cid, sub, len, count; #ifdef DEBUG_DUMP - if (c < 0x20) { - DBG("%02x_", c); + if (c < 0x20 || c >= 0x7f) { + std::printf("_%02x", c); } else { - DBG("%c_", c); + std::printf("_%c", c); } #endif switch (_state.mode) { @@ -60,9 +60,9 @@ case 0x0d: // CR // _state.buf->queue(c); if (_flow == 2) setRts(false); + _state.mode = MODE_COMMAND; parseMessage(); if (_flow == 2) setRts(true); - _state.mode = MODE_COMMAND; break; case 0x1b: // ESC _state.mode = MODE_ESCAPE; @@ -363,6 +363,15 @@ _con[acid].parent = cid; _con[acid].func = _con[cid].func; _con[acid].accept = true; + +#ifdef CFG_ENABLE_HTTPD + if (_con[acid].protocol == PROTO_HTTPD) { + _httpd[acid].mode = HTTPDMODE_REQUEST; +#ifdef CFG_ENABLE_WEBSOCKET + _httpd[acid].websocket = 0; +#endif + } +#endif } void GSwifi::msgDisconnect (const char *buf) {