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

digest fixes

Browse Source
This commit is contained in:
SJ 2011-12-09 15:24:15 +01:00
parent 64dd86e169
commit b58ff0886b
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/digest.c
View File

@ -15,8 +15,8 @@
int make_body_digest(struct session_data *sdata, struct __config *cfg){ int make_body_digest(struct session_data *sdata, struct __config *cfg){
int i=0, n, fd, hdr_len=0, offset=3; int i=0, n, fd, offset=3;
char *body=NULL; char *p, *body=NULL;
unsigned char buf[BIGBUFSIZE], md[DIGEST_LENGTH]; unsigned char buf[BIGBUFSIZE], md[DIGEST_LENGTH];
SHA256_CTX context; SHA256_CTX context;
@ -29,25 +29,27 @@ int make_body_digest(struct session_data *sdata, struct __config *cfg){
if(fd == -1) return -1; if(fd == -1) return -1;
while((n = read(fd, buf, sizeof(buf))) > 0){ while((n = read(fd, buf, sizeof(buf))) > 0){
body = (char *)&buf[0]; body = (char *)&buf[0];
if(i == 0){ if(i == 0){
hdr_len = searchStringInBuffer(body, sizeof(buf), "\n\r\n", 3); p = strstr(body, "\n\r\n");
if(hdr_len == 0){ if(!p){
searchStringInBuffer(body, sizeof(buf), "\n\n", 2); p = strstr(body, "\n\n");
offset = 2; if(p){
offset = 2;
}
} }
if(hdr_len > 0){ if(p){
hdr_len += offset; sdata->hdr_len = p - body + offset;
body += sdata->hdr_len;
sdata->hdr_len = hdr_len; n -= sdata->hdr_len;
body += hdr_len; if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: hdr_len: %d, offset: %d", sdata->ttmpfile, sdata->hdr_len, offset);
n -= hdr_len;
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: hdr_len: %d, offset: %d", sdata->ttmpfile, hdr_len, offset);
} }
} }

3
src/parser_utils.c
View File

@ -468,7 +468,8 @@ void translateLine(unsigned char *p, struct _state *state){
if(delimiter_characters[(unsigned int)*p] != ' ') if(delimiter_characters[(unsigned int)*p] != ' ')
*p = ' '; *p = ' ';
else { else {
*p = tolower(*p); // commented out because it breaks utf-8 encoding, 2011.12.07.
//*p = tolower(*p);
} }
} }

1
src/session.c
View File

@ -54,6 +54,7 @@ void handle_smtp_session(int new_sd, struct __data *data, struct __config *cfg){
if(mysql_real_connect(&(sdata.mysql), cfg->mysqlhost, cfg->mysqluser, cfg->mysqlpwd, cfg->mysqldb, cfg->mysqlport, cfg->mysqlsocket, 0)){ if(mysql_real_connect(&(sdata.mysql), cfg->mysqlhost, cfg->mysqluser, cfg->mysqlpwd, cfg->mysqldb, cfg->mysqlport, cfg->mysqlsocket, 0)){
db_conn = 1; db_conn = 1;
mysql_real_query(&(sdata.mysql), "SET NAMES utf8", strlen("SET NAMES utf8")); mysql_real_query(&(sdata.mysql), "SET NAMES utf8", strlen("SET NAMES utf8"));
mysql_real_query(&(sdata.mysql), "SET CHARACTER SET utf8", strlen("SET CHARACTER SET utf8"));
} }
else else
syslog(LOG_PRIORITY, "%s", ERR_MYSQL_CONNECT); syslog(LOG_PRIORITY, "%s", ERR_MYSQL_CONNECT);