j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Define proper multicast subnets

Browse source
This commit is contained in:
thorkill 2015-07-14 12:11:37 +02:00
parent ce1c957e87
commit e282ed443f
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/net_setup.c
View file

@ -341,6 +341,7 @@ void update_edge_weight(void) {
c->edge->weight, c->edge->weight,
c->edge->avg_rtt*10); c->edge->avg_rtt*10);
/* avg_rtt is in ms */
if (edge_update_weigth(c->edge, c->edge->avg_rtt*10)) if (edge_update_weigth(c->edge, c->edge->avg_rtt*10))
send_add_edge(c, c->edge); send_add_edge(c, c->edge);
} }
@ -601,13 +602,25 @@ bool setup_myself_reloadable(void) {
free(bmode); free(bmode);
} }
const char* const DEFAULT_BROADCAST_SUBNETS[] = { "ff:ff:ff:ff:ff:ff", "255.255.255.255", "224.0.0.0/4", "ff00::/8" }; const char* const DEFAULT_BROADCAST_SUBNETS[] = { "ff:ff:ff:ff:ff:ff", "255.255.255.255"};
for (size_t i = 0; i < sizeof(DEFAULT_BROADCAST_SUBNETS) / sizeof(*DEFAULT_BROADCAST_SUBNETS); i++) { for (size_t i = 0; i < sizeof(DEFAULT_BROADCAST_SUBNETS) / sizeof(*DEFAULT_BROADCAST_SUBNETS); i++) {
subnet_t *s = new_subnet(); subnet_t *s = new_subnet();
if (!str2net(s, DEFAULT_BROADCAST_SUBNETS[i])) if (!str2net(s, DEFAULT_BROADCAST_SUBNETS[i]))
abort(); abort();
subnet_add(NULL, s); subnet_add(NULL, s);
} }
const char* const DEFAULT_MULTICAST_SUBNETS[] = { "224.0.0.0/4", "ff00::/8"};
for (size_t i = 0; i < sizeof(DEFAULT_MULTICAST_SUBNETS) / sizeof(*DEFAULT_MULTICAST_SUBNETS); i++) {
subnet_t *s = new_subnet();
if (!str2net(s, DEFAULT_MULTICAST_SUBNETS[i]))
abort();
s->multicast = true;
subnet_add(NULL, s);
}
for (config_t* cfg = lookup_config(config_tree, "BroadcastSubnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) { for (config_t* cfg = lookup_config(config_tree, "BroadcastSubnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
subnet_t *s; subnet_t *s;
if (!get_config_subnet(cfg, &s)) if (!get_config_subnet(cfg, &s))
@ -615,6 +628,13 @@ bool setup_myself_reloadable(void) {
subnet_add(NULL, s); subnet_add(NULL, s);
} }
for (config_t* cfg = lookup_config(config_tree, "MulticastSubnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
subnet_t *s;
if (!get_config_subnet(cfg, &s))
continue;
subnet_add(NULL, s);
}
#if !defined(SOL_IP) || !defined(IP_TOS) #if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance) if(priorityinheritance)
logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance"); logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");

1
src/subnet.h
View file

@ -52,6 +52,7 @@ typedef struct subnet_t {
subnet_type_t type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */ subnet_type_t type; /* subnet type (IPv4? IPv6? MAC? something even weirder?) */
time_t expires; /* expiry time */ time_t expires; /* expiry time */
bool multicast; /* true if this subnet is a multicast local-link only */
int weight; /* weight (higher value is higher priority) */ int weight; /* weight (higher value is higher priority) */
/* And now for the actual subnet: */ /* And now for the actual subnet: */