Compare commits

..

No commits in common. "5aa3886eb8b62ae778cc8147df9bbb1e65504203" and "b03cd28dffb2f81298537d8adaf9c4ea979de8f2" have entirely different histories.

2 changed files with 6 additions and 8 deletions

View File

@ -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_filter_data *rule = (struct pcre_filter_data *)fo;
struct pcre_client_data *pcd; struct pcre_client_data *pcd;
*fc = NULL; *fc = fo;
if(!fo) return PASS; if(!fo) return PASS;
if(rule->acl){ if(!rule->acl) return CONTINUE;
memset (&tmpace, 0, sizeof(struct ace)); memset (&tmpace, 0, sizeof(struct ace));
tmpace.src = rule->acl->src; tmpace.src = rule->acl->src;
res = pl->ACLMatches(&tmpace, param); res = pl->ACLMatches(&tmpace, param);
if(!res) return PASS; if(!res) return PASS;
}
/* the connection goes on with a match data of its own */ /* the connection goes on with a match data of its own */
if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){ if(!(pcd = pl->mallocfunc(sizeof(struct pcre_client_data)))){
*fc = NULL; *fc = NULL;

View File

@ -224,7 +224,6 @@ int parsehello(int type, unsigned char *hello, unsigned len, char *sni, int * sn
else if(type == 2){ else if(type == 2){
offset += 3; offset += 3;
} }
if((offset + 2) > len) return -6;
elen = size16(hello+offset); elen = size16(hello+offset);
offset += 2; offset += 2;
if(elen+offset != len) return -9; if(elen+offset != len) return -9;