nfqws: relax stun detector

bol-van · bol-van · commit f0b0d89f02f4 · 2026-02-24T10:13:53.000+03:00
diff --git a/nfq/protocol.c b/nfq/protocol.c
@@ -1017,7 +1017,7 @@ bool IsStunMessage(const uint8_t *data, size_t len)
 {
 	return len>=20 && // header size
 		(data[0]&0xC0)==0 && // 2 most significant bits must be zeroes
-		(data[3]&0b11)==0 && // length must be a multiple of 4
-		ntohl(*(uint32_t*)(&data[4]))==0x2112A442 && // magic cookie
-		ntohs(*(uint16_t*)(&data[2]))==len-20;
+		(data[3]&3)==0 && // length must be a multiple of 4
+		pntoh32(data+4)==0x2112A442 && // magic cookie
+		pntoh16(data+2)<=(len-20);
 }

Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,7 @@ bool IsStunMessage(const uint8_t *data, size_t len)`
`1017`	`1017`	`{`
`1018`	`1018`	`return len>=20 && // header size`
`1019`	`1019`	`(data[0]&0xC0)==0 && // 2 most significant bits must be zeroes`
`1020`		`- (data[3]&0b11)==0 && // length must be a multiple of 4`
`1021`		`- ntohl((uint32_t)(&data[4]))==0x2112A442 && // magic cookie`
`1022`		`- ntohs((uint16_t)(&data[2]))==len-20;`
	`1020`	`+ (data[3]&3)==0 && // length must be a multiple of 4`
	`1021`	`+ pntoh32(data+4)==0x2112A442 && // magic cookie`
	`1022`	`+ pntoh16(data+2)<=(len-20);`
`1023`	`1023`	`}`