diff options
Diffstat (limited to 'shared/utils.c')
-rw-r--r-- | shared/utils.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/shared/utils.c b/shared/utils.c index c71f1f7..20d9809 100644 --- a/shared/utils.c +++ b/shared/utils.c @@ -17,8 +17,7 @@ unsigned debug_mask = 0; -void -socket_set_low_latency(int sfd, bool keepalive, bool iptos, bool nodelay) +void socket_set_low_latency(int sfd, bool keepalive, bool iptos, bool nodelay) { int option; @@ -27,31 +26,33 @@ socket_set_low_latency(int sfd, bool keepalive, bool iptos, bool nodelay) /* Probably not necessary, but can't hurt */ if (keepalive) { option = true; - if (setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option)) < 0) + if (setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &option, + sizeof(option)) < 0) error("setsockopt: %m"); } /* Doubtful if it has much effect, but can't hurt */ if (iptos) { option = IPTOS_LOWDELAY; - if (setsockopt(sfd, IPPROTO_IP, IP_TOS, &option, sizeof(option)) < 0) + if (setsockopt(sfd, IPPROTO_IP, IP_TOS, &option, + sizeof(option)) < 0) error("setsockopt: %m"); } /* Nagle's algorithm is a poor fit for gaming */ if (nodelay) { option = true; - if (setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &option, sizeof(option)) < 0) + if (setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &option, + sizeof(option)) < 0) error("setsockopt: %m"); } } -uint16_t -saddr_port(struct saddr *saddr) +uint16_t saddr_port(struct saddr *saddr) { - //assert_return(saddr, 0); + // assert_return(saddr, 0); - switch (saddr->storage.ss_family) { + switch (saddr->st.ss_family) { case AF_INET: return ntohs(saddr->in4.sin_port); case AF_INET6: @@ -61,18 +62,19 @@ saddr_port(struct saddr *saddr) } } -char * -saddr_addr(struct saddr *saddr, char *buf, size_t len) +char *saddr_addr(struct saddr *saddr, char *buf, size_t len) { - //assert_return(saddr && buf && len > 0, NULL); + // assert_return(saddr && buf && len > 0, NULL); - switch (saddr->storage.ss_family) { + switch (saddr->st.ss_family) { case AF_INET: - if (inet_ntop(saddr->in4.sin_family, &saddr->in4.sin_addr, buf, len)) + if (inet_ntop(saddr->in4.sin_family, &saddr->in4.sin_addr, buf, + len)) return buf; break; case AF_INET6: - if (inet_ntop(saddr->in6.sin6_family, &saddr->in6.sin6_addr, buf, len)) + if (inet_ntop(saddr->in6.sin6_family, &saddr->in6.sin6_addr, + buf, len)) return buf; break; default: @@ -83,10 +85,9 @@ saddr_addr(struct saddr *saddr, char *buf, size_t len) return buf; } -void -saddr_set_ipv4(struct saddr *saddr, in_addr_t ip, in_port_t port) +void saddr_set_ipv4(struct saddr *saddr, in_addr_t ip, in_port_t port) { - //assert_return(saddr); + // assert_return(saddr); memset(&saddr->in4, 0, sizeof(saddr->in4)); saddr->in4.sin_family = AF_INET; @@ -96,10 +97,10 @@ saddr_set_ipv4(struct saddr *saddr, in_addr_t ip, in_port_t port) saddr_set_addrstr(saddr); } -void -saddr_set_ipv6(struct saddr *saddr, const struct in6_addr *ip, in_port_t port) +void saddr_set_ipv6(struct saddr *saddr, const struct in6_addr *ip, + in_port_t port) { - //assert_return(saddr && ip); + // assert_return(saddr && ip); memset(&saddr->in6, 0, sizeof(saddr->in6)); saddr->in6.sin6_family = AF_INET6; @@ -110,14 +111,13 @@ saddr_set_ipv6(struct saddr *saddr, const struct in6_addr *ip, in_port_t port) saddr_set_addrstr(saddr); } -void -saddr_set_addrstr(struct saddr *saddr) +void saddr_set_addrstr(struct saddr *saddr) { - //assert_return(saddr); + // assert_return(saddr); char abuf[ADDRSTRLEN]; - switch (saddr->storage.ss_family) { + switch (saddr->st.ss_family) { case AF_INET: snprintf(saddr->addrstr, sizeof(saddr->addrstr), "AF_INET4 %s %" PRIu16, @@ -136,8 +136,7 @@ saddr_set_addrstr(struct saddr *saddr) } } -int -strtou16_strict(const char *str, uint16_t *result) +int strtou16_strict(const char *str, uint16_t *result) { char *end; long val; @@ -150,7 +149,7 @@ strtou16_strict(const char *str, uint16_t *result) if (errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) return -EINVAL; - + if (errno != 0 && val == 0) return -EINVAL; @@ -167,4 +166,3 @@ strtou16_strict(const char *str, uint16_t *result) *result = val; return 0; } - |