--- a/pop3d.h	Fri Sep 05 08:13:18 2014 +0500
+++ b/pop3d.h	Fri Sep 05 10:24:20 2014 +0500
@@ -114,7 +114,6 @@
 };
 
 struct listener {
-	struct sockaddr_storage	ss;
 	struct event		ev;
 	struct event		pause;
 	int			flags;
@@ -129,14 +128,15 @@
 
 struct session {
 	SPLAY_ENTRY(session)	entry;
-	struct imsgev		*iev_maildrop;
 	struct iobuf		iobuf;
 	struct io		io;
+	struct sockaddr_storage	ss;
 	char			user[ARGLEN];
 	char			pass[ARGLEN];
 	size_t			m_sz;
 	size_t			nmsgs;
 	struct listener		*l;
+	struct imsgev		*iev_maildrop;
 	uint32_t		id;
 	int			flags;
 	enum state		state;
@@ -146,7 +146,7 @@
 void pop3_main(int [2], struct passwd *);
 
 /* session.c */
-void session_init(struct listener *, int);
+void session_init(struct listener *, int, const struct sockaddr_storage *);
 void session_close(struct session *, int);
 void session_reply(struct session *, char *, ...);
 void session_set_state(struct session *, enum state);