Rename LogAction to Log

pull/48/head
Soner Tari 3 years ago
parent a3c89fc931
commit 9708225bb1

@ -20,8 +20,8 @@
DstIp (serverip[*]|$macro|*)
DstPort (serverport[*]|$macro|*)
# Multiple LogAction lines allowed
LogAction ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
# Multiple Log lines allowed
Log ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
ReconnectSSL (yes|no)

@ -335,8 +335,8 @@ The syntax of structured filtering rules is as follows:
DstIp (serverip[*]|$macro|*)
DstPort (serverport[*]|$macro|*)
# Multiple LogAction lines allowed
LogAction ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
# Multiple Log lines allowed
Log ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
ReconnectSSL (yes|no)
@ -387,7 +387,7 @@ headers, or `*` for all.
connection.
If and how a connection should be logged is specified using the `log` or
LogAction part of filtering rules:
`Log` part of one line or structured filtering rules, respectively:
- `connect` enables logging connection information to connect log file
- `master` enables logging of master keys

@ -2371,7 +2371,7 @@ filter_rule_struct_translate(filter_rule_t *rule, UNUSED conn_opts_t *conn_opts,
if (filter_port_set(rule, value, line_num) == -1)
return -1;
}
else if (equal(name, "LogAction")) {
else if (equal(name, "Log")) {
if (equal(value, "connect"))
rule->action.log_connect = 2;
else if (equal(value, "master"))
@ -2419,7 +2419,7 @@ filter_rule_struct_translate(filter_rule_t *rule, UNUSED conn_opts_t *conn_opts,
#endif /* !WITHOUT_MIRROR */
}
else {
fprintf(stderr, "Error in conf: Unknown LogAction '%s' on line %d\n", value, line_num);
fprintf(stderr, "Error in conf: Unknown Log '%s' on line %d\n", value, line_num);
return -1;
}
}
@ -2470,7 +2470,7 @@ filter_rule_struct_translate_nvls(opts_t *opts, name_value_lines_t nvls[], int n
}
// Increment precedence for log action only once here, if any specified, because otherwise
// we would inc it multiple times while translating LogAction specifications, since we allow for multiple LogAction lines
// we would inc it multiple times while translating Log specifications, since we allow for multiple Log lines
if (rule->action.log_connect || rule->action.log_master || rule->action.log_cert || rule->action.log_content || rule->action.log_pcap
#ifndef WITHOUT_MIRROR
|| rule->action.log_mirror
@ -2639,8 +2639,8 @@ filter_rule_struct_parse(name_value_lines_t nvls[], int *nvls_size, conn_opts_t
}
parse_state->dstport = 1;
}
else if (equal(name, "LogAction")) {
// LogAction can be used more than once to define multiple log actions, if not using macros
else if (equal(name, "Log")) {
// Log can be used more than once to define multiple log actions, if not using macros
}
else if (equal(name, "ReconnectSSL")) {
int yes = check_value_yesno(value, "ReconnectSSL", line_num);

@ -348,8 +348,8 @@ FilterRule {
DstIp (serverip[*]|$macro|*)
DstPort (serverport[*]|$macro|*)
# Multiple LogAction lines allowed
LogAction ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
# Multiple Log lines allowed
Log ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
ReconnectSSL (yes|no)
@ -401,7 +401,7 @@ headers, or * for all.
connection.
.LP
If and how a connection should be logged is specified using the log or
LogAction part of filtering rules:
Log part of one line or structured filtering rules, respectively:
.LP
- connect enables logging connection information to connect log file
- master enables logging of master keys

@ -337,8 +337,8 @@ PassUsers admin
# DstIp (serverip[*]|$macro|*)
# DstPort (serverport[*]|$macro|*)
#
# # Multiple LogAction lines allowed
# LogAction ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
# # Multiple Log lines allowed
# Log ([!]connect|[!]master|[!]cert|[!]content|[!]pcap|[!]mirror|$macro|[!]*)
#
# ReconnectSSL (yes|no)
#

@ -412,7 +412,7 @@ DstIp
.br
DstPort
.br
LogAction
Log
.br
ReconnectSSL
.br

@ -1646,7 +1646,7 @@ ProxySpec {
SrcIp 127.0.0.1
DstIp 127.0.0.1
DstPort 9212
LogAction connect
Log connect
DenyOCSP yes
Passthrough no
@ -1718,7 +1718,7 @@ ProxySpec {
SrcIp 127.0.0.1
CN comixwall.org
DstPort 9213
LogAction connect
Log connect
# Reconnect srvdst to apply the SSL config in this rule
ReconnectSSL yes

Loading…
Cancel
Save