projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPv6: fix device_prefix vlist_key to not include prefix class
[project/netifd.git]
/
interface-ip.h
diff --git
a/interface-ip.h
b/interface-ip.h
index
91358b8
..
5cc5665
100644
(file)
--- a/
interface-ip.h
+++ b/
interface-ip.h
@@
-36,6
+36,12
@@
enum device_addr_flags {
/* address is off-link (no subnet-route) */
DEVADDR_OFFLINK = (1 << 6),
/* address is off-link (no subnet-route) */
DEVADDR_OFFLINK = (1 << 6),
+
+ /* route resides in different table */
+ DEVROUTE_TABLE = (1 << 7),
+
+ /* route resides in default source-route table */
+ DEVROUTE_SRCTABLE = (1 << 8),
};
union if_addr {
};
union if_addr {
@@
-59,11
+65,13
@@
struct device_prefix {
time_t valid_until;
time_t preferred_until;
time_t valid_until;
time_t preferred_until;
- struct in6_addr addr;
struct in6_addr excl_addr;
struct in6_addr excl_addr;
+ uint8_t excl_length;
+ struct in6_addr addr;
uint8_t length;
uint8_t length;
- uint8_t excl_length;
+
+ char pclass[];
};
struct device_addr {
};
struct device_addr {
@@
-98,6
+106,7
@@
struct device_route {
/* must be last */
enum device_addr_flags flags;
int metric; // there can be multiple routes to the same target
/* must be last */
enum device_addr_flags flags;
int metric; // there can be multiple routes to the same target
+ unsigned int table;
unsigned int mask;
union if_addr addr;
};
unsigned int mask;
union if_addr addr;
};
@@
-130,11
+139,11
@@
void interface_ip_flush(struct interface_ip_settings *ip);
void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled);
void interface_ip_update_metric(struct interface_ip_settings *ip, int metric);
-struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6);
+struct interface *interface_ip_add_target_route(union if_addr *addr, bool v6
, struct interface *iface
);
struct device_prefix* interface_ip_add_device_prefix(struct interface *iface,
struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until,
struct device_prefix* interface_ip_add_device_prefix(struct interface *iface,
struct in6_addr *addr, uint8_t length, time_t valid_until, time_t preferred_until,
- struct in6_addr *excl_addr, uint8_t excl_length);
+ struct in6_addr *excl_addr, uint8_t excl_length
, const char *pclass
);
void interface_ip_set_ula_prefix(const char *prefix);
void interface_refresh_assignments(bool hint);
void interface_ip_set_ula_prefix(const char *prefix);
void interface_refresh_assignments(bool hint);