Changeset 279 for EcnlProtoTool/trunk/ntshell/webserver/websocket.c

Timestamp:

Apr 29, 2017, 4:33:37 PM (7 years ago)

Author:

coas-nagasima

Message:

ファイルを追加、更新。

File:

• EcnlProtoTool/trunk/ntshell/webserver/websocket.c (modified) (10 diffs)

EcnlProtoTool/trunk/ntshell/webserver/websocket.c

@@ -57 +57 @@
 #include "syssvc/syslog.h"
 
-static ECN_FBS_ID cur_out_msg;
+static WS_FBS_ID cur_out_msg;
 
 void websocket_init(struct websocket *ws, ID wbsid)
@@ -69 +69 @@
         if ((cur_out_msg.ptr != NULL) && (((ID *)cur_out_msg.ptr->_gap)[0] == ws->wbsid))
         {
-                _ecn_fbs_del(cur_out_msg);
+                _ws_fbs_del(cur_out_msg);
                 memset(&cur_out_msg, 0, sizeof(cur_out_msg));
         }
 
         if (ws->cur_in_msg.ptr != NULL) {
-                _ecn_fbs_del(ws->cur_in_msg);
+                _ws_fbs_del(ws->cur_in_msg);
                 memset(&ws->cur_in_msg, 0, sizeof(ws->cur_in_msg));
         }
@@ -136 +136 @@
                         }
                         else {
-                                _ecn_fbs_cre(1, &ws->cur_in_msg);
+                                _ws_fbs_cre(1, &ws->cur_in_msg);
                                 s->state++;
                         }
@@ -143 +143 @@
                 default:
                         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]);
+                                _ws_fbs_poke(ws->cur_in_msg, s->data_pos, *pos ^ s->masking_key[s->data_pos % 4]);
 
                         s->data_pos++;
@@ -152 +152 @@
                                 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);
+                                        ret = psnd_dtq(ws_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);
+                                                syslog(LOG_WARNING, "websocket_input() : psnd_dtq(%d) result = %d", ws_api_mailboxid, ret);
+                                                _ws_fbs_del(ws->cur_in_msg);
                                         }
                                 }
@@ -172 +172 @@
         struct websocket *mws;
         ER ret;
-        ECN_FBS_ID data;
+        WS_FBS_ID data;
         ID wbsid;
 
@@ -196 +196 @@
                         break;
 
-                _ecn_fbs_del(cur_out_msg);
+                _ws_fbs_del(cur_out_msg);
         }
 
@@ -217 +217 @@
                                 return (intptr_t)pos - (intptr_t)data;
 
-                        s->payload_len = _ecn_fbs_get_datalen(cur_out_msg);
+                        s->payload_len = _ws_fbs_get_datalen(cur_out_msg);
                         if(s->payload_len == 0){
                                 goto next;
@@ -281 +281 @@
                 // Payload buffer
                 default:
-                        *pos = _ecn_fbs_peek(cur_out_msg, s->data_pos) ^ s->masking_key[s->data_pos % 4];
+                        *pos = _ws_fbs_peek(cur_out_msg, s->data_pos) ^ s->masking_key[s->data_pos % 4];
 
                         s->data_pos++;
@@ -289 +289 @@
                         break;
                 next:
-                        _ecn_fbs_del(cur_out_msg);
+                        _ws_fbs_del(cur_out_msg);
                         memset(&cur_out_msg, 0, sizeof(cur_out_msg));
                         s->state = 0;