Changeset 148 for uKadecot/trunk/uip/apps/webserver/websocket.c

Timestamp:

Jan 8, 2016, 2:35:52 PM (8 years ago)

Author:

coas-nagasima

Message:

メッセージバッファ領域がなくなったときにWebSocketパケットを誤って処理してしまうのを修正。
Ethernet送信バッファが取れないときにパケットが送信できなかったのを修正。
その他、処理の安定性の向上。

File:

• uKadecot/trunk/uip/apps/webserver/websocket.c (modified) (2 diffs)

uKadecot/trunk/uip/apps/webserver/websocket.c

@@ -127 +127 @@
                 // Payload buffer
                 default:
-                        _ecn_fbs_poke(ws->cur_in_msg, s->data_pos, *pos ^ s->masking_key[s->data_pos % 4]);
+                        if(ws->cur_in_msg.ptr != NULL)
+                                _ecn_fbs_poke(ws->cur_in_msg, s->data_pos, *pos ^ s->masking_key[s->data_pos % 4]);
 
                         s->data_pos++;
@@ -133 +134 @@
                                 ER ret;
                                 s->state = 0;
-                                ((ID *)ws->cur_in_msg.ptr->_gap)[0] = ws->wbsid;
-                                ret = psnd_dtq(ecn_api_mailboxid, (intptr_t)ws->cur_in_msg.ptr);
-                                if (ret != E_OK) {
-                                        syslog(LOG_WARNING, "websocket_input() : psnd_dtq(%d) result = %d", ecn_api_mailboxid, ret);
-                                        _ecn_fbs_del(ws->cur_in_msg);
+
+                                if (ws->cur_in_msg.ptr != NULL) {
+                                        ((ID *)ws->cur_in_msg.ptr->_gap)[0] = ws->wbsid;
+                                        ret = psnd_dtq(ecn_api_mailboxid, (intptr_t)ws->cur_in_msg.ptr);
+                                        if (ret != E_OK) {
+                                                syslog(LOG_WARNING, "websocket_input() : psnd_dtq(%d) result = %d", ecn_api_mailboxid, ret);
+                                                _ecn_fbs_del(ws->cur_in_msg);
+                                        }
                                 }
                                 memset(&ws->cur_in_msg, 0, sizeof(ws->cur_in_msg));