blob: ae7da3fbd8a9c1b0df08d06b8c3eca8abd0694e7 (
plain)
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
|
Index: ipv4ll.c
==================================================================
--- a/ipv4ll.c
+++ b/ipv4ll.c
@@ -242,31 +242,33 @@
assert(astate != NULL);
assert(astate->iface != NULL);
ifp = astate->iface;
state = IPV4LL_STATE(ifp);
assert(state != NULL);
- assert(state->addr != NULL);
fail = 0;
/* RFC 3927 2.2.1, Probe Conflict Detection */
if (amsg == NULL ||
(amsg->sip.s_addr == astate->addr.s_addr ||
(amsg->sip.s_addr == 0 && amsg->tip.s_addr == astate->addr.s_addr)))
fail = astate->addr.s_addr;
/* RFC 3927 2.5, Conflict Defense */
- if (IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
+ if (state->addr != NULL &&
+ IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
amsg && amsg->sip.s_addr == state->addr->addr.s_addr)
fail = state->addr->addr.s_addr;
if (fail == 0)
return;
astate->failed.s_addr = fail;
arp_report_conflicted(astate, amsg);
- if (astate->failed.s_addr == state->addr->addr.s_addr) {
+ if (state->addr != NULL &&
+ astate->failed.s_addr == state->addr->addr.s_addr)
+ {
struct timespec now, defend;
/* RFC 3927 Section 2.5 says a defence should
* broadcast an ARP announcement.
* Because the kernel will also unicast a reply to the
@@ -378,16 +380,18 @@
astate->conflicted_cb = ipv4ll_conflicted;
astate->free_cb = ipv4ll_arpfree;
/* Find an existing IPv4LL address and ensure we can work with it. */
ia = ipv4_iffindlladdr(ifp);
+
#ifdef IN_IFF_TENTATIVE
if (ia != NULL && ia->addr_flags & IN_IFF_DUPLICATED) {
ipv4_deladdr(ia, 0);
ia = NULL;
}
#endif
+
if (ia != NULL) {
astate->addr = ia->addr;
#ifdef IN_IFF_TENTATIVE
if (ia->addr_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED)) {
logger(ifp->ctx, LOG_INFO,
|
