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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From dfd70608a6a2ea164b18e7874de58ef6fd781cef Mon Sep 17 00:00:00 2001
From: Solegaiter <159629996+Solegaiter@users.noreply.github.com>
Date: Tue, 18 Jun 2024 17:11:12 +0200
Subject: [PATCH] Patch libndp.c
This patches a bug that made it impossible to compile on gentoo musl. This is my first patch.
---
libndp/libndp.c | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/libndp/libndp.c b/libndp/libndp.c
index 72ec92e..8c57092 100644
--- a/libndp/libndp.c
+++ b/libndp/libndp.c
@@ -200,27 +200,32 @@ static int myrecvfrom6(int sockfd, void *buf, size_t *buflen, int flags,
}
static int mysendto6(int sockfd, void *buf, size_t buflen, int flags,
- struct in6_addr *addr, uint32_t ifindex)
+ struct in6_addr *addr, uint32_t ifindex)
{
- struct sockaddr_in6 sin6;
- ssize_t ret;
+ struct sockaddr_in6 sin6;
+ ssize_t ret;
+ memset(&sin6, 0, sizeof(sin6));
+
+ memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr));
+
+ sin6.sin6_scope_id = ifindex;
- memset(&sin6, 0, sizeof(sin6));
- memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr));
- sin6.sin6_scope_id = ifindex;
resend:
- ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6));
- if (ret == -1) {
- switch(errno) {
- case EINTR:
- goto resend;
- default:
- return -errno;
- }
- }
- return 0;
+ ret = sendto(sockfd, buf, buflen, flags, (const struct sockaddr *)&sin6, sizeof(sin6));
+
+ if (ret == -1) {
+ switch(errno) {
+ case EINTR:
+ goto resend;
+ default:
+ return -errno;
+ }
+ }
+
+ return 0;
}
+
static const char *str_in6_addr(struct in6_addr *addr, char buf[static INET6_ADDRSTRLEN])
{
return inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN);
|
