mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-06-14 12:52:37 +00:00
pimd: Some SA analysis fixes.
This commit addresses some SA issues found: 1) double set variables 2) value set but never used. 3) wrong return path used. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
parent
1148de0adb
commit
a878ba4572
@ -1134,9 +1134,6 @@ static int group_retransmit_sources(struct igmp_group *group,
|
||||
struct igmp_source *src;
|
||||
int num_retransmit_sources_left = 0;
|
||||
|
||||
query_buf1_max_sources = (sizeof(query_buf1) - IGMP_V3_SOURCES_OFFSET) >> 2;
|
||||
query_buf2_max_sources = (sizeof(query_buf2) - IGMP_V3_SOURCES_OFFSET) >> 2;
|
||||
|
||||
source_addr1 = (struct in_addr *)(query_buf1 + IGMP_V3_SOURCES_OFFSET);
|
||||
source_addr2 = (struct in_addr *)(query_buf2 + IGMP_V3_SOURCES_OFFSET);
|
||||
|
||||
|
@ -107,7 +107,7 @@ pim_register_stop_recv (uint8_t *buf, int buf_size)
|
||||
l = pim_parse_addr_group (&group, buf, buf_size);
|
||||
buf += l;
|
||||
buf_size -= l;
|
||||
l = pim_parse_addr_ucast (&source, buf, buf_size);
|
||||
pim_parse_addr_ucast (&source, buf, buf_size);
|
||||
memset (&sg, 0, sizeof (struct prefix_sg));
|
||||
sg.src = source.u.prefix4;
|
||||
sg.grp = group.u.prefix4;
|
||||
|
@ -334,7 +334,7 @@ int pim_socket_recvfromto(int fd, uint8_t *buf, size_t len,
|
||||
|
||||
((struct sockaddr_in *) to)->sin_family = AF_INET;
|
||||
|
||||
if (pim_socket_getsockname(fd, (struct sockaddr *) &si, &si_len)) {
|
||||
if (pim_socket_getsockname(fd, (struct sockaddr *) &si, &si_len) != PIM_SOCK_ERR_NONE) {
|
||||
((struct sockaddr_in *) to)->sin_port = ntohs(0);
|
||||
((struct sockaddr_in *) to)->sin_addr.s_addr = ntohl(0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user