From bcfb85f88f264cb5a4b25fbbeb7178a8c9597bcb Mon Sep 17 00:00:00 2001 From: Eric Faurot Date: Fri, 21 Sep 2012 13:23:08 +0000 Subject: move struct lka_session definition in lka_session.c ok gilles@ --- usr.sbin/smtpd/lka_session.c | 19 ++++++++++++++++++- usr.sbin/smtpd/smtpd.h | 19 +------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/usr.sbin/smtpd/lka_session.c b/usr.sbin/smtpd/lka_session.c index 0c88fa307d0..5cfdbc2c1e6 100644 --- a/usr.sbin/smtpd/lka_session.c +++ b/usr.sbin/smtpd/lka_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka_session.c,v 1.30 2012/09/21 10:22:29 eric Exp $ */ +/* $OpenBSD: lka_session.c,v 1.31 2012/09/21 13:23:07 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade @@ -39,6 +39,23 @@ #include "smtpd.h" #include "log.h" +enum lka_session_flags { + F_ERROR = 0x1 +}; + +struct lka_session { + SPLAY_ENTRY(lka_session) nodes; + uint64_t id; + + TAILQ_HEAD(, envelope) deliverylist; + struct expandtree expandtree; + + uint8_t iterations; + uint32_t pending; + enum lka_session_flags flags; + struct submit_status ss; +}; + static void lka_session_fail(struct lka_session *); static void lka_session_destroy(struct lka_session *); static void lka_session_pickup(struct lka_session *, struct envelope *); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index add6f8220c1..1e6ae321f26 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.363 2012/09/21 12:33:32 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.364 2012/09/21 13:23:07 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -686,23 +686,6 @@ struct rulematch { struct submit_status ss; }; -enum lka_session_flags { - F_ERROR = 0x1 -}; - -struct lka_session { - SPLAY_ENTRY(lka_session) nodes; - uint64_t id; - - TAILQ_HEAD(, envelope) deliverylist; - struct expandtree expandtree; - - uint8_t iterations; - uint32_t pending; - enum lka_session_flags flags; - struct submit_status ss; -}; - struct filter { TAILQ_ENTRY(filter) f_entry; pid_t pid; -- cgit v1.2.3