1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- src/mactelnet.c.orig 2024-08-12 21:08:19 UTC
+++ src/mactelnet.c
@@ -37,6 +37,7 @@
#endif
#if defined(__FreeBSD__) || defined(__APPLE__)
#include <sys/types.h>
+#include <sys/mman.h>
#include <net/ethernet.h>
#else
#include <netinet/ether.h>
@@ -126,6 +127,8 @@ static unsigned int send_socket;
static unsigned int send_socket;
+static unsigned char *bcast_addr;
+
static int handle_packet(unsigned char *data, int data_len);
static void print_version() {
@@ -168,7 +171,7 @@ static int send_udp(struct mt_packet *packet, int retr
struct sockaddr_in socket_address;
socket_address.sin_family = AF_INET;
socket_address.sin_port = htons(MT_MACTELNET_PORT);
- socket_address.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+ memcpy(&(socket_address.sin_addr), bcast_addr, IPV4_ALEN);
sent_bytes = sendto(send_socket, packet->data, packet->size, 0, (struct sockaddr *)&socket_address,
sizeof(socket_address));
@@ -470,6 +473,9 @@ static int find_interface() {
continue;
}
+#if defined(__FreeBSD__)
+ setsockopt(testsocket, IPPROTO_IP, IP_ONESBCAST, &optval, sizeof(optval));
+#endif
setsockopt(testsocket, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval));
setsockopt(testsocket, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
@@ -488,6 +494,7 @@ static int find_interface() {
send_socket = testsocket;
memcpy(srcmac, interface->mac_addr, ETH_ALEN);
active_interface = interface;
+ bcast_addr = interface->bcast_addr;
/* Send a SESSIONSTART message with the current device */
init_packet(&data, MT_PTYPE_SESSIONSTART, srcmac, dstmac, sessionkey, 0);
|
