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

GUACAMOLE-513: Support determining IPv4 or IPv6.

Browse Source
This commit is contained in:
Nick Couchman 2020-03-18 20:31:02 -04:00
parent 0feda1fa2f
commit a0d4bacbc6
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libguac/guacamole/wol-constants.h
View File

@ -47,5 +47,13 @@
*/ */
#define GUAC_WOL_PACKET_SIZE 102 #define GUAC_WOL_PACKET_SIZE 102
/**
* The port number that the magic packet should contain as the destination. In
* reality this doesn't matter all that much, since the packet is not usually
* processed by a full IP stack, but it is considered a pretty standard
* practice.
*/
#define GUAC_WOL_PORT 9
#endif /* GUAC_WOL_CONSTANTS_H */ #endif /* GUAC_WOL_CONSTANTS_H */

41
src/libguac/wol.c
View File

@ -77,22 +77,43 @@ static void __guac_wol_create_magic_packet(unsigned char packet[],
static ssize_t __guac_wol_send_packet(const char* broadcast_addr, static ssize_t __guac_wol_send_packet(const char* broadcast_addr,
unsigned char packet[]) { unsigned char packet[]) {
int wol_bcast = 1;
struct sockaddr_in wol_dest; struct sockaddr_in wol_dest;
int wol_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); int wol_socket;
/* Attempt to set broadcast; exit with error if this fails. */ /* Determine the IP version, starting with IPv4. */
if (setsockopt(wol_socket, SOL_SOCKET, SO_BROADCAST, &wol_bcast, sizeof(wol_bcast)) < 0) { wol_dest.sin_port = htons(GUAC_WOL_PORT);
return 0; wol_dest.sin_family = AF_INET;
if (inet_pton(AF_INET, broadcast_addr, &(wol_dest.sin_addr)) == 0) {
wol_dest.sin_family = AF_INET6;
if (inet_pton(AF_INET6, broadcast_addr, &(wol_dest.sin_addr)) == 0)
return 0;
} }
/* Set server endpoint to the broadcast address. */ /* Set up socket for IPv4 broadcast. */
wol_dest.sin_family = AF_INET; if (wol_dest.sin_family == AF_INET) {
wol_dest.sin_port = htons(9); int wol_bcast = 1;
wol_dest.sin_addr.s_addr = inet_addr(broadcast_addr); wol_socket = socket(AF_INET, SOCK_DGRAM, 0);
/* Attempt to set broadcast; exit with error if this fails. */
if (setsockopt(wol_socket, SOL_SOCKET, SO_BROADCAST, &wol_bcast,
sizeof(wol_bcast)) < 0)
return 0;
}
/* Set up socket for IPv6 multicast. */
else {
wol_socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
/* Stick to a single hop for now. */
int hops = 1;
if (setsockopt(wol_socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &hops,
sizeof(hops)))
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, sizeof(unsigned char) * 102, 0, return sendto(wol_socket, packet, GUAC_WOL_PACKET_SIZE, 0,
(struct sockaddr*) &wol_dest, sizeof(wol_dest)); (struct sockaddr*) &wol_dest, sizeof(wol_dest));
} }