sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

s3: libsmb: Cleanup - Remove a union in sock_packet_read_got_socket() that was an early attempt a samba_sockaddr.

Browse Source 
Just use samba_sockaddr.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>
This commit is contained in:
Jeremy Allison
2020-08-24 12:00:29 -07:00
parent 189c741052
commit 5151278ccc
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source3/libsmb/namequery.c
View File

@ -442,10 +442,7 @@ static void sock_packet_read_got_socket(struct tevent_req *subreq)
subreq, struct tevent_req);
struct sock_packet_read_state *state = tevent_req_data(
req, struct sock_packet_read_state);
union {
struct sockaddr sa;
struct sockaddr_in sin;
} addr;
struct samba_sockaddr addr = {0};
ssize_t ret;
ssize_t received;
int err;
@ -474,8 +471,8 @@ static void sock_packet_read_got_socket(struct tevent_req *subreq)
goto retry;
}
ret = tsocket_address_bsd_sockaddr(state->addr,
&addr.sa,
sizeof(addr.sin));
&addr.u.sa,
sizeof(addr.u.in));
if (ret == -1) {
tevent_req_nterror(req, map_nt_error_from_unix(errno));
return;
@ -483,7 +480,7 @@ static void sock_packet_read_got_socket(struct tevent_req *subreq)
state->packet = parse_packet_talloc(
state, (char *)state->buf, received, state->type,
addr.sin.sin_addr, addr.sin.sin_port);
addr.u.in.sin_addr, addr.u.in.sin_port);
if (state->packet == NULL) {
DEBUG(10, ("parse_packet failed\n"));
goto retry;