Merge 6aec9d62ef0f7521a99a9e9aadc064a11812fcf7 into 1024386831c8ee4e0ae24026fa932771bf369fe9

This commit is contained in:
Tim Rühsen 2026-05-31 13:59:03 +02:00 committed by GitHub
commit 7d2a468f07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1419,6 +1419,9 @@ char *convert_6to4(const char *s)
b = 0;
}
if (a > 0xFFFF || b > 0xFFFF)
return strdup("0.0.0.0");
new = malloc(sizeof("255.255.255.255"));
sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);
@ -1435,6 +1438,10 @@ char *convert_teredo(const char *s)
a ^= 0xffff;
b ^= 0xffff;
if (a > 0xFFFF || b > 0xFFFF)
return strdup("0.0.0.0");
new = malloc(sizeof("255.255.255.255"));
sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);