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

GUACAMOLE-513: No need to close socket when socket was never opened.

Browse Source
This commit is contained in:
Nick Couchman 2020-06-16 11:50:36 -04:00
parent 30bbb892db
commit 57c4dbf454
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libguac/wol.c
View File

@ -95,10 +95,8 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
wol_socket = socket(AF_INET, SOCK_DGRAM, 0); wol_socket = socket(AF_INET, SOCK_DGRAM, 0);
/* If opening a socket fails, bail out. */ /* If opening a socket fails, bail out. */
if (wol_socket < 0) { if (wol_socket < 0)
close(wol_socket);
return 0; return 0;
}
/* 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,
@ -113,16 +111,14 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
wol_socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); wol_socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
/* If opening the socket fails, bail out. */ /* If opening the socket fails, bail out. */
if (wol_socket < 0) { if (wol_socket < 0)
close(wol_socket);
return 0; return 0;
}
/* Stick to a single hop for now. */ /* Stick to a single hop for now. */
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)) < 0) {
close(wol_socket); close(wol_socket);
return 0; return 0;
} }