Add route_protocol option
To be able to distinguish routes from several running l2tpns instances.
This commit is contained in:
parent
44b01d70c6
commit
b793850d2f
5 changed files with 37 additions and 18 deletions
10
l2tpns.c
10
l2tpns.c
|
|
@ -176,6 +176,8 @@ config_descriptt config_values[] = {
|
|||
CONFIG("guest_account", guest_user, STRING),
|
||||
CONFIG("bind_address", bind_address, IPv4),
|
||||
CONFIG("peer_address", peer_address, IPv4),
|
||||
CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
|
||||
CONFIG("route_protocol", route_protocol, SHORT),
|
||||
CONFIG("send_garp", send_garp, BOOL),
|
||||
CONFIG("throttle_speed", rl_rate, UNSIGNED_LONG),
|
||||
CONFIG("throttle_buckets", num_tbfs, INT),
|
||||
|
|
@ -194,7 +196,6 @@ config_descriptt config_values[] = {
|
|||
CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
|
||||
CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
|
||||
CONFIG("cluster_master_min_adv", cluster_master_min_adv, INT),
|
||||
CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
|
||||
CONFIG("cli_bind_address", cli_bind_address, IPv4),
|
||||
CONFIG("hostname", hostname, STRING),
|
||||
#ifdef BGP
|
||||
|
|
@ -1571,7 +1572,7 @@ static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, in
|
|||
req.rt.rtm_family = AF_INET;
|
||||
req.rt.rtm_dst_len = prefixlen;
|
||||
req.rt.rtm_table = RT_TABLE_MAIN;
|
||||
req.rt.rtm_protocol = 42;
|
||||
req.rt.rtm_protocol = config->route_protocol;
|
||||
req.rt.rtm_scope = RT_SCOPE_LINK;
|
||||
req.rt.rtm_type = RTN_UNICAST;
|
||||
|
||||
|
|
@ -1698,7 +1699,7 @@ void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add)
|
|||
req.rt.rtm_family = AF_INET6;
|
||||
req.rt.rtm_dst_len = prefixlen;
|
||||
req.rt.rtm_table = RT_TABLE_MAIN;
|
||||
req.rt.rtm_protocol = 42;
|
||||
req.rt.rtm_protocol = config->route_protocol;
|
||||
req.rt.rtm_scope = RT_SCOPE_LINK;
|
||||
req.rt.rtm_type = RTN_UNICAST;
|
||||
|
||||
|
|
@ -7513,6 +7514,9 @@ static void update_config()
|
|||
}
|
||||
}
|
||||
|
||||
if (!config->route_protocol)
|
||||
config->route_protocol = 42;
|
||||
|
||||
if (!*config->pppoe_ac_name)
|
||||
strncpy(config->pppoe_ac_name, DEFAULT_PPPOE_AC_NAME, sizeof(config->pppoe_ac_name) - 1);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue