sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

ctdb-common: Don't modify a const argument

Browse Source 
The current code might be slightly more efficient but
intentionally (although temporarily) modifying a const argument just
seems wrong.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-08-17 13:46:50 +10:00 committed by Amitay Isaacs
parent 8fcf1af559
commit 0beb16f34e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ctdb/common/system_socket.c
View File

@ -631,8 +631,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
int ret;
int s;
uint32_t one = 1;
uint16_t tmpport;
ctdb_sock_addr *tmpdest;
struct sockaddr_in6 tmpdest = { 0 };
int saved_errno;
switch (src->ip.sin_family) {
@ -700,21 +699,20 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
return -1;
}
/* sendto() don't like if the port is set and the socket is
in raw mode.
*/
tmpdest = discard_const(dest);
tmpport = tmpdest->ip6.sin6_port;
/*
* sendto() on an IPv6 raw socket requires the port to
* be either 0 or a protocol value
*/
tmpdest = dest->ip6;
tmpdest.sin6_port = 0;
tmpdest->ip6.sin6_port = 0;
ret = sendto(s,
buf,
len,
0,
(const struct sockaddr *)&dest->ip6,
sizeof(dest->ip6));
(const struct sockaddr *)&tmpdest,
sizeof(tmpdest));
saved_errno = errno;
tmpdest->ip6.sin6_port = tmpport;
close(s);
if (ret != len) {