bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added regular expression for IPv6 scope identifier to re for IPv6 address.

Browse Source
This commit is contained in:
Mario Klebsch 2023-05-04 15:21:58 +02:00
parent ecc16aaf40
commit f301254743
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf.c
View File

@ -66,9 +66,10 @@
#define PASSWORD "([^@]*)" #define PASSWORD "([^@]*)"
#define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})" #define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})"
#define IPMASK "(" IP "(/" DIGIT "+)?)" #define IPMASK "(" IP "(/" DIGIT "+)?)"
#define IPV6_SCOPE "((%[^ \\t\\/]{1,16})?)"
#define IPV6 "(" \ #define IPV6 "(" \
"(([0-9a-f:]{2,39}))|" \ "([0-9a-f:]{2,39})" IPV6_SCOPE "|" \
"(([0-9a-f:]{0,29}:" IP "))" \ "([0-9a-f:]{0,29}:" IP ")" IPV6_SCOPE \
")" ")"
#define IPV6MASK "(" IPV6 "(/" DIGIT "+)?)" #define IPV6MASK "(" IPV6 "(/" DIGIT "+)?)"
@ -1120,7 +1121,7 @@ static HANDLE_FUNC (handle_upstream)
ip = get_string_arg (line, &match[mi]); ip = get_string_arg (line, &match[mi]);
if (!ip) if (!ip)
return -1; return -1;
mi += 14; mi += 16;
port = (int) get_long_arg (line, &match[mi]); port = (int) get_long_arg (line, &match[mi]);
mi += 3; mi += 3;