Merge branch 'master' of https://github.com/AdamJacobMuller/sslsplit into issue/74

This commit is contained in:
Daniel Roethlisberger 2015-03-15 18:28:10 +01:00
commit e17108f9b7
2 changed files with 20 additions and 0 deletions

16
log.c
View File

@ -395,6 +395,22 @@ log_content_format_pathspec(const char *logspec,
elem = addrbuf; elem = addrbuf;
elem_len = strlen(addrbuf); elem_len = strlen(addrbuf);
break; break;
case 'f':
elem = dsthost;
elem_len = strlen(dsthost);
break;
case 'h':
elem = dstport;
elem_len = strlen(dstport);
break;
case 't':
elem = srchost;
elem_len = strlen(srchost);
break;
case 'v':
elem = srcport;
elem_len = strlen(srcport);
break;
case 'x': case 'x':
if (exec_path) { if (exec_path) {
char *match = exec_path; char *match = exec_path;

4
main.c
View File

@ -154,7 +154,11 @@ main_usage(void)
" -F pathspec content log: full data to sep files with %% subst (excl. -L/-S):\n" " -F pathspec content log: full data to sep files with %% subst (excl. -L/-S):\n"
" %%T - initial connection time as an ISO 8601 UTC timestamp\n" " %%T - initial connection time as an ISO 8601 UTC timestamp\n"
" %%d - destination host and port\n" " %%d - destination host and port\n"
" %%f - destination host\n"
" %%h - destination port\n"
" %%s - source host and port\n" " %%s - source host and port\n"
" %%t - source host\n"
" %%v - source port\n"
#ifdef HAVE_LOCAL_PROCINFO #ifdef HAVE_LOCAL_PROCINFO
" %%x - base name of local process (requires -i)\n" " %%x - base name of local process (requires -i)\n"
" %%X - full path to local process (requires -i)\n" " %%X - full path to local process (requires -i)\n"