hide internal io flags and rename IO_PAUSE_{IN,OUT} to IO_{IN,OUT}

ok gilles@ sunil@

5 files changed, 31 insertions, 28 deletions

diff --git a/usr.sbin/smtpd/ioev.c b/usr.sbin/smtpd/ioev.c
index 266bed21b10..e2bddeda99c 100644
--- a/usr.sbin/smtpd/ioev.c
+++ b/usr.sbin/smtpd/ioev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioev.c,v 1.38 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: ioev.c,v 1.39 2016/11/30 17:43:32 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -47,6 +47,14 @@ enum {
 	IO_STATE_MAX,
 };
 
+#define IO_PAUSE_IN 		IO_IN
+#define IO_PAUSE_OUT		IO_OUT
+#define IO_READ			0x04
+#define IO_WRITE		0x08
+#define IO_RW			(IO_READ | IO_WRITE)
+#define IO_RESET		0x10  /* internal */
+#define IO_HELD			0x20  /* internal */
+
 struct io {
 	int		 sock;
 	void		*arg;
diff --git a/usr.sbin/smtpd/ioev.h b/usr.sbin/smtpd/ioev.h
index 573708f4a01..f1c398482cf 100644
--- a/usr.sbin/smtpd/ioev.h
+++ b/usr.sbin/smtpd/ioev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioev.h,v 1.15 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: ioev.h,v 1.16 2016/11/30 17:43:32 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -26,13 +26,8 @@ enum {
 	IO_ERROR,		/* details?			*/
 };
 
-#define IO_READ			0x01
-#define IO_WRITE		0x02
-#define IO_RW			(IO_READ | IO_WRITE)
-#define IO_PAUSE_IN		0x04
-#define IO_PAUSE_OUT		0x08
-#define IO_RESET		0x10  /* internal */
-#define IO_HELD			0x20  /* internal */
+#define IO_IN		0x01
+#define IO_OUT		0x02
 
 struct io;
 
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index c7b0b67d7e6..ef6b6f8ea8b 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda.c,v 1.125 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: mda.c,v 1.126 2016/11/30 17:43:32 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -527,7 +527,7 @@ mda_io(struct io *io, int evt, void *arg)
 				m_add_id(p_parent, s->id);
 				m_add_string(p_parent, "Out of memory");
 				m_close(p_parent);
-				io_pause(io, IO_PAUSE_OUT);
+				io_pause(io, IO_OUT);
 				free(ln);
 				return;
 			}
@@ -542,7 +542,7 @@ mda_io(struct io *io, int evt, void *arg)
 			m_add_id(p_parent, s->id);
 			m_add_string(p_parent, "Error reading body");
 			m_close(p_parent);
-			io_pause(io, IO_PAUSE_OUT);
+			io_pause(io, IO_OUT);
 			return;
 		}
 
@@ -559,25 +559,25 @@ mda_io(struct io *io, int evt, void *arg)
 
 	case IO_TIMEOUT:
 		log_debug("debug: mda: timeout on session %016"PRIx64, s->id);
-		io_pause(io, IO_PAUSE_OUT);
+		io_pause(io, IO_OUT);
 		return;
 
 	case IO_ERROR:
 		log_debug("debug: mda: io error on session %016"PRIx64": %s",
 		    s->id, io_error(io));
-		io_pause(io, IO_PAUSE_OUT);
+		io_pause(io, IO_OUT);
 		return;
 
 	case IO_DISCONNECTED:
 		log_debug("debug: mda: io disconnected on session %016"PRIx64,
 		    s->id);
-		io_pause(io, IO_PAUSE_OUT);
+		io_pause(io, IO_OUT);
 		return;
 
 	default:
 		log_debug("debug: mda: unexpected event on session %016"PRIx64,
 		    s->id);
-		io_pause(io, IO_PAUSE_OUT);
+		io_pause(io, IO_OUT);
 		return;
 	}
 }
diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c
index 7273526ecfb..84038e5f8db 100644
--- a/usr.sbin/smtpd/mta_session.c
+++ b/usr.sbin/smtpd/mta_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta_session.c,v 1.95 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: mta_session.c,v 1.96 2016/11/30 17:43:32 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -362,7 +362,7 @@ mta_session_imsg(struct mproc *p, struct imsg *imsg)
 		}
 
 		mta_tls_verified(s);
-		io_resume(s->io, IO_PAUSE_IN);
+		io_resume(s->io, IO_IN);
 		return;
 
 	case IMSG_MTA_LOOKUP_HELO:
@@ -1164,7 +1164,7 @@ mta_io(struct io *io, int evt, void *arg)
 		s->flags |= MTA_TLS;
 
 		if (mta_verify_certificate(s)) {
-			io_pause(s->io, IO_PAUSE_IN);
+			io_pause(s->io, IO_IN);
 			break;
 		}
 
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 93a1ab5a0a1..c4c0ac9d18e 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.301 2016/11/30 11:52:48 eric Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.302 2016/11/30 17:43:32 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -981,7 +981,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
 			return;
 		}
 		smtp_tls_verified(s);
-		io_resume(s->io, IO_PAUSE_IN);
+		io_resume(s->io, IO_IN);
 		return;
 	}
 
@@ -1255,7 +1255,7 @@ smtp_io(struct io *io, int evt, void *arg)
 		s->helo[0] = '\0';
 
 		if (smtp_verify_certificate(s)) {
-			io_pause(s->io, IO_PAUSE_IN);
+			io_pause(s->io, IO_IN);
 			break;
 		}
 
@@ -1469,18 +1469,18 @@ smtp_data_io(struct io *io, int evt, void *arg)
 		io_free(s->tx->oev);
 		s->tx->oev = NULL;
 		s->tx->msgflags |= MF_ERROR_IO;
-		if (io_paused(s->io, IO_PAUSE_IN)) {
+		if (io_paused(s->io, IO_IN)) {
 			log_debug("debug: smtp: %p: resuming session after mfa error", s);
-			io_resume(s->io, IO_PAUSE_IN);
+			io_resume(s->io, IO_IN);
 		}
 		break;
 
 	case IO_LOWAT:
 		if (s->tx->dataeom && io_queued(s->tx->oev) == 0) {
 			smtp_data_io_done(s);
-		} else if (io_paused(s->io, IO_PAUSE_IN)) {
+		} else if (io_paused(s->io, IO_IN)) {
 			log_debug("debug: smtp: %p: filter congestion over: resuming session", s);
-			io_resume(s->io, IO_PAUSE_IN);
+			io_resume(s->io, IO_IN);
 		}
 		break;
 
@@ -2628,9 +2628,9 @@ smtp_filter_dataline(struct smtp_session *s, const char *line)
 		return;
 	}
 
-	if (io_queued(s->tx->oev) > DATA_HIWAT && !io_paused(s->io, IO_PAUSE_IN)) {
+	if (io_queued(s->tx->oev) > DATA_HIWAT && !io_paused(s->io, IO_IN)) {
 		log_debug("debug: smtp: %p: filter congestion: pausing session", s);
-		io_pause(s->io, IO_PAUSE_IN);
+		io_pause(s->io, IO_IN);
 	}
 }