fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-17 11:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Add centralized IP/Peer formatting functions

Browse Source 
This stops us from needing to manually check against ":" to
add brackets around IPv6 addresses everywhere.
This commit is contained in:
Matt Stancliff
2014-10-23 12:40:02 -04:00
parent 3cd36a4dd9
commit 2d90619f88
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/anet.c
View File

@ -589,6 +589,22 @@ error:
return -1;
}
int anetFormatIP(char *fmt, size_t fmt_len, char *ip, int port) {
if (port >= 0)
return snprintf(fmt,fmt_len,
strchr(ip,':') ? "[%s]:%d" : "%s:%d", ip, port);
else
return snprintf(fmt, fmt_len, strchr(ip,':') ? "[%s]" : "%s", ip);
}
int anetFormatPeer(int fd, char *fmt, size_t fmt_len) {
char ip[INET6_ADDRSTRLEN];
int port;
anetPeerToString(fd,ip,sizeof(ip),&port);
return anetFormatIP(fmt, fmt_len, ip, port);
}
int anetSockName(int fd, char *ip, size_t ip_len, int *port) {
struct sockaddr_storage sa;
socklen_t salen = sizeof(sa);
@ -610,3 +626,11 @@ int anetSockName(int fd, char *ip, size_t ip_len, int *port) {
}
return 0;
}
int anetFormatSock(int fd, char *fmt, size_t fmt_len) {
char ip[INET6_ADDRSTRLEN];
int port;
anetSockName(fd,ip,sizeof(ip),&port);
return anetFormatIP(fmt, fmt_len, ip, port);
}