diff options
| author | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2019-01-15 04:49:51 +0000 |
|---|---|---|
| committer | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2019-01-15 04:49:51 +0000 |
| commit | 33e80c64be4268e7bdea11dcbe5473628e3d987b (patch) | |
| tree | 4c1df2c4ab5f35e2110d7e27fdf00a90a34f2f1e /usr.sbin | |
| parent | 0a1dbaab65cf546b7cb85fbb6980b9392da263d9 (diff) | |
Swap 'token' and 'id' place in filter protocol.
This allows to consistently extract 'id' from both 'report' and
'filter' lines.
Ok gilles@ jung@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/lka_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c index eeba23e2453..a10d9cbe72f 100644 --- a/usr.sbin/smtpd/lka_filter.c +++ b/usr.sbin/smtpd/lka_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka_filter.c,v 1.33 2018/12/26 15:55:09 eric Exp $ */ +/* $OpenBSD: lka_filter.c,v 1.34 2019/01/15 04:49:50 sunil Exp $ */ /* * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org> @@ -729,13 +729,13 @@ filter_protocol_query(struct filter *filter, uint64_t token, uint64_t reqid, con "filter|%d|%zd|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s|%s\n", PROTOCOL_VERSION, tm, - phase, token, reqid, fs->rdns, param); + phase, reqid, token, fs->rdns, param); else n = io_printf(lka_proc_get_io(filter->proc), "filter|%d|%zd|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s\n", PROTOCOL_VERSION, tm, - phase, token, reqid, param); + phase, reqid, token, param); if (n == -1) fatalx("failed to write to processor"); } @@ -751,7 +751,7 @@ filter_data_query(struct filter *filter, uint64_t token, uint64_t reqid, const c "filter|%d|%zd|smtp-in|data-line|" "%016"PRIx64"|%016"PRIx64"|%s\n", PROTOCOL_VERSION, - tm, token, reqid, line); + tm, reqid, token, line); if (n == -1) fatalx("failed to write to processor"); } |