Move the timeout handling to the connection object.

src/core/hub.c

@@ -141,7 +141,7 @@ int hub_handle_support(struct hub_info* hub, struct hub_user* u, struct adc_mess
 		if (ok)
 		{
 			hub_send_handshake(hub, u);
-			user_set_timeout(u, TIMEOUT_HANDSHAKE);
+			net_con_set_timeout(&u->net.connection, TIMEOUT_HANDSHAKE);
 		}
 		else
 		{

src/core/hubevent.c

@@ -67,9 +67,9 @@ void on_login_success(struct hub_info* hub, struct hub_user* u)
 	/* Send message of the day (if any) */
 	if (user_is_logged_in(u)) /* Previous send() can fail! */
 		hub_send_motd(hub, u);
-		
-	/* reset to idle timeout */
-	user_set_timeout(u, TIMEOUT_IDLE);
+
+	/* reset timeout */
+	net_con_clear_timeout(&u->net.connection);
 }
 
 void on_login_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg)

src/core/netevent.c

@@ -182,33 +182,38 @@ int handle_net_write(struct hub_user* user)
 	return 0;
 }
 
-void net_event(int fd, short ev, void *arg)
+void net_event(struct net_connection* con, int event, void *arg)
 {
 	struct hub_user* user = (struct hub_user*) arg;
 	int flag_close = 0;
 
 #ifdef DEBUG_SENDQ
-	LOG_TRACE("net_on_read() : fd=%d, ev=%d, arg=%p", fd, (int) ev, arg);
+	LOG_TRACE("net_event() : fd=%d, ev=%d, arg=%p", fd, (int) event, arg);
 #endif
 
-	if (ev & EV_TIMEOUT)
+	if (event == NET_EVENT_SOCKERROR)
+	{
+		hub_disconnect_user(g_hub, user, quit_socket_error);
+		return;
+	}
+	else if (event == NET_EVENT_CLOSED)
+	{
+		hub_disconnect_user(g_hub, user, quit_disconnected);
+		return;
+	}
+	else if (event == NET_EVENT_TIMEOUT)
 	{
 		if (user_is_connecting(user))
 		{
-			flag_close = quit_timeout;
-		}
-		else
-		{
-			// FIXME: hub is not neccesarily set!
-			// hub_send_ping(hub, user);
+			hub_disconnect_user(g_hub, user, quit_timeout);
+			return;
 		}
 	}
-
-	if (ev & EV_READ)
+	else if (event & NET_EVENT_READ)
 	{
 		flag_close = handle_net_read(user);
 	}
-	else if (ev & EV_WRITE)
+	else if (event & NET_EVENT_WRITE)
 	{
 		flag_close = handle_net_write(user);
 	}
@@ -220,7 +225,7 @@ void net_event(int fd, short ev, void *arg)
 	}
 }
 
-void net_on_accept(int server_fd, short ev, void *arg)
+void net_on_accept(int server_fd, short event, void *arg)
 {
 	struct hub_info* hub = (struct hub_info*) arg;
 	struct hub_user* user = 0;

src/core/netevent.h

@@ -25,7 +25,7 @@
  */
 extern void net_on_accept(int fd, short ev, void *arg);
 
-extern void net_event(int fd, short ev, void *arg);
+extern void net_event(struct net_connection* con, int event, void *arg);
 
 extern int handle_net_read(struct hub_user* user);
 extern int handle_net_write(struct hub_user* user);

src/core/user.c

@@ -50,12 +50,8 @@ struct hub_user* user_create(struct hub_info* hub, int sd, struct ip_addr_encap*
 	user->net.send_queue = hub_sendq_create();
 	user->net.recv_queue = hub_recvq_create();
 
-	net_con_initialize(&user->net.connection, sd, addr, user, EV_READ);
-
-	evtimer_set(&user->net.timeout, net_event, user);
-	event_base_set(hub->evbase, &user->net.timeout);
-
-	user_set_timeout(user, TIMEOUT_CONNECTED);
+	net_con_initialize(&user->net.connection, sd, addr, net_event, user, EV_READ);
+	net_con_set_timeout(&user->net.connection, TIMEOUT_CONNECTED);
 
 	user_set_state(user, state_protocol);
 	return user;
@@ -67,8 +63,8 @@ void user_destroy(struct hub_user* user)
 	LOG_TRACE("user_destroy(), user=%p", user);
 
 	net_con_close(&user->net.connection);
-	evtimer_del(&user->net.timeout);
-	
+	net_con_clear_timeout(&user->net.connection);
+
 	hub_recvq_destroy(user->net.recv_queue);
 	hub_sendq_destroy(user->net.send_queue);
 
@@ -335,15 +331,6 @@ void user_net_io_want_read(struct hub_user* user)
 	net_con_update(&user->net.connection, EV_READ);
 }
 
-void user_set_timeout(struct hub_user* user, int seconds)
-{
-#ifdef DEBUG_SENDQ
-	LOG_TRACE("user_set_timeout to %d seconds: %s", seconds, user_log_str(user));
-#endif
-	struct timeval timeout = { seconds, 0 };
-	evtimer_add(&user->net.timeout, &timeout);
-}
-
 const char* user_get_quit_reason_string(enum user_quit_reason reason)
 {
 	switch (reason)

src/core/user.h

@@ -100,7 +100,6 @@ struct hub_user_limits
 struct hub_user_net_io
 {
 	struct net_connection connection;             /** Connection data */
-	struct event         timeout;                 /** timeout handling */
 	struct hub_recvq*    recv_queue;
 	struct hub_sendq*    send_queue;
 	time_t               tm_connected;            /** time when user connected */
@@ -267,12 +266,6 @@ extern void user_net_io_want_write(struct hub_user* user);
  */
 extern void user_net_io_want_read(struct hub_user* user);
 
-/**
- * Set timeout for connetion.
- * @param seconds the number of seconds into the future.
- */
-extern void user_set_timeout(struct hub_user* user, int seconds);
-
 #endif /* HAVE_UHUB_USER_H */