projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nterface-ip: remove superfluous iface check in interface_ip_set_enabled()
[project/netifd.git]
/
interface-ip.h
diff --git
a/interface-ip.h
b/interface-ip.h
index
607999e
..
197bd9a
100644
(file)
--- a/
interface-ip.h
+++ b/
interface-ip.h
@@
-31,14
+31,23
@@
enum device_addr_flags {
/* route overrides the default interface mtu */
DEVROUTE_MTU = (1 << 4),
/* route overrides the default interface mtu */
DEVROUTE_MTU = (1 << 4),
- /* route
automatically added by kernel
*/
- DEV
ADDR_KERNEL
= (1 << 5),
+ /* route
overrides the default proto type
*/
+ DEV
ROUTE_PROTO
= (1 << 5),
/* address is off-link (no subnet-route) */
DEVADDR_OFFLINK = (1 << 6),
/* route resides in different table */
DEVROUTE_TABLE = (1 << 7),
/* 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),
+
+ /* route is on-link */
+ DEVROUTE_ONLINK = (1 << 9),
+
+ /* route overrides the default route type */
+ DEVROUTE_TYPE = (1 << 10),
};
union if_addr {
};
union if_addr {
@@
-50,6
+59,8
@@
struct device_prefix_assignment {
struct list_head head;
int32_t assigned;
uint8_t length;
struct list_head head;
int32_t assigned;
uint8_t length;
+ int weight;
+ struct in6_addr addr;
bool enabled;
char name[];
};
bool enabled;
char name[];
};
@@
-62,50
+73,71
@@
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_
route
{
struct vlist_node node;
struct vlist_node node;
-
bool enabled
;
+
struct interface *iface
;
- /* ipv4 only */
-
uint32_t broadcast
;
-
uint32_t point_to_point
;
+ bool enabled;
+
bool keep
;
+
bool failed
;
- /* ipv6 only */
+ union if_addr nexthop;
+ int mtu;
+ unsigned int type;
+ unsigned int proto;
time_t valid_until;
time_t valid_until;
- time_t preferred_until;
/* must be last */
enum device_addr_flags flags;
/* 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;
unsigned int mask;
+ unsigned int sourcemask;
union if_addr addr;
union if_addr addr;
+ union if_addr source;
};
};
-struct device_
route
{
+struct device_
addr
{
struct vlist_node node;
struct vlist_node node;
- struct interface *iface;
-
bool enabled;
bool enabled;
- bool keep;
+ bool failed;
+ unsigned int policy_table;
- union if_addr nexthop;
- int mtu;
+ struct device_route subnet;
+
+ /* ipv4 only */
+ uint32_t broadcast;
+ uint32_t point_to_point;
+
+ /* ipv6 only */
time_t valid_until;
time_t valid_until;
+ time_t preferred_until;
+ char *pclass;
/* must be last */
enum device_addr_flags flags;
/* 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;
};
+struct device_source_table {
+ struct list_head head;
+ uint32_t table;
+ uint16_t refcount;
+ uint8_t v6;
+ uint8_t mask;
+ union if_addr addr;
+};
+
struct dns_server {
struct vlist_simple_node node;
int af;
struct dns_server {
struct vlist_simple_node node;
int af;
@@
-117,7
+149,7
@@
struct dns_search_domain {
char name[];
};
char name[];
};
-extern const struct
config
_param_list route_attr_list;
+extern const struct
uci_blob
_param_list route_attr_list;
extern struct list_head prefixes;
void interface_ip_init(struct interface *iface);
extern struct list_head prefixes;
void interface_ip_init(struct interface *iface);
@@
-134,11
+166,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);