bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2026-04-05 17:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

0.1.7 fixes

Browse Source
This commit is contained in:
SJ
2011-11-23 12:24:21 +01:00
parent 84e75fd9cf
commit 072caae0c9
13 changed files with 842 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/rules.c
View File

@@ -15,13 +15,13 @@ void load_archiving_rules(struct session_data *sdata, struct rule **rules){
MYSQL_RES *res;
MYSQL_ROW row;
snprintf(s, sizeof(s)-1, "SELECT `from`, `to`, `subject`, `_size`, `size` FROM `%s`", SQL_ARCHIVING_RULE_TABLE);
snprintf(s, sizeof(s)-1, "SELECT `from`, `to`, `subject`, `_size`, `size`, `attachment_type`, `_attachment_size`, `attachment_size` FROM `%s`", SQL_ARCHIVING_RULE_TABLE);
if(mysql_real_query(&(sdata->mysql), s, strlen(s)) == 0){
res = mysql_store_result(&(sdata->mysql));
if(res != NULL){
while((row = mysql_fetch_row(res))){
append_rule(rules, (char*)row[0], (char*)row[1], (char*)row[2], (char*)row[3], atoi(row[4]));
append_rule(rules, (char*)row[0], (char*)row[1], (char*)row[2], (char*)row[3], atoi(row[4]), (char*)row[5], (char*)row[6], atoi(row[7]));
}
mysql_free_result(res);
@@ -32,7 +32,7 @@ void load_archiving_rules(struct session_data *sdata, struct rule **rules){
}
int append_rule(struct rule **rule, char *from, char *to, char *subject, char *_size, int size){
int append_rule(struct rule **rule, char *from, char *to, char *subject, char *_size, int size, char *attachment_type, char *_attachment_size, int attachment_size){
struct rule *q, *t, *u=NULL;
q = *rule;
@@ -42,7 +42,7 @@ int append_rule(struct rule **rule, char *from, char *to, char *subject, char *_
q = q->r;
}
t = create_rule_item(from, to, subject, _size, size);
t = create_rule_item(from, to, subject, _size, size, attachment_type, _attachment_size, attachment_size);
if(t){
if(*rule == NULL)
*rule = t;
@@ -56,7 +56,7 @@ int append_rule(struct rule **rule, char *from, char *to, char *subject, char *_
}
struct rule *create_rule_item(char *from, char *to, char *subject, char *_size, int size){
struct rule *create_rule_item(char *from, char *to, char *subject, char *_size, int size, char *attachment_type, char *_attachment_size, int attachment_size){
struct rule *h=NULL;
char empty = '\0';
int len;
@@ -81,10 +81,22 @@ struct rule *create_rule_item(char *from, char *to, char *subject, char *_size,
if(!_size) _size = ∅
snprintf(h->_size, 3, "%s", _size);
len = strlen(from)+6 + strlen(to)+4 + strlen(subject)+9 + strlen(_size)+6 + 15;
if(!attachment_type) attachment_type = ∅
if(regcomp(&(h->attachment_type), attachment_type, REG_ICASE | REG_EXTENDED)) h->compiled = 0;
h->attachment_size = attachment_size;
if(!_attachment_size) _attachment_size = ∅
snprintf(h->_attachment_size, 3, "%s", _attachment_size);
len = strlen(from)+6 + strlen(to)+4 + strlen(subject)+9 + strlen(_size)+6 + strlen(attachment_type)+10 + strlen(_attachment_size)+10 + 15 + 15;
h->rulestr = malloc(len);
if(h->rulestr) snprintf(h->rulestr, len-1, "from=%s,to=%s,subject=%s,size%s%d", from, to, subject, _size, size);
if(h->rulestr) snprintf(h->rulestr, len-1, "from=%s,to=%s,subject=%s,size%s%d,att.type=%s,att.size%s%d", from, to, subject, _size, size, attachment_type, _attachment_size, attachment_size);
else h->compiled = 0;
h->r = NULL;
@@ -93,7 +105,7 @@ struct rule *create_rule_item(char *from, char *to, char *subject, char *_size,
}
char *check_againt_ruleset(struct rule *rule, char *from, char *to, char *subject, int size){
char *check_againt_ruleset(struct rule *rule, struct _state *state, int size){
size_t nmatch=0;
struct rule *p;
@@ -103,10 +115,11 @@ char *check_againt_ruleset(struct rule *rule, char *from, char *to, char *subjec
if(
p->compiled == 1 &&
regexec(&(p->from), from, nmatch, NULL, 0) == 0 &&
regexec(&(p->to), to, nmatch, NULL, 0) == 0 &&
regexec(&(p->subject), subject, nmatch, NULL, 0) == 0 &&
check_size_rule(size, p->size, p->_size) == 1
regexec(&(p->from), state->b_from, nmatch, NULL, 0) == 0 &&
regexec(&(p->to), state->b_to, nmatch, NULL, 0) == 0 &&
regexec(&(p->subject), state->b_subject, nmatch, NULL, 0) == 0 &&
check_size_rule(size, p->size, p->_size) == 1 &&
check_attachment_rule(state, p) == 1
){
return p->rulestr;
}
@@ -130,6 +143,23 @@ int check_size_rule(int message_size, int size, char *_size){
}
int check_attachment_rule(struct _state *state, struct rule *rule){
int i;
size_t nmatch=0;
for(i=1; i<=state->n_attachments; i++){
if(
regexec(&(rule->attachment_type), state->attachments[i].type, nmatch, NULL, 0) == 0 &&
check_size_rule(state->attachments[i].size, rule->attachment_size, rule->_attachment_size) == 1
){
return 1;
}
}
return 0;
}
void free_rule(struct rule *rule){
struct rule *p, *q;
@@ -141,6 +171,8 @@ void free_rule(struct rule *rule){
if(p){
regfree(&(p->from));
regfree(&(p->to));
regfree(&(p->attachment_type));
free(p->rulestr);
free(p);