Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f0ca2286
Commit
f0ca2286
authored
Oct 16, 2003
by
Shirley Ma
Committed by
Stephen Hemminger
Oct 16, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[IPV6]: MIB fix, provide timestamps in ifa_cacheinfo.
parent
2608bab9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
164 additions
and
20 deletions
+164
-20
include/linux/rtnetlink.h
include/linux/rtnetlink.h
+4
-2
include/net/if_inet6.h
include/net/if_inet6.h
+6
-1
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+150
-17
net/ipv6/anycast.c
net/ipv6/anycast.c
+2
-0
net/ipv6/mcast.c
net/ipv6/mcast.c
+2
-0
No files found.
include/linux/rtnetlink.h
View file @
f0ca2286
...
@@ -352,8 +352,10 @@ enum
...
@@ -352,8 +352,10 @@ enum
struct
ifa_cacheinfo
struct
ifa_cacheinfo
{
{
__s32
ifa_prefered
;
__u32
ifa_prefered
;
__s32
ifa_valid
;
__u32
ifa_valid
;
__u32
cstamp
;
/* created timestamp, hundredths of seconds */
__u32
tstamp
;
/* updated timestamp, hundredths of seconds */
};
};
...
...
include/net/if_inet6.h
View file @
f0ca2286
...
@@ -34,7 +34,8 @@ struct inet6_ifaddr
...
@@ -34,7 +34,8 @@ struct inet6_ifaddr
__u32
valid_lft
;
__u32
valid_lft
;
__u32
prefered_lft
;
__u32
prefered_lft
;
unsigned
long
tstamp
;
unsigned
long
cstamp
;
/* created timestamp */
unsigned
long
tstamp
;
/* updated timestamp */
atomic_t
refcnt
;
atomic_t
refcnt
;
spinlock_t
lock
;
spinlock_t
lock
;
...
@@ -111,6 +112,8 @@ struct ifmcaddr6
...
@@ -111,6 +112,8 @@ struct ifmcaddr6
atomic_t
mca_refcnt
;
atomic_t
mca_refcnt
;
spinlock_t
mca_lock
;
spinlock_t
mca_lock
;
unsigned
char
mca_crcount
;
unsigned
char
mca_crcount
;
unsigned
long
mca_cstamp
;
unsigned
long
mca_tstamp
;
};
};
/* Anycast stuff */
/* Anycast stuff */
...
@@ -130,6 +133,8 @@ struct ifacaddr6
...
@@ -130,6 +133,8 @@ struct ifacaddr6
int
aca_users
;
int
aca_users
;
atomic_t
aca_refcnt
;
atomic_t
aca_refcnt
;
spinlock_t
aca_lock
;
spinlock_t
aca_lock
;
unsigned
long
aca_cstamp
;
unsigned
long
aca_tstamp
;
};
};
#define IFA_HOST IPV6_ADDR_LOOPBACK
#define IFA_HOST IPV6_ADDR_LOOPBACK
...
...
net/ipv6/addrconf.c
View file @
f0ca2286
...
@@ -92,6 +92,9 @@
...
@@ -92,6 +92,9 @@
#define ADBG(x)
#define ADBG(x)
#endif
#endif
#define INFINITY_LIFE_TIME 0xFFFFFFFF
#define TIME_DELTA(a,b) ((unsigned long)((long)(a) - (long)(b)))
#ifdef CONFIG_SYSCTL
#ifdef CONFIG_SYSCTL
static
void
addrconf_sysctl_register
(
struct
inet6_dev
*
idev
,
struct
ipv6_devconf
*
p
);
static
void
addrconf_sysctl_register
(
struct
inet6_dev
*
idev
,
struct
ipv6_devconf
*
p
);
static
void
addrconf_sysctl_unregister
(
struct
ipv6_devconf
*
p
);
static
void
addrconf_sysctl_unregister
(
struct
ipv6_devconf
*
p
);
...
@@ -505,6 +508,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
...
@@ -505,6 +508,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
ifa
->
scope
=
scope
;
ifa
->
scope
=
scope
;
ifa
->
prefix_len
=
pfxlen
;
ifa
->
prefix_len
=
pfxlen
;
ifa
->
flags
=
flags
|
IFA_F_TENTATIVE
;
ifa
->
flags
=
flags
|
IFA_F_TENTATIVE
;
ifa
->
cstamp
=
ifa
->
tstamp
=
jiffies
;
read_lock
(
&
addrconf_lock
);
read_lock
(
&
addrconf_lock
);
if
(
idev
->
dead
)
{
if
(
idev
->
dead
)
{
...
@@ -707,6 +711,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
...
@@ -707,6 +711,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
ift
->
ifpub
=
ifp
;
ift
->
ifpub
=
ifp
;
ift
->
valid_lft
=
tmp_valid_lft
;
ift
->
valid_lft
=
tmp_valid_lft
;
ift
->
prefered_lft
=
tmp_prefered_lft
;
ift
->
prefered_lft
=
tmp_prefered_lft
;
ift
->
cstamp
=
ifp
->
cstamp
;
ift
->
tstamp
=
ifp
->
tstamp
;
ift
->
tstamp
=
ifp
->
tstamp
;
spin_unlock_bh
(
&
ift
->
lock
);
spin_unlock_bh
(
&
ift
->
lock
);
addrconf_dad_start
(
ift
,
0
);
addrconf_dad_start
(
ift
,
0
);
...
@@ -1412,6 +1417,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
...
@@ -1412,6 +1417,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len)
}
}
update_lft
=
create
=
1
;
update_lft
=
create
=
1
;
ifp
->
cstamp
=
jiffies
;
addrconf_dad_start
(
ifp
,
RTF_ADDRCONF
|
RTF_PREFIX_RT
);
addrconf_dad_start
(
ifp
,
RTF_ADDRCONF
|
RTF_PREFIX_RT
);
}
}
...
@@ -2447,14 +2453,95 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
...
@@ -2447,14 +2453,95 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
if
(
!
(
ifa
->
flags
&
IFA_F_PERMANENT
))
{
if
(
!
(
ifa
->
flags
&
IFA_F_PERMANENT
))
{
ci
.
ifa_prefered
=
ifa
->
prefered_lft
;
ci
.
ifa_prefered
=
ifa
->
prefered_lft
;
ci
.
ifa_valid
=
ifa
->
valid_lft
;
ci
.
ifa_valid
=
ifa
->
valid_lft
;
if
(
ci
.
ifa_prefered
!=
0xFFFFFFFF
)
{
if
(
ci
.
ifa_prefered
!=
INFINITY_LIFE_TIME
)
{
long
tval
=
(
jiffies
-
ifa
->
tstamp
)
/
HZ
;
long
tval
=
(
jiffies
-
ifa
->
tstamp
)
/
HZ
;
ci
.
ifa_prefered
-=
tval
;
ci
.
ifa_prefered
-=
tval
;
if
(
ci
.
ifa_valid
!=
0xFFFFFFFF
)
if
(
ci
.
ifa_valid
!=
INFINITY_LIFE_TIME
)
ci
.
ifa_valid
-=
tval
;
ci
.
ifa_valid
-=
tval
;
}
}
RTA_PUT
(
skb
,
IFA_CACHEINFO
,
sizeof
(
ci
),
&
ci
);
}
else
{
ci
.
ifa_prefered
=
INFINITY_LIFE_TIME
;
ci
.
ifa_valid
=
INFINITY_LIFE_TIME
;
}
}
ci
.
cstamp
=
(
__u32
)(
TIME_DELTA
(
ifa
->
cstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifa
->
cstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
ci
.
tstamp
=
(
__u32
)(
TIME_DELTA
(
ifa
->
tstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifa
->
tstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
RTA_PUT
(
skb
,
IFA_CACHEINFO
,
sizeof
(
ci
),
&
ci
);
nlh
->
nlmsg_len
=
skb
->
tail
-
b
;
return
skb
->
len
;
nlmsg_failure:
rtattr_failure:
skb_trim
(
skb
,
b
-
skb
->
data
);
return
-
1
;
}
static
int
inet6_fill_ifmcaddr
(
struct
sk_buff
*
skb
,
struct
ifmcaddr6
*
ifmca
,
u32
pid
,
u32
seq
,
int
event
)
{
struct
ifaddrmsg
*
ifm
;
struct
nlmsghdr
*
nlh
;
struct
ifa_cacheinfo
ci
;
unsigned
char
*
b
=
skb
->
tail
;
nlh
=
NLMSG_PUT
(
skb
,
pid
,
seq
,
event
,
sizeof
(
*
ifm
));
if
(
pid
)
nlh
->
nlmsg_flags
|=
NLM_F_MULTI
;
ifm
=
NLMSG_DATA
(
nlh
);
ifm
->
ifa_family
=
AF_INET6
;
ifm
->
ifa_prefixlen
=
128
;
ifm
->
ifa_flags
=
IFA_F_PERMANENT
;
ifm
->
ifa_scope
=
RT_SCOPE_UNIVERSE
;
if
(
ipv6_addr_scope
(
&
ifmca
->
mca_addr
)
&
IFA_SITE
)
ifm
->
ifa_scope
=
RT_SCOPE_SITE
;
ifm
->
ifa_index
=
ifmca
->
idev
->
dev
->
ifindex
;
RTA_PUT
(
skb
,
IFA_ADDRESS
,
16
,
&
ifmca
->
mca_addr
);
ci
.
cstamp
=
(
__u32
)(
TIME_DELTA
(
ifmca
->
mca_cstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifmca
->
mca_cstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
ci
.
tstamp
=
(
__u32
)(
TIME_DELTA
(
ifmca
->
mca_tstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifmca
->
mca_tstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
ci
.
ifa_prefered
=
INFINITY_LIFE_TIME
;
ci
.
ifa_valid
=
INFINITY_LIFE_TIME
;
RTA_PUT
(
skb
,
IFA_CACHEINFO
,
sizeof
(
ci
),
&
ci
);
nlh
->
nlmsg_len
=
skb
->
tail
-
b
;
return
skb
->
len
;
nlmsg_failure:
rtattr_failure:
skb_trim
(
skb
,
b
-
skb
->
data
);
return
-
1
;
}
static
int
inet6_fill_ifacaddr
(
struct
sk_buff
*
skb
,
struct
ifacaddr6
*
ifaca
,
u32
pid
,
u32
seq
,
int
event
)
{
struct
ifaddrmsg
*
ifm
;
struct
nlmsghdr
*
nlh
;
struct
ifa_cacheinfo
ci
;
unsigned
char
*
b
=
skb
->
tail
;
nlh
=
NLMSG_PUT
(
skb
,
pid
,
seq
,
event
,
sizeof
(
*
ifm
));
if
(
pid
)
nlh
->
nlmsg_flags
|=
NLM_F_MULTI
;
ifm
=
NLMSG_DATA
(
nlh
);
ifm
->
ifa_family
=
AF_INET6
;
ifm
->
ifa_prefixlen
=
128
;
ifm
->
ifa_flags
=
IFA_F_PERMANENT
;
ifm
->
ifa_scope
=
RT_SCOPE_UNIVERSE
;
if
(
ipv6_addr_scope
(
&
ifaca
->
aca_addr
)
&
IFA_SITE
)
ifm
->
ifa_scope
=
RT_SCOPE_SITE
;
ifm
->
ifa_index
=
ifaca
->
aca_idev
->
dev
->
ifindex
;
RTA_PUT
(
skb
,
IFA_ADDRESS
,
16
,
&
ifaca
->
aca_addr
);
ci
.
cstamp
=
(
__u32
)(
TIME_DELTA
(
ifaca
->
aca_cstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifaca
->
aca_cstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
ci
.
tstamp
=
(
__u32
)(
TIME_DELTA
(
ifaca
->
aca_tstamp
,
INITIAL_JIFFIES
)
/
HZ
*
100
+
TIME_DELTA
(
ifaca
->
aca_tstamp
,
INITIAL_JIFFIES
)
%
HZ
*
100
/
HZ
);
ci
.
ifa_prefered
=
INFINITY_LIFE_TIME
;
ci
.
ifa_valid
=
INFINITY_LIFE_TIME
;
RTA_PUT
(
skb
,
IFA_CACHEINFO
,
sizeof
(
ci
),
&
ci
);
nlh
->
nlmsg_len
=
skb
->
tail
-
b
;
nlh
->
nlmsg_len
=
skb
->
tail
-
b
;
return
skb
->
len
;
return
skb
->
len
;
...
@@ -2468,33 +2555,79 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
...
@@ -2468,33 +2555,79 @@ static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
{
{
int
idx
,
ip_idx
;
int
idx
,
ip_idx
;
int
s_idx
,
s_ip_idx
;
int
s_idx
,
s_ip_idx
;
int
err
=
1
;
struct
net_device
*
dev
;
struct
inet6_dev
*
idev
=
NULL
;
struct
inet6_ifaddr
*
ifa
;
struct
inet6_ifaddr
*
ifa
;
struct
ifmcaddr6
*
ifmca
;
struct
ifacaddr6
*
ifaca
;
s_idx
=
cb
->
args
[
0
];
s_idx
=
cb
->
args
[
0
];
s_ip_idx
=
ip_idx
=
cb
->
args
[
1
];
s_ip_idx
=
ip_idx
=
cb
->
args
[
1
];
read_lock
(
&
dev_base_lock
);
for
(
idx
=
0
;
idx
<
IN6_ADDR_HSIZE
;
idx
++
)
{
for
(
dev
=
dev_base
,
idx
=
0
;
dev
;
dev
=
dev
->
next
,
idx
++
)
{
if
(
idx
<
s_idx
)
if
(
idx
<
s_idx
)
continue
;
continue
;
if
(
idx
>
s_idx
)
if
(
idx
>
s_idx
)
s_ip_idx
=
0
;
s_ip_idx
=
0
;
read_lock_bh
(
&
addrconf_hash_lock
);
ip_idx
=
0
;
for
(
ifa
=
inet6_addr_lst
[
idx
],
ip_idx
=
0
;
ifa
;
if
((
idev
=
in6_dev_get
(
dev
))
==
NULL
)
ifa
=
ifa
->
lst_next
,
ip_idx
++
)
{
continue
;
read_lock_bh
(
&
idev
->
lock
);
/* unicast address */
for
(
ifa
=
idev
->
addr_list
;
ifa
;
ifa
=
ifa
->
if_next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
if
(
ip_idx
<
s_ip_idx
)
continue
;
continue
;
if
(
inet6_fill_ifaddr
(
skb
,
ifa
,
NETLINK_CB
(
cb
->
skb
).
pid
,
if
(
(
err
=
inet6_fill_ifaddr
(
skb
,
ifa
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
)
<=
0
)
{
NETLINK_CB
(
cb
->
skb
).
pid
,
read_unlock_bh
(
&
addrconf_hash_lock
);
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
goto
done
;
}
}
/* temp addr */
#ifdef CONFIG_IPV6_PRIVACY
for
(
ifa
=
idev
->
tempaddr_list
;
ifa
;
ifa
=
ifua
->
tmp_next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
continue
;
if
((
err
=
inet6_fill_ifaddr
(
skb
,
ifa
,
NETLINK_CB
(
cb
->
skb
).
pid
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
}
}
read_unlock_bh
(
&
addrconf_hash_lock
);
#endif
/* multicast address */
for
(
ifmca
=
idev
->
mc_list
;
ifmca
;
ifmca
=
ifmca
->
next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
continue
;
if
((
err
=
inet6_fill_ifmcaddr
(
skb
,
ifmca
,
NETLINK_CB
(
cb
->
skb
).
pid
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
}
/* anycast address */
for
(
ifaca
=
idev
->
ac_list
;
ifaca
;
ifaca
=
ifaca
->
aca_next
,
ip_idx
++
)
{
if
(
ip_idx
<
s_ip_idx
)
continue
;
if
((
err
=
inet6_fill_ifacaddr
(
skb
,
ifaca
,
NETLINK_CB
(
cb
->
skb
).
pid
,
cb
->
nlh
->
nlmsg_seq
,
RTM_NEWADDR
))
<=
0
)
goto
done
;
}
read_unlock_bh
(
&
idev
->
lock
);
in6_dev_put
(
idev
);
}
}
done:
done:
if
(
err
<=
0
)
{
read_unlock_bh
(
&
idev
->
lock
);
in6_dev_put
(
idev
);
}
read_unlock
(
&
dev_base_lock
);
cb
->
args
[
0
]
=
idx
;
cb
->
args
[
0
]
=
idx
;
cb
->
args
[
1
]
=
ip_idx
;
cb
->
args
[
1
]
=
ip_idx
;
return
skb
->
len
;
return
skb
->
len
;
}
}
...
...
net/ipv6/anycast.c
View file @
f0ca2286
...
@@ -343,6 +343,8 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr)
...
@@ -343,6 +343,8 @@ int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr)
ipv6_addr_copy
(
&
aca
->
aca_addr
,
addr
);
ipv6_addr_copy
(
&
aca
->
aca_addr
,
addr
);
aca
->
aca_idev
=
idev
;
aca
->
aca_idev
=
idev
;
aca
->
aca_users
=
1
;
aca
->
aca_users
=
1
;
/* aca_tstamp should be updated upon changes */
aca
->
aca_cstamp
=
aca
->
aca_tstamp
=
jiffies
;
atomic_set
(
&
aca
->
aca_refcnt
,
2
);
atomic_set
(
&
aca
->
aca_refcnt
,
2
);
aca
->
aca_lock
=
SPIN_LOCK_UNLOCKED
;
aca
->
aca_lock
=
SPIN_LOCK_UNLOCKED
;
...
...
net/ipv6/mcast.c
View file @
f0ca2286
...
@@ -830,6 +830,8 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr)
...
@@ -830,6 +830,8 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr)
ipv6_addr_copy
(
&
mc
->
mca_addr
,
addr
);
ipv6_addr_copy
(
&
mc
->
mca_addr
,
addr
);
mc
->
idev
=
idev
;
mc
->
idev
=
idev
;
mc
->
mca_users
=
1
;
mc
->
mca_users
=
1
;
/* mca_stamp should be updated upon changes */
mc
->
mca_cstamp
=
mc
->
mca_tstamp
=
jiffies
;
atomic_set
(
&
mc
->
mca_refcnt
,
2
);
atomic_set
(
&
mc
->
mca_refcnt
,
2
);
mc
->
mca_lock
=
SPIN_LOCK_UNLOCKED
;
mc
->
mca_lock
=
SPIN_LOCK_UNLOCKED
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment