zero init stack-based struct sockaddrin instances; rm refs to sin_zero padding in non-ports files (#28)
This commit is contained in:
committed by
Steve Karg
parent
aaec7ef817
commit
7f5045ff3f
@@ -138,7 +138,7 @@ void *dl_ip_thread(void *pArgs)
|
||||
|
||||
bool dl_ip_init(ROUTER_PORT *port, IP_DATA *ip_data)
|
||||
{
|
||||
struct sockaddr_in sin;
|
||||
struct sockaddr_in sin = { 0 };
|
||||
int socket_opt = 0;
|
||||
int status = 0; /* for error checking */
|
||||
|
||||
@@ -185,8 +185,6 @@ bool dl_ip_init(ROUTER_PORT *port, IP_DATA *ip_data)
|
||||
sin.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
sin.sin_port = ip_data->port;
|
||||
|
||||
memset(&sin.sin_zero, '\0', sizeof(sin.sin_zero));
|
||||
|
||||
status = bind(ip_data->socket, (const struct sockaddr *)&sin,
|
||||
sizeof(struct sockaddr));
|
||||
if (status < 0) {
|
||||
|
||||
@@ -138,7 +138,7 @@ int bip_send_pdu(BACNET_ADDRESS *dest, /* destination address */
|
||||
uint8_t *pdu, /* any data to be sent - may be null */
|
||||
unsigned pdu_len)
|
||||
{ /* number of bytes of data */
|
||||
struct sockaddr_in bip_dest;
|
||||
struct sockaddr_in bip_dest = { 0 };
|
||||
uint8_t mtu[MAX_MPDU] = { 0 };
|
||||
int mtu_len = 0;
|
||||
int bytes_sent = 0;
|
||||
@@ -177,7 +177,6 @@ int bip_send_pdu(BACNET_ADDRESS *dest, /* destination address */
|
||||
}
|
||||
bip_dest.sin_addr.s_addr = address.s_addr;
|
||||
bip_dest.sin_port = port;
|
||||
memset(&(bip_dest.sin_zero), '\0', 8);
|
||||
mtu_len = 2;
|
||||
mtu_len += encode_unsigned16(
|
||||
&mtu[mtu_len], (uint16_t)(pdu_len + 4 /*inclusive */));
|
||||
|
||||
@@ -842,7 +842,6 @@ int bvlc_send_mpdu(struct sockaddr_in *dest, uint8_t *mtu, uint16_t mtu_len)
|
||||
bvlc_dest.sin_family = AF_INET;
|
||||
bvlc_dest.sin_addr.s_addr = dest->sin_addr.s_addr;
|
||||
bvlc_dest.sin_port = dest->sin_port;
|
||||
memset(&(bvlc_dest.sin_zero), '\0', 8);
|
||||
/* Send the packet */
|
||||
return sendto(bip_socket(), (char *)mtu, mtu_len, 0,
|
||||
(struct sockaddr *)&bvlc_dest, sizeof(struct sockaddr));
|
||||
|
||||
Reference in New Issue
Block a user