bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 06:40:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

parser reference fix

Browse Source 
Change-Id: I9c074b2512972f25f260477e5ba751c727d35a18
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-08-21 09:10:13 +02:00
parent d87dc6847c
commit 783ffb96c7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/session.c
View File

@ -22,7 +22,7 @@
int is_blocked_by_tcp_wrappers(int sd); int is_blocked_by_tcp_wrappers(int sd);
void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg); void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg);
void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg); void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg);
void process_data(struct session_ctx *sctx, struct session_data *sdata, struct parser_state *parser_state, struct __config *cfg); void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg);
int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
@ -442,7 +442,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
#endif #endif
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i);
process_data(sctx, sdata, &parser_state, cfg); process_data(sctx, sdata, cfg);
send_response_to_data(sctx, sdata, sdata->rcptto[i], cfg); send_response_to_data(sctx, sdata, sdata->rcptto[i], cfg);
@ -455,9 +455,9 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
syslog(LOG_PRIORITY, "%s: from=%s, size=%d/%d, attachments=%d, reference=%s, message-id=%s, retention=%d, folder=%d, %s, status=%s", syslog(LOG_PRIORITY, "%s: from=%s, size=%d/%d, attachments=%d, reference=%s, message-id=%s, retention=%d, folder=%d, %s, status=%s",
sdata->ttmpfile, sdata->fromemail, sdata->tot_len, sdata->ttmpfile, sdata->fromemail, sdata->tot_len,
sdata->stored_len, parser_state.n_attachments, sdata->stored_len, sctx->parser_state->n_attachments,
parser_state.reference, parser_state.message_id, sctx->parser_state->reference, sctx->parser_state->message_id,
parser_state.retention, sctx->data->folder, delay, sctx->status); sctx->parser_state->retention, sctx->data->folder, delay, sctx->status);
#ifdef HAVE_LMTP #ifdef HAVE_LMTP
} /* for */ } /* for */
@ -467,7 +467,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
} }
void process_data(struct session_ctx *sctx, struct session_data *sdata, struct parser_state *parser_state, struct __config *cfg){ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg){
char *arule = NULL; char *arule = NULL;
char virusinfo[SMALLBUFSIZE]; char virusinfo[SMALLBUFSIZE];
@ -496,20 +496,20 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct p
/* check message against archiving rules */ /* check message against archiving rules */
arule = check_againt_ruleset(sctx->data->archiving_rules, parser_state, sdata->tot_len, sdata->spam_message); arule = check_againt_ruleset(sctx->data->archiving_rules, sctx->parser_state, sdata->tot_len, sdata->spam_message);
if(arule){ if(arule){
syslog(LOG_PRIORITY, "%s: discarding: archiving policy: *%s*", sdata->ttmpfile, arule); syslog(LOG_PRIORITY, "%s: discarding: archiving policy: *%s*", sdata->ttmpfile, arule);
sctx->inj = OK; sctx->inj = OK;
sctx->counters->c_ignore++; sctx->counters->c_ignore++;
remove_stripped_attachments(parser_state); remove_stripped_attachments(sctx->parser_state);
sctx->status = S_STATUS_DISCARDED; sctx->status = S_STATUS_DISCARDED;
} }
else { else {
sctx->inj = process_message(sdata, parser_state, sctx->data, cfg); sctx->inj = process_message(sdata, sctx->parser_state, sctx->data, cfg);
unlink(parser_state->message_id_hash); unlink(sctx->parser_state->message_id_hash);
sctx->counters->c_size += sdata->tot_len; sctx->counters->c_size += sdata->tot_len;
sctx->counters->c_stored_size = sdata->stored_len; sctx->counters->c_stored_size = sdata->stored_len;