Added more liberty to upstream username, too
This commit is contained in:
parent
efde2796a0
commit
1b26dc1128
@ -52,7 +52,8 @@
|
||||
#define BOOL "(yes|on|no|off)"
|
||||
#define INT "((0x)?[[:digit:]]+)"
|
||||
#define ALNUM "([-a-z0-9._]+)"
|
||||
#define PASSWORD "([^:@]*)"
|
||||
#define USERNAME "([^:]*)"
|
||||
#define PASSWORD "([^@]*)"
|
||||
#define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})"
|
||||
#define IPMASK "(" IP "(/[[:digit:]]+)?)"
|
||||
#define IPV6 "(" \
|
||||
@ -258,7 +259,7 @@ struct {
|
||||
},
|
||||
{
|
||||
BEGIN "(upstream)" WS "(http|socks4|socks5)" WS
|
||||
"(" ALNUM /*username*/ ":" PASSWORD /*password*/ "@" ")?"
|
||||
"(" USERNAME /*username*/ ":" PASSWORD /*password*/ "@" ")?"
|
||||
"(" IP "|" ALNUM ")"
|
||||
":" INT "(" WS STR ")?"
|
||||
END, handle_upstream, NULL
|
||||
|
Loading…
Reference in New Issue
Block a user