Skip to content

stun: drop the redundant address copy after stun_atoaddr() #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garacil wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stun: drop the redundant address copy after stun_atoaddr() #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions libsofia-sip-ua/stun/stun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,8 +1247,12 @@ int stun_test_nattype(stun_handle_t *sh,
memmove(sd->sd_pri_addr, sh->sh_pri_addr, sizeof(su_sockaddr_t));
}
else {
/* stun_atoaddr() writes the resolved address through sd->sd_pri_info.ai_addr,
* which stun_discovery_create() aimed at sd->sd_pri_addr, so the server address
* is already in place here. The former copy took &sd->sd_pri_info.ai_addr - the
* address of the pointer field inside the addrinfo, overlapping sd_pri_addr and
* copying struct-tail bytes over the just-resolved address - so it is dropped. */
err = stun_atoaddr(sh->sh_home, AF_INET, &sd->sd_pri_info, server);
memmove(sd->sd_pri_addr, &sd->sd_pri_info.ai_addr, sizeof(su_sockaddr_t));
}
destination = (su_sockaddr_t *) sd->sd_pri_addr;

Expand Down Expand Up @@ -2736,8 +2740,12 @@ int stun_test_lifetime(stun_handle_t *sh,
memcpy(sd->sd_pri_addr, sh->sh_pri_addr, sizeof(su_sockaddr_t));
}
else {
/* stun_atoaddr() writes the resolved address through sd->sd_pri_info.ai_addr,
* which stun_discovery_create() aimed at sd->sd_pri_addr, so the server address
* is already in place here. The former copy took &sd->sd_pri_info.ai_addr - the
* address of the pointer field inside the addrinfo, overlapping sd_pri_addr and
* copying struct-tail bytes over the just-resolved address - so it is dropped. */
err = stun_atoaddr(sh->sh_home, AF_INET, &sd->sd_pri_info, server);
memcpy(sd->sd_pri_addr, &sd->sd_pri_info.ai_addr, sizeof(su_sockaddr_t));
}
destination = (su_sockaddr_t *) sd->sd_pri_addr;

Expand Down