Skip to content

[dhcprelay] Replace memset function #12

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

Merged
yxieca merged 3 commits into from
Aug 29, 2022
Merged

[dhcprelay] Replace memset function #12

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00daa2b
Replace memset function
maipbui Aug 22, 2022
73a0e7e
Remove memset for a special case
maipbui Aug 23, 2022
d023c1f
Remove memset_s
maipbui Aug 25, 2022
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: 8 additions & 4 deletions src/relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define __STDC_WANT_LIB_EXT1__ 1
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <event.h>
Expand Down Expand Up @@ -379,10 +381,8 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
*/
void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int index) {
struct ifaddrs *ifa, *ifa_tmp;
sockaddr_in6 addr;
sockaddr_in6 ll_addr;
memset(&addr, 0, sizeof(addr));
memset(&ll_addr, 0, sizeof(ll_addr));
sockaddr_in6 addr = {0};
sockaddr_in6 ll_addr = {0};

if ((*local_sock = socket(AF_INET6, SOCK_DGRAM, 0)) == -1) {
syslog(LOG_ERR, "socket: Failed to create socket on interface %s\n", config->interface.c_str());
Expand Down Expand Up @@ -514,7 +514,11 @@ void relay_relay_forw(int sock, const uint8_t *msg, int32_t len, const ip6_hdr *
memcpy(&new_message.peer_address, &ip_hdr->ip6_src, sizeof(in6_addr));
new_message.hop_count = dhcp_relay_header->hop_count + 1;

#ifdef __STDC_LIB_EXT1__
memset_s(&new_message.link_address, sizeof(new_message.link_address), 0, sizeof(in6_addr));
#else
memset(&new_message.link_address, 0, sizeof(in6_addr));
#endif

memcpy(current_buffer_position, &new_message, sizeof(dhcpv6_relay_msg));
current_buffer_position += sizeof(dhcpv6_relay_msg);
Expand Down