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

AnetFormatIP(): renamed, commented, now sticks to IP:port format.

Browse Source 
A few code style changes + consistent format: not nice for humans but
better for parsers.
This commit is contained in:
antirez
2014-12-11 18:20:30 +01:00
parent 491881e13b
commit ce269ad3c5
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/anet.c
View File

@ -589,20 +589,21 @@ 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);
/* Format an IP,port pair into something easy to parse. If IP is IPv6
* (matches for ":"), the ip is surrounded by []. IP and port are just
* separated by colons. This the standard to display addresses within Redis. */
int anetFormatAddr(char *buf, size_t buf_len, char *ip, int port) {
return snprintf(buf,buf_len, strchr(ip,':') ?
"[%s]:%d" : "%s:%d", ip, port);
}
int anetFormatPeer(int fd, char *fmt, size_t fmt_len) {
/* Like anetFormatAddr() but extract ip and port from the socket's peer. */
int anetFormatPeer(int fd, char *buf, size_t buf_len) {
char ip[INET6_ADDRSTRLEN];
int port;
anetPeerToString(fd,ip,sizeof(ip),&port);
return anetFormatIP(fmt, fmt_len, ip, port);
return anetFormatAddr(buf, buf_len, ip, port);
}
int anetSockName(int fd, char *ip, size_t ip_len, int *port) {
@ -632,5 +633,5 @@ int anetFormatSock(int fd, char *fmt, size_t fmt_len) {
int port;
anetSockName(fd,ip,sizeof(ip),&port);
return anetFormatIP(fmt, fmt_len, ip, port);
return anetFormatAddr(fmt, fmt_len, ip, port);
}