summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/smtpd/lka.c12
-rw-r--r--usr.sbin/smtpd/lka_filter.c12
-rw-r--r--usr.sbin/smtpd/pony.c6
-rw-r--r--usr.sbin/smtpd/smtp.c6
-rw-r--r--usr.sbin/smtpd/smtp_session.c16
-rw-r--r--usr.sbin/smtpd/smtpd.c12
-rw-r--r--usr.sbin/smtpd/smtpd.h12
7 files changed, 38 insertions, 38 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 13fb8faf5b4..ba55e43ebb8 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.224 2018/12/11 13:29:52 gilles Exp $ */
+/* $OpenBSD: lka.c,v 1.225 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -576,7 +576,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
return;
- case IMSG_SMTP_FILTER_PROTOCOL:
+ case IMSG_FILTER_SMTP_PROTOCOL:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_get_int(&m, &filter_phase);
@@ -586,7 +586,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
lka_filter_protocol(reqid, filter_phase, filter_param);
return;
- case IMSG_SMTP_FILTER_BEGIN:
+ case IMSG_FILTER_SMTP_BEGIN:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_get_sockaddr(&m, (struct sockaddr *)&ss_src);
@@ -598,7 +598,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
lka_filter_begin(reqid, &ss_src, &ss_dest, rdns, fcrdns);
return;
- case IMSG_SMTP_FILTER_END:
+ case IMSG_FILTER_SMTP_END:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_end(&m);
@@ -606,7 +606,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
lka_filter_end(reqid);
return;
- case IMSG_SMTP_FILTER_DATA_BEGIN:
+ case IMSG_FILTER_SMTP_DATA_BEGIN:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_end(&m);
@@ -614,7 +614,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
lka_filter_data_begin(reqid);
return;
- case IMSG_SMTP_FILTER_DATA_END:
+ case IMSG_FILTER_SMTP_DATA_END:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_end(&m);
diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c
index 18116b928f8..bcb870dee17 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.13 2018/12/09 21:43:46 gilles Exp $ */
+/* $OpenBSD: lka_filter.c,v 1.14 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2018 Gilles Chehade <gilles@poolp.org>
@@ -140,7 +140,7 @@ lka_filter_data_begin(uint64_t reqid)
io_set_callback(fs->io, filter_session_io, fs);
end:
- m_create(p_pony, IMSG_SMTP_FILTER_DATA_BEGIN, 0, 0, fd);
+ m_create(p_pony, IMSG_FILTER_SMTP_DATA_BEGIN, 0, 0, fd);
m_add_id(p_pony, reqid);
m_add_int(p_pony, fd != -1 ? 1 : 0);
m_close(p_pony);
@@ -366,7 +366,7 @@ filter_write_dataline(const char *name, uint64_t reqid, const char *line)
static void
filter_proceed(uint64_t reqid)
{
- m_create(p_pony, IMSG_SMTP_FILTER_PROTOCOL, 0, 0, -1);
+ m_create(p_pony, IMSG_FILTER_SMTP_PROTOCOL, 0, 0, -1);
m_add_id(p_pony, reqid);
m_add_int(p_pony, FILTER_PROCEED);
m_close(p_pony);
@@ -375,7 +375,7 @@ filter_proceed(uint64_t reqid)
static void
filter_rewrite(uint64_t reqid, const char *param)
{
- m_create(p_pony, IMSG_SMTP_FILTER_PROTOCOL, 0, 0, -1);
+ m_create(p_pony, IMSG_FILTER_SMTP_PROTOCOL, 0, 0, -1);
m_add_id(p_pony, reqid);
m_add_int(p_pony, FILTER_REWRITE);
m_add_string(p_pony, param);
@@ -385,7 +385,7 @@ filter_rewrite(uint64_t reqid, const char *param)
static void
filter_reject(uint64_t reqid, const char *message)
{
- m_create(p_pony, IMSG_SMTP_FILTER_PROTOCOL, 0, 0, -1);
+ m_create(p_pony, IMSG_FILTER_SMTP_PROTOCOL, 0, 0, -1);
m_add_id(p_pony, reqid);
m_add_int(p_pony, FILTER_REJECT);
m_add_string(p_pony, message);
@@ -395,7 +395,7 @@ filter_reject(uint64_t reqid, const char *message)
static void
filter_disconnect(uint64_t reqid, const char *message)
{
- m_create(p_pony, IMSG_SMTP_FILTER_PROTOCOL, 0, 0, -1);
+ m_create(p_pony, IMSG_FILTER_SMTP_PROTOCOL, 0, 0, -1);
m_add_id(p_pony, reqid);
m_add_int(p_pony, FILTER_DISCONNECT);
m_add_string(p_pony, message);
diff --git a/usr.sbin/smtpd/pony.c b/usr.sbin/smtpd/pony.c
index 92d10cdf39c..abbde55e730 100644
--- a/usr.sbin/smtpd/pony.c
+++ b/usr.sbin/smtpd/pony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pony.c,v 1.24 2018/12/07 08:05:59 eric Exp $ */
+/* $OpenBSD: pony.c,v 1.25 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2014 Gilles Chehade <gilles@poolp.org>
@@ -96,8 +96,8 @@ pony_imsg(struct mproc *p, struct imsg *imsg)
case IMSG_SMTP_MESSAGE_COMMIT:
case IMSG_SMTP_MESSAGE_CREATE:
case IMSG_SMTP_MESSAGE_OPEN:
- case IMSG_SMTP_FILTER_PROTOCOL:
- case IMSG_SMTP_FILTER_DATA_BEGIN:
+ case IMSG_FILTER_SMTP_PROTOCOL:
+ case IMSG_FILTER_SMTP_DATA_BEGIN:
case IMSG_QUEUE_ENVELOPE_SUBMIT:
case IMSG_QUEUE_ENVELOPE_COMMIT:
case IMSG_QUEUE_SMTP_SESSION:
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index 05a5f1e29bf..61c99e5a32a 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.162 2018/12/06 12:09:50 gilles Exp $ */
+/* $OpenBSD: smtp.c,v 1.163 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -68,8 +68,8 @@ smtp_imsg(struct mproc *p, struct imsg *imsg)
case IMSG_SMTP_AUTHENTICATE:
case IMSG_SMTP_TLS_INIT:
case IMSG_SMTP_TLS_VERIFY:
- case IMSG_SMTP_FILTER_PROTOCOL:
- case IMSG_SMTP_FILTER_DATA_BEGIN:
+ case IMSG_FILTER_SMTP_PROTOCOL:
+ case IMSG_FILTER_SMTP_DATA_BEGIN:
smtp_session_imsg(p, imsg);
return;
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index d8c9ea5a463..3b7902138a6 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.371 2018/12/11 13:29:52 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.372 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -800,7 +800,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
}
return;
- case IMSG_SMTP_FILTER_DATA_BEGIN:
+ case IMSG_FILTER_SMTP_DATA_BEGIN:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_get_int(&m, &success);
@@ -988,7 +988,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
io_resume(s->io, IO_IN);
return;
- case IMSG_SMTP_FILTER_PROTOCOL:
+ case IMSG_FILTER_SMTP_PROTOCOL:
m_msg(&m, imsg);
m_get_id(&m, &reqid);
m_get_int(&m, &filter_response);
@@ -1585,7 +1585,7 @@ smtp_query_filters(enum filter_phase phase, struct smtp_session *s, const char *
uint8_t i;
if (TAILQ_FIRST(&env->sc_filter_rules[phase])) {
- m_create(p_lka, IMSG_SMTP_FILTER_PROTOCOL, 0, 0, -1);
+ m_create(p_lka, IMSG_FILTER_SMTP_PROTOCOL, 0, 0, -1);
m_add_id(p_lka, s->id);
m_add_int(p_lka, phase);
m_add_string(p_lka, args);
@@ -1609,7 +1609,7 @@ smtp_filter_begin(struct smtp_session *s)
if (!SESSION_FILTERED(s))
return;
- m_create(p_lka, IMSG_SMTP_FILTER_BEGIN, 0, 0, -1);
+ m_create(p_lka, IMSG_FILTER_SMTP_BEGIN, 0, 0, -1);
m_add_id(p_lka, s->id);
m_add_sockaddr(p_lka, (struct sockaddr *)&s->ss);
m_add_sockaddr(p_lka, (struct sockaddr *)&s->listener->ss);
@@ -1624,7 +1624,7 @@ smtp_filter_end(struct smtp_session *s)
if (!SESSION_FILTERED(s))
return;
- m_create(p_lka, IMSG_SMTP_FILTER_END, 0, 0, -1);
+ m_create(p_lka, IMSG_FILTER_SMTP_END, 0, 0, -1);
m_add_id(p_lka, s->id);
m_close(p_lka);
}
@@ -1635,7 +1635,7 @@ smtp_filter_data_begin(struct smtp_session *s)
if (!SESSION_FILTERED(s))
return;
- m_create(p_lka, IMSG_SMTP_FILTER_DATA_BEGIN, 0, 0, -1);
+ m_create(p_lka, IMSG_FILTER_SMTP_DATA_BEGIN, 0, 0, -1);
m_add_id(p_lka, s->id);
m_close(p_lka);
tree_xset(&wait_filter_fd, s->id, s);
@@ -1653,7 +1653,7 @@ smtp_filter_data_end(struct smtp_session *s)
io_free(s->tx->filter);
s->tx->filter = NULL;
- m_create(p_lka, IMSG_SMTP_FILTER_DATA_END, 0, 0, -1);
+ m_create(p_lka, IMSG_FILTER_SMTP_DATA_END, 0, 0, -1);
m_add_id(p_lka, s->id);
m_close(p_lka);
}
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index c6d4bac192a..27e751cc625 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.310 2018/12/11 13:35:23 gilles Exp $ */
+/* $OpenBSD: smtpd.c,v 1.311 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -2020,11 +2020,11 @@ imsg_to_str(int type)
CASE(IMSG_REPORT_SMTP_PROTOCOL_CLIENT);
CASE(IMSG_REPORT_SMTP_PROTOCOL_SERVER);
- CASE(IMSG_SMTP_FILTER_BEGIN);
- CASE(IMSG_SMTP_FILTER_END);
- CASE(IMSG_SMTP_FILTER_PROTOCOL);
- CASE(IMSG_SMTP_FILTER_DATA_BEGIN);
- CASE(IMSG_SMTP_FILTER_DATA_END);
+ CASE(IMSG_FILTER_SMTP_BEGIN);
+ CASE(IMSG_FILTER_SMTP_END);
+ CASE(IMSG_FILTER_SMTP_PROTOCOL);
+ CASE(IMSG_FILTER_SMTP_DATA_BEGIN);
+ CASE(IMSG_FILTER_SMTP_DATA_END);
CASE(IMSG_CA_PRIVENC);
CASE(IMSG_CA_PRIVDEC);
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 40623acb179..b5f67d3bfcc 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.590 2018/12/11 13:35:23 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.591 2018/12/11 13:40:30 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -327,11 +327,11 @@ enum imsg_type {
IMSG_REPORT_SMTP_PROTOCOL_SERVER,
IMSG_REPORT_SMTP_FILTER_RESPONSE,
- IMSG_SMTP_FILTER_BEGIN,
- IMSG_SMTP_FILTER_END,
- IMSG_SMTP_FILTER_PROTOCOL,
- IMSG_SMTP_FILTER_DATA_BEGIN,
- IMSG_SMTP_FILTER_DATA_END,
+ IMSG_FILTER_SMTP_BEGIN,
+ IMSG_FILTER_SMTP_END,
+ IMSG_FILTER_SMTP_PROTOCOL,
+ IMSG_FILTER_SMTP_DATA_BEGIN,
+ IMSG_FILTER_SMTP_DATA_END,
IMSG_CA_PRIVENC,
IMSG_CA_PRIVDEC
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 03:50:29 +0000