@@ -57,12 +57,11 @@ void websocket_parser_settings_init(websocket_parser_settings *settings) {
57
57
size_t websocket_parser_execute (websocket_parser * parser , const websocket_parser_settings * settings , const char * data , size_t len ) {
58
58
const char * p ;
59
59
const char * end = data + len ;
60
- size_t header_size = 0 ;
60
+ size_t frame_offset = 0 ;
61
61
62
62
for (p = data ; p != end ; p ++ ) {
63
63
switch (parser -> state ) {
64
64
case s_start :
65
- // header_size = 0;
66
65
parser -> offset = 0 ;
67
66
parser -> length = 0 ;
68
67
parser -> mask_offset = 0 ;
@@ -72,7 +71,7 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
72
71
}
73
72
SET_STATE (s_head );
74
73
75
- header_size ++ ;
74
+ frame_offset ++ ;
76
75
break ;
77
76
case s_head :
78
77
parser -> length = (size_t )CC & 0x7F ;
@@ -100,14 +99,14 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
100
99
NOTIFY_CB (frame_end );
101
100
}
102
101
103
- header_size ++ ;
102
+ frame_offset ++ ;
104
103
break ;
105
104
case s_length :
106
105
while (HAS_DATA () && parser -> require ) {
107
106
parser -> length <<= 8 ;
108
107
parser -> length |= (unsigned char )CC ;
109
108
parser -> require -- ;
110
- header_size ++ ;
109
+ frame_offset ++ ;
111
110
p ++ ;
112
111
}
113
112
p -- ;
@@ -129,7 +128,7 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
129
128
case s_mask :
130
129
while (HAS_DATA () && parser -> require ) {
131
130
parser -> mask [4 - parser -> require -- ] = CC ;
132
- header_size ++ ;
131
+ frame_offset ++ ;
133
132
p ++ ;
134
133
}
135
134
p -- ;
@@ -151,13 +150,13 @@ size_t websocket_parser_execute(websocket_parser *parser, const websocket_parser
151
150
EMIT_DATA_CB (frame_body , p , parser -> require );
152
151
p += parser -> require ;
153
152
parser -> require = 0 ;
154
- header_size = p - data ;
153
+ frame_offset = p - data ;
155
154
} else {
156
155
EMIT_DATA_CB (frame_body , p , end - p );
157
156
parser -> require -= end - p ;
158
157
p = end ;
159
- parser -> offset += p - data - header_size ;
160
- header_size = 0 ;
158
+ parser -> offset += p - data - frame_offset ;
159
+ frame_offset = 0 ;
161
160
}
162
161
163
162
p -- ;
0 commit comments