Merge branch 'devel'

ofalk · ofalk · commit 5906d359a179 · 2022-05-02T08:43:21.000+02:00
diff --git a/test/dnet/aton.c b/test/dnet/aton.c
@@ -86,7 +86,7 @@ off_aton(char *string, uint16_t *off)
 	} else {
 		i = strtol(string, &p, 10);
 		if (*string == '\0' || (*p != '\0' && *p != '+') ||
-		    i > IP_OFFMASK)
+		    i > (IP_OFFMASK << 3))
 			return (-1);
 		*off = htons(((*p == '+') ? IP_MF : 0) | (i >> 3));
 	}

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ off_aton(char string, uint16_t off)`
`86`	`86`	`} else {`
`87`	`87`	`i = strtol(string, &p, 10);`
`88`	`88`	`if (string == '\0' \|\| (p != '\0' && *p != '+') \|\|`
`89`		`- i > IP_OFFMASK)`
	`89`	`+ i > (IP_OFFMASK << 3))`
`90`	`90`	`return (-1);`
`91`	`91`	`off = htons(((p == '+') ? IP_MF : 0) \| (i >> 3));`
`92`	`92`	`}`