maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-513: Properly close WOL socket.

Browse Source
This commit is contained in:
Nick Couchman 2020-06-07 20:33:19 -04:00
parent df8030d9bb
commit 2aa2ccc90c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libguac/wol.c
View File

@ -96,9 +96,11 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
/* Attempt to set broadcast; exit with error if this fails. */ /* Attempt to set broadcast; exit with error if this fails. */
if (setsockopt(wol_socket, SOL_SOCKET, SO_BROADCAST, &wol_bcast, if (setsockopt(wol_socket, SOL_SOCKET, SO_BROADCAST, &wol_bcast,
sizeof(wol_bcast)) < 0) sizeof(wol_bcast)) < 0) {
close(wol_socket);
return 0; return 0;
} }
}
/* Set up socket for IPv6 multicast. */ /* Set up socket for IPv6 multicast. */
else { else {
@ -108,13 +110,17 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
int hops = 1; int hops = 1;
if (setsockopt(wol_socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &hops, if (setsockopt(wol_socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &hops,
sizeof(hops))) sizeof(hops))) {
close(wol_socket);
return 0; return 0;
} }
}
/* Send the packet and return number of bytes sent. */ /* Send the packet and return number of bytes sent. */
return sendto(wol_socket, packet, GUAC_WOL_PACKET_SIZE, 0, int bytes = sendto(wol_socket, packet, GUAC_WOL_PACKET_SIZE, 0,
(struct sockaddr*) &wol_dest, sizeof(wol_dest)); (struct sockaddr*) &wol_dest, sizeof(wol_dest));
close(wol_socket);
return bytes;
} }