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

GUACAMOL-513: Correctly handle unknown address families.

Browse Source
This commit is contained in:
Nick Couchman 2020-06-17 06:50:43 -04:00
parent b0bcb30346
commit e51c269a51
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libguac/wol.c
View File

@ -86,10 +86,10 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
wol_dest.sin_family = AF_INET; wol_dest.sin_family = AF_INET;
int retval = inet_pton(wol_dest.sin_family, broadcast_addr, &(wol_dest.sin_addr)); int retval = inet_pton(wol_dest.sin_family, broadcast_addr, &(wol_dest.sin_addr));
/* If return value is less than zero, the address doesn't match any known family. */ /* If return value is less than zero, this system doesn't know about IPv4. */
if (retval < 0) { if (retval < 0) {
guac_error = GUAC_STATUS_SEE_ERRNO; guac_error = GUAC_STATUS_SEE_ERRNO;
guac_error_message = "Unknown broadcast or multicast address type specified for Wake-on-LAN"; guac_error_message = "IPv4 address family is not supported";
return 0; return 0;
} }
@ -98,8 +98,15 @@ static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
wol_dest.sin_family = AF_INET6; wol_dest.sin_family = AF_INET6;
retval = inet_pton(wol_dest.sin_family, broadcast_addr, &(wol_dest.sin_addr)); retval = inet_pton(wol_dest.sin_family, broadcast_addr, &(wol_dest.sin_addr));
/* IPv6 didn't work, either, so bail out. */ /* System does not support IPv6. */
if (retval == 0) { if (retval < 0) {
guac_error = GUAC_STATUS_SEE_ERRNO;
guac_error_message = "IPv6 address family is not supported";
return 0;
}
/* Address didn't match IPv6. */
else if (retval == 0) {
guac_error = GUAC_STATUS_INVALID_ARGUMENT; guac_error = GUAC_STATUS_INVALID_ARGUMENT;
guac_error_message = "Invalid broadcast or multicast address specified for Wake-on-LAN"; guac_error_message = "Invalid broadcast or multicast address specified for Wake-on-LAN";
return 0; return 0;