Repository navigation
Expand file tree
/
Copy pathpatch_themiron_ipv6.diff
More file actions
39 lines (38 loc) · 2.27 KB
/
Copy pathpatch_themiron_ipv6.diff
File metadata and controls
39 lines (38 loc) · 2.27 KB
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
diff --git a/accel-pppd/ipv6/dhcpv6.c b/accel-pppd/ipv6/dhcpv6.c
index be24858..95a0594 100644
--- a/accel-pppd/ipv6/dhcpv6.c
+++ b/accel-pppd/ipv6/dhcpv6.c
@@ -629,7 +629,8 @@ static void dhcpv6_recv_solicit(struct dhcpv6_packet *req)
if (!pd->clientid) {
pd->clientid = _malloc(sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
memcpy(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
- } else if (pd->clientid->hdr.len != req->clientid->hdr.len || memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
+ } else if (pd->clientid->hdr.len != req->clientid->hdr.len ||
+ memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
log_ppp_error("dhcpv6: unmatched Client-ID option\n");
return;
}
@@ -655,7 +656,8 @@ static void dhcpv6_recv_request(struct dhcpv6_packet *req)
if (!pd->clientid) {
pd->clientid = _malloc(sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
memcpy(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
- } else if (pd->clientid->hdr.len != req->clientid->hdr.len || memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
+ } else if (pd->clientid->hdr.len != req->clientid->hdr.len ||
+ memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
log_ppp_error("dhcpv6: unmatched Client-ID option\n");
return;
}
@@ -725,9 +727,11 @@ static void dhcpv6_recv_rebind(struct dhcpv6_packet *req)
return;
}
- if (!pd->clientid)
- return;
- else if (pd->clientid->hdr.len != req->clientid->hdr.len || memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
+ if (!pd->clientid) {
+ pd->clientid = _malloc(sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
+ memcpy(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len));
+ } else if (pd->clientid->hdr.len != req->clientid->hdr.len ||
+ memcmp(pd->clientid, req->clientid, sizeof(struct dhcpv6_opt_hdr) + ntohs(req->clientid->hdr.len))) {
log_ppp_error("dhcpv6: unmatched Client-ID option\n");
return;
}