diff --git a/src/netevent.c b/src/netevent.c index dc12912..e545248 100644 --- a/src/netevent.c +++ b/src/netevent.c @@ -216,7 +216,7 @@ void net_on_write(int fd, short ev, void *arg) #endif if (hub_sendq_get_bytes(user->net.send_queue)) { - user_want_write(user); + user_net_io_want_write(user); } } diff --git a/src/route.c b/src/route.c index 616bee6..b66c5d1 100644 --- a/src/route.c +++ b/src/route.c @@ -112,7 +112,7 @@ int route_to_user(struct hub_info* hub, struct user* user, struct adc_message* m } else { - user_want_write(user); + user_net_io_want_write(user); } return 1; diff --git a/src/user.c b/src/user.c index 3715e86..d4e1a05 100644 --- a/src/user.c +++ b/src/user.c @@ -331,18 +331,18 @@ int user_is_registered(struct user* user) return 0; } -void user_want_write(struct user* user) +void user_net_io_want_write(struct user* user) { - hub_log(log_trace, "user_want_write: %s", user_log_str(user)); + hub_log(log_trace, "user_net_io_want_write: %s", user_log_str(user)); if (user && user->net.ev_write) { event_add(user->net.ev_write, 0); } } -void user_want_read(struct user* user, int timeout_s) +void user_net_io_want_read(struct user* user, int timeout_s) { - hub_log(log_trace, "user_want_read: %s", user_log_str(user)); + hub_log(log_trace, "user_net_io_want_read: %s", user_log_str(user)); struct timeval timeout = { timeout_s, 0 }; if (user && user->net.ev_read) diff --git a/src/user.h b/src/user.h index 53709c9..e58f3c0 100644 --- a/src/user.h +++ b/src/user.h @@ -276,12 +276,12 @@ extern void user_clear_feature_cast_support(struct user* u); /** * Mark the user with a want-write flag, meaning it should poll for writability. */ -extern void user_want_write(struct user* user); +extern void user_net_io_want_write(struct user* user); /** * Mark the user with a want read flag, meaning it should poll for readability. */ -extern void user_want_read(struct user* user, int timeout_s); +extern void user_net_io_want_read(struct user* user, int timeout_s);