diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2013-05-15 15:16:41 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2013-05-15 15:16:41 +0200 |
| commit | ec06f5bb0188436e6aa73d7d75e1d926867f0a8e (patch) | |
| tree | c489f2efc4f4acb4eedff7188f8c5d5ed8ee2825 | |
| parent | handle ECONNRESET and ETIMEDOUT as "connection close" to avoid fatal (diff) | |
| parent | trace all messages (diff) | |
| download | OpenSMTPD-ec06f5bb0188436e6aa73d7d75e1d926867f0a8e.tar.xz OpenSMTPD-ec06f5bb0188436e6aa73d7d75e1d926867f0a8e.zip | |
Merge branch 'master' into portable
| -rw-r--r-- | smtpd/mproc.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/smtpd/mproc.c b/smtpd/mproc.c index 063068c4..c13abaac 100644 --- a/smtpd/mproc.c +++ b/smtpd/mproc.c @@ -274,6 +274,12 @@ m_forward(struct mproc *p, struct imsg *imsg) imsg->hdr.pid, imsg->fd, imsg->data, imsg->hdr.len - sizeof(imsg->hdr)); + log_trace(TRACE_MPROC, "mproc: %s -> %s : %zu %s (forward)", + proc_name(smtpd_process), + proc_name(p->proc), + imsg->hdr.len - sizeof(imsg->hdr), + imsg_to_str(imsg->hdr.type)); + p->msg_out += 1; p->bytes_queued += imsg->hdr.len; if (p->bytes_queued > p->bytes_queued_max) @@ -288,6 +294,12 @@ m_compose(struct mproc *p, uint32_t type, uint32_t peerid, pid_t pid, int fd, { imsg_compose(&p->imsgbuf, type, peerid, pid, fd, data, len); + log_trace(TRACE_MPROC, "mproc: %s -> %s : %zu %s", + proc_name(smtpd_process), + proc_name(p->proc), + len, + imsg_to_str(type)); + p->msg_out += 1; p->bytes_queued += len + IMSG_HEADER_SIZE; if (p->bytes_queued > p->bytes_queued_max) @@ -300,17 +312,26 @@ void m_composev(struct mproc *p, uint32_t type, uint32_t peerid, pid_t pid, int fd, const struct iovec *iov, int n) { + size_t len; int i; imsg_composev(&p->imsgbuf, type, peerid, pid, fd, iov, n); - p->msg_out += 1; - p->bytes_queued += IMSG_HEADER_SIZE; + len = 0; for (i = 0; i < n; i++) - p->bytes_queued += iov[i].iov_len; + len += iov[i].iov_len; + + p->msg_out += 1; + p->bytes_queued += IMSG_HEADER_SIZE + len; if (p->bytes_queued > p->bytes_queued_max) p->bytes_queued_max = p->bytes_queued; + log_trace(TRACE_MPROC, "mproc: %s -> %s : %zu %s", + proc_name(smtpd_process), + proc_name(p->proc), + len, + imsg_to_str(type)); + mproc_event_add(p); } |