Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into int-new

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2017-08-09 12:46:27 +02:00
commit 69f7399247
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
filter/config.Y
View file

@ -112,7 +112,7 @@ f_new_ec_item(u32 kind, u32 ipv4_used, u32 key, u32 vf, u32 vt)
{ {
u64 fm, to; u64 fm, to;
if (ipv4_used || (key >= 0x10000)) { if ((kind != EC_GENERIC) && (ipv4_used || (key >= 0x10000))) {
check_u16(vf); check_u16(vf);
if (vt == EC_ALL) if (vt == EC_ALL)
vt = 0xFFFF; vt = 0xFFFF;

4
proto/radv/radv.c
View file

@ -167,7 +167,7 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
ifa->addr = find_lladdr(iface); ifa->addr = find_lladdr(iface);
if (!ifa->addr) if (!ifa->addr)
{ {
log(L_ERR "%s: Cannot find link-locad addr on interface %s", p->p.name, iface->name); log(L_ERR "%s: Missing link-local address on interface %s", p->p.name, iface->name);
return; return;
} }
@ -389,7 +389,7 @@ radv_reconfigure(struct proto *P, struct proto_config *CF)
if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF))) if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF)))
return 0; return 0;
P->cf = CF; /* radv_check_active() requires proper p->cf */ P->cf = CF; /* radv_check_active() requires proper P->cf */
p->active = radv_check_active(p); p->active = radv_check_active(p);
struct iface *iface; struct iface *iface;