@@ -57,12 +57,11 @@ void websocket_parser_settings_init(websocket_parser_settings *settings) {
5757size_t websocket_parser_execute (websocket_parser * parser , const websocket_parser_settings * settings , const char * data , size_t len ) {
5858 const char * p ;
5959 const char * end = data + len ;
60- size_t header_size = 0 ;
60+ size_t frame_offset = 0 ;
6161
6262 for (p = data ; p != end ; p ++ ) {
6363 switch (parser -> state ) {
6464 case s_start :
65- // header_size = 0;
6665 parser -> offset = 0 ;
6766 parser -> length = 0 ;
6867 parser -> mask_offset = 0 ;
@@ -72,7 +71,7 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
7271 }
7372 SET_STATE (s_head );
7473
75- header_size ++ ;
74+ frame_offset ++ ;
7675 break ;
7776 case s_head :
7877 parser -> length = (size_t )CC & 0x7F ;
@@ -100,14 +99,14 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
10099 NOTIFY_CB (frame_end );
101100 }
102101
103- header_size ++ ;
102+ frame_offset ++ ;
104103 break ;
105104 case s_length :
106105 while (HAS_DATA () && parser -> require ) {
107106 parser -> length <<= 8 ;
108107 parser -> length |= (unsigned char )CC ;
109108 parser -> require -- ;
110- header_size ++ ;
109+ frame_offset ++ ;
111110 p ++ ;
112111 }
113112 p -- ;
@@ -129,7 +128,7 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
129128 case s_mask :
130129 while (HAS_DATA () && parser -> require ) {
131130 parser -> mask [4 - parser -> require -- ] = CC ;
132- header_size ++ ;
131+ frame_offset ++ ;
133132 p ++ ;
134133 }
135134 p -- ;
@@ -151,13 +150,13 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
151150 EMIT_DATA_CB (frame_body , p , parser -> require );
152151 p += parser -> require ;
153152 parser -> require = 0 ;
154- header_size = p - data ;
153+ frame_offset = p - data ;
155154 } else {
156155 EMIT_DATA_CB (frame_body , p , end - p );
157156 parser -> require -= end - p ;
158157 p = end ;
159- parser -> offset += p - data - header_size ;
160- header_size = 0 ;
158+ parser -> offset += p - data - frame_offset ;
159+ frame_offset = 0 ;
161160 }
162161
163162 p -- ;
0 commit comments