faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: fix sockaddr function naming

Browse source
This commit is contained in:
Miroslav Lichvar 2014-10-03 10:15:18 +02:00
parent e05b687009
commit 2f738d5805
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.c
View file

@ -137,7 +137,7 @@ open_io(const char *hostname, int port)
assert(0); assert(0);
} }
his_addr_len = UTI_IPAndPort2Sockaddr(&ip, port, &his_addr.u); his_addr_len = UTI_IPAndPortToSockaddr(&ip, port, &his_addr.u);
if (sock_fd < 0) { if (sock_fd < 0) {
perror("Can't create socket"); perror("Can't create socket");

4
cmdmon.c
View file

@ -706,7 +706,7 @@ transmit_reply(CMD_Reply *msg, union sockaddr_in46 *where_to, int auth_len)
unsigned short port; unsigned short port;
IPAddr ip; IPAddr ip;
UTI_Sockaddr2IPAndPort(&where_to->u, &ip, &port); UTI_SockaddrToIPAndPort(&where_to->u, &ip, &port);
DEBUG_LOG(LOGF_CmdMon, "Could not send response to %s:%hu", UTI_IPToString(&ip), port); DEBUG_LOG(LOGF_CmdMon, "Could not send response to %s:%hu", UTI_IPToString(&ip), port);
} }
} }
@ -1637,7 +1637,7 @@ read_from_cmd_socket(void *anything)
LCL_ReadRawTime(&now); LCL_ReadRawTime(&now);
LCL_CookTime(&now, &cooked_now, NULL); LCL_CookTime(&now, &cooked_now, NULL);
UTI_Sockaddr2IPAndPort(&where_from.u, &remote_ip, &remote_port); UTI_SockaddrToIPAndPort(&where_from.u, &remote_ip, &remote_port);
switch (remote_ip.family) { switch (remote_ip.family) {
case IPADDR_INET4: case IPADDR_INET4:

2
nameserv.c
View file

@ -120,7 +120,7 @@ DNS_IPAddress2Name(IPAddr *ip_addr, char *name, int len)
socklen_t slen; socklen_t slen;
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
slen = UTI_IPAndPort2Sockaddr(ip_addr, 0, (struct sockaddr *)&in6); slen = UTI_IPAndPortToSockaddr(ip_addr, 0, (struct sockaddr *)&in6);
if (!getnameinfo((struct sockaddr *)&in6, slen, hbuf, sizeof (hbuf), NULL, 0, 0)) if (!getnameinfo((struct sockaddr *)&in6, slen, hbuf, sizeof (hbuf), NULL, 0, 0))
result = hbuf; result = hbuf;
#else #else

6
ntp_io.c
View file

@ -243,7 +243,7 @@ connect_socket(int sock_fd, NTP_Remote_Address *remote_addr)
union sockaddr_in46 addr; union sockaddr_in46 addr;
socklen_t addr_len; socklen_t addr_len;
addr_len = UTI_IPAndPort2Sockaddr(&remote_addr->ip_addr, remote_addr->port, &addr.u); addr_len = UTI_IPAndPortToSockaddr(&remote_addr->ip_addr, remote_addr->port, &addr.u);
assert(addr_len); assert(addr_len);
@ -466,7 +466,7 @@ read_from_socket(void *anything)
if (msg.msg_namelen > sizeof (where_from)) if (msg.msg_namelen > sizeof (where_from))
LOG_FATAL(LOGF_NtpIO, "Truncated source address"); LOG_FATAL(LOGF_NtpIO, "Truncated source address");
UTI_Sockaddr2IPAndPort(&where_from.u, &remote_addr.ip_addr, &remote_addr.port); UTI_SockaddrToIPAndPort(&where_from.u, &remote_addr.ip_addr, &remote_addr.port);
local_addr.ip_addr.family = IPADDR_UNSPEC; local_addr.ip_addr.family = IPADDR_UNSPEC;
local_addr.sock_fd = sock_fd; local_addr.sock_fd = sock_fd;
@ -550,7 +550,7 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr, NTP_Lo
local_addr->sock_fd == server_sock_fd6 || local_addr->sock_fd == server_sock_fd6 ||
#endif #endif
!separate_client_sockets) { !separate_client_sockets) {
addrlen = UTI_IPAndPort2Sockaddr(&remote_addr->ip_addr, remote_addr->port, addrlen = UTI_IPAndPortToSockaddr(&remote_addr->ip_addr, remote_addr->port,
&remote.u); &remote.u);
if (!addrlen) if (!addrlen)
return 0; return 0;

4
util.c
View file

@ -427,7 +427,7 @@ UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask)
/* ================================================== */ /* ================================================== */
void void
UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port) UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port)
{ {
switch (sa->sa_family) { switch (sa->sa_family) {
case AF_INET: case AF_INET:
@ -452,7 +452,7 @@ UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port)
/* ================================================== */ /* ================================================== */
int int
UTI_IPAndPort2Sockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa) UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa)
{ {
switch (ip->family) { switch (ip->family) {
case IPADDR_INET4: case IPADDR_INET4:

4
util.h
View file

@ -86,8 +86,8 @@ extern void UTI_IPHostToNetwork(IPAddr *src, IPAddr *dest);
extern void UTI_IPNetworkToHost(IPAddr *src, IPAddr *dest); extern void UTI_IPNetworkToHost(IPAddr *src, IPAddr *dest);
extern int UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask); extern int UTI_CompareIPs(IPAddr *a, IPAddr *b, IPAddr *mask);
extern void UTI_Sockaddr2IPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port); extern void UTI_SockaddrToIPAndPort(struct sockaddr *sa, IPAddr *ip, unsigned short *port);
extern int UTI_IPAndPort2Sockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa); extern int UTI_IPAndPortToSockaddr(IPAddr *ip, unsigned short port, struct sockaddr *sa);
extern char *UTI_TimeToLogForm(time_t t); extern char *UTI_TimeToLogForm(time_t t);