mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-16 06:05:50 +08:00
Compare commits
No commits in common. "5aa3886eb8b62ae778cc8147df9bbb1e65504203" and "b03cd28dffb2f81298537d8adaf9c4ea979de8f2" have entirely different histories.
5aa3886eb8
...
b03cd28dff
13
src/pcre.c
13
src/pcre.c
@ -264,14 +264,13 @@ static FILTER_ACTION pcre_filter_client(void *fo, struct clientparam * param, vo
|
||||
struct pcre_filter_data *rule = (struct pcre_filter_data *)fo;
|
||||
struct pcre_client_data *pcd;
|
||||
|
||||
*fc = NULL;
|
||||
*fc = fo;
|
||||
if(!fo) return PASS;
|
||||
if(rule->acl){
|
||||
memset (&tmpace, 0, sizeof(struct ace));
|
||||
tmpace.src = rule->acl->src;
|
||||
res = pl->ACLMatches(&tmpace, param);
|
||||
if(!res) return PASS;
|
||||
}
|
||||
if(!rule->acl) return CONTINUE;
|
||||
memset (&tmpace, 0, sizeof(struct ace));
|
||||
tmpace.src = rule->acl->src;
|
||||
res = pl->ACLMatches(&tmpace, param);
|
||||
if(!res) return PASS;
|
||||
/* the connection goes on with a match data of its own */
|
||||
if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){
|
||||
*fc = NULL;
|
||||
|
||||
@ -224,7 +224,6 @@ int parsehello(int type, unsigned char *hello, unsigned len, char *sni, int * sn
|
||||
else if(type == 2){
|
||||
offset += 3;
|
||||
}
|
||||
if((offset + 2) > len) return -6;
|
||||
elen = size16(hello+offset);
|
||||
offset += 2;
|
||||
if(elen+offset != len) return -9;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user