mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-19 19:40:56 +00:00
Merge commit from fork
fix TCP opt parser
This commit is contained in:
2 files changed
+6
-6
No files matched your search
+3
-3
@@ -9844,9 +9844,9 @@ static bool handle_opt(struct connstate *s, struct tcp *tcp, bool ip6) {
|
|||||||
s->dmss = ip6 ? 1220 : 536; // assume default, RFC-9293 3.7.1
|
s->dmss = ip6 ? 1220 : 536; // assume default, RFC-9293 3.7.1
|
||||||
while (len > 0) { // RFC-9293 3.1 3.2
|
while (len > 0) { // RFC-9293 3.1 3.2
|
||||||
uint8_t kind = opts[0], optlen = 1;
|
uint8_t kind = opts[0], optlen = 1;
|
||||||
if (kind != 1) { // No-Operation
|
if (kind != 1) { // No-Operation
|
||||||
if (kind == 0) break; // End of Option List
|
if (kind == 0) break; // End of Option List
|
||||||
if (len < 2 || opts[1] == 0) return false; // Malformed options
|
if (len < 2 || opts[1] == 0 || opts[1] > len) return false; // Malformed
|
||||||
optlen = opts[1];
|
optlen = opts[1];
|
||||||
if (kind == 2 && optlen == 4) // set received MSS
|
if (kind == 2 && optlen == 4) // set received MSS
|
||||||
s->dmss = (uint16_t) (((uint16_t) opts[2] << 8) + opts[3]);
|
s->dmss = (uint16_t) (((uint16_t) opts[2] << 8) + opts[3]);
|
||||||
|
|||||||
+3
-3
@@ -1608,9 +1608,9 @@ static bool handle_opt(struct connstate *s, struct tcp *tcp, bool ip6) {
|
|||||||
s->dmss = ip6 ? 1220 : 536; // assume default, RFC-9293 3.7.1
|
s->dmss = ip6 ? 1220 : 536; // assume default, RFC-9293 3.7.1
|
||||||
while (len > 0) { // RFC-9293 3.1 3.2
|
while (len > 0) { // RFC-9293 3.1 3.2
|
||||||
uint8_t kind = opts[0], optlen = 1;
|
uint8_t kind = opts[0], optlen = 1;
|
||||||
if (kind != 1) { // No-Operation
|
if (kind != 1) { // No-Operation
|
||||||
if (kind == 0) break; // End of Option List
|
if (kind == 0) break; // End of Option List
|
||||||
if (len < 2 || opts[1] == 0) return false; // Malformed options
|
if (len < 2 || opts[1] == 0 || opts[1] > len) return false; // Malformed
|
||||||
optlen = opts[1];
|
optlen = opts[1];
|
||||||
if (kind == 2 && optlen == 4) // set received MSS
|
if (kind == 2 && optlen == 4) // set received MSS
|
||||||
s->dmss = (uint16_t) (((uint16_t) opts[2] << 8) + opts[3]);
|
s->dmss = (uint16_t) (((uint16_t) opts[2] << 8) + opts[3]);
|
||||||
|
|||||||
Reference in new issue
Block a user