From 7c6ca609e066b60671e65cb25981858b11d8f3d5 Mon Sep 17 00:00:00 2001 From: Gilles Chehade Date: Tue, 11 Dec 2018 13:30:46 +0000 Subject: these files are no longer used --- usr.sbin/smtpd/mta_report.c | 174 ---------------------------------------- usr.sbin/smtpd/smtp_report.c | 186 ------------------------------------------- 2 files changed, 360 deletions(-) delete mode 100644 usr.sbin/smtpd/mta_report.c delete mode 100644 usr.sbin/smtpd/smtp_report.c (limited to 'usr.sbin/smtpd') diff --git a/usr.sbin/smtpd/mta_report.c b/usr.sbin/smtpd/mta_report.c deleted file mode 100644 index ea14d01c40c..00000000000 --- a/usr.sbin/smtpd/mta_report.c +++ /dev/null @@ -1,174 +0,0 @@ -/* $OpenBSD: mta_report.c,v 1.4 2018/12/11 08:40:56 gilles Exp $ */ - -/* - * Copyright (c) 2018 Gilles Chehade - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "smtpd.h" -#include "log.h" -#include "ssl.h" -#include "rfc5322.h" - -void -mta_report_link_connect(uint64_t qid, const char *rdns, int fcrdns, - const struct sockaddr_storage *ss_src, - const struct sockaddr_storage *ss_dest) -{ - m_create(p_lka, IMSG_MTA_REPORT_LINK_CONNECT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, rdns); - m_add_int(p_lka, fcrdns); - m_add_sockaddr(p_lka, (const struct sockaddr *)ss_src); - m_add_sockaddr(p_lka, (const struct sockaddr *)ss_dest); - m_close(p_lka); -} - -void -mta_report_link_identify(uint64_t qid, const char *identity) -{ - m_create(p_lka, IMSG_MTA_REPORT_LINK_IDENTIFY, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, identity); - m_close(p_lka); -} - -void -mta_report_link_tls(uint64_t qid, const char *ssl) -{ - m_create(p_lka, IMSG_MTA_REPORT_LINK_TLS, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, ssl); - m_close(p_lka); -} - -void -mta_report_link_disconnect(uint64_t qid) -{ - m_create(p_lka, IMSG_MTA_REPORT_LINK_DISCONNECT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_close(p_lka); -} - -void -mta_report_tx_begin(uint64_t qid, uint32_t msgid) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_BEGIN, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_close(p_lka); -} - -void -mta_report_tx_mail(uint64_t qid, uint32_t msgid, const char *address, int ok) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_MAIL, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_string(p_lka, address); - m_add_int(p_lka, ok); - m_close(p_lka); -} - -void -mta_report_tx_rcpt(uint64_t qid, uint32_t msgid, const char *address, int ok) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_RCPT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_string(p_lka, address); - m_add_int(p_lka, ok); - m_close(p_lka); -} - -void -mta_report_tx_envelope(uint64_t qid, uint32_t msgid, uint64_t evpid) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_ENVELOPE, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_id(p_lka, evpid); - m_close(p_lka); -} - -void -mta_report_tx_commit(uint64_t qid, uint32_t msgid, size_t msgsz) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_COMMIT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_size(p_lka, msgsz); - m_close(p_lka); -} - -void -mta_report_tx_rollback(uint64_t qid, uint32_t msgid) -{ - m_create(p_lka, IMSG_MTA_REPORT_TX_ROLLBACK, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_close(p_lka); -} - -void -mta_report_protocol_client(uint64_t qid, const char *command) -{ - m_create(p_lka, IMSG_MTA_REPORT_PROTOCOL_CLIENT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, command); - m_close(p_lka); -} - -void -mta_report_protocol_server(uint64_t qid, const char *response) -{ - m_create(p_lka, IMSG_MTA_REPORT_PROTOCOL_SERVER, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, response); - m_close(p_lka); -} diff --git a/usr.sbin/smtpd/smtp_report.c b/usr.sbin/smtpd/smtp_report.c deleted file mode 100644 index c8f95be7ca9..00000000000 --- a/usr.sbin/smtpd/smtp_report.c +++ /dev/null @@ -1,186 +0,0 @@ -/* $OpenBSD: smtp_report.c,v 1.9 2018/12/11 11:29:44 gilles Exp $ */ - -/* - * Copyright (c) 2018 Gilles Chehade - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "smtpd.h" -#include "log.h" -#include "ssl.h" -#include "rfc5322.h" - -void -smtp_report_link_connect(uint64_t qid, const char *rdns, int fcrdns, - const struct sockaddr_storage *ss_src, - const struct sockaddr_storage *ss_dest) -{ - m_create(p_lka, IMSG_SMTP_REPORT_LINK_CONNECT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, rdns); - m_add_int(p_lka, fcrdns); - m_add_sockaddr(p_lka, (const struct sockaddr *)ss_src); - m_add_sockaddr(p_lka, (const struct sockaddr *)ss_dest); - m_close(p_lka); -} - -void -smtp_report_link_identify(uint64_t qid, const char *identity) -{ - m_create(p_lka, IMSG_SMTP_REPORT_LINK_IDENTIFY, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, identity); - m_close(p_lka); -} - -void -smtp_report_link_tls(uint64_t qid, const char *ssl) -{ - m_create(p_lka, IMSG_SMTP_REPORT_LINK_TLS, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, ssl); - m_close(p_lka); -} - -void -smtp_report_link_disconnect(uint64_t qid) -{ - m_create(p_lka, IMSG_SMTP_REPORT_LINK_DISCONNECT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_close(p_lka); -} - -void -smtp_report_tx_begin(uint64_t qid, uint32_t msgid) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_BEGIN, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_close(p_lka); -} - -void -smtp_report_tx_mail(uint64_t qid, uint32_t msgid, const char *address, int ok) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_MAIL, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_string(p_lka, address); - m_add_int(p_lka, ok); - m_close(p_lka); -} - -void -smtp_report_tx_rcpt(uint64_t qid, uint32_t msgid, const char *address, int ok) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_RCPT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_string(p_lka, address); - m_add_int(p_lka, ok); - m_close(p_lka); -} - -void -smtp_report_tx_envelope(uint64_t qid, uint32_t msgid, uint64_t evpid) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_ENVELOPE, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_id(p_lka, evpid); - m_close(p_lka); -} - -void -smtp_report_tx_commit(uint64_t qid, uint32_t msgid, size_t msgsz) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_COMMIT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_add_size(p_lka, msgsz); - m_close(p_lka); -} - -void -smtp_report_tx_rollback(uint64_t qid, uint32_t msgid) -{ - m_create(p_lka, IMSG_SMTP_REPORT_TX_ROLLBACK, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_u32(p_lka, msgid); - m_close(p_lka); -} - -void -smtp_report_protocol_client(uint64_t qid, const char *command) -{ - m_create(p_lka, IMSG_SMTP_REPORT_PROTOCOL_CLIENT, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, command); - m_close(p_lka); -} - -void -smtp_report_protocol_server(uint64_t qid, const char *response) -{ - m_create(p_lka, IMSG_SMTP_REPORT_PROTOCOL_SERVER, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_string(p_lka, response); - m_close(p_lka); -} - -void -smtp_report_filter_response(uint64_t qid, int phase, int response, const char *param) -{ - m_create(p_lka, IMSG_SMTP_REPORT_FILTER_RESPONSE, 0, 0, -1); - m_add_time(p_lka, time(NULL)); - m_add_id(p_lka, qid); - m_add_int(p_lka, phase); - m_add_int(p_lka, response); - m_add_string(p_lka, param); - m_close(p_lka); -} -- cgit v1.2.3