diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-08-09 12:46:27 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-08-09 12:46:27 +0200 |
| commit | 69f73992477a0e29f939f9e2722f705c4ad72a38 (patch) | |
| tree | e10a486519a298668a84f30a1097129eafbd1136 | |
| parent | 5a41eed26d1b12861ba0ecddcd7cade335d2a192 (diff) | |
| parent | b3fae3a81796b6deea48445402793660fade5eb6 (diff) | |
Merge branch 'master' into int-new
| -rw-r--r-- | filter/config.Y | 2 | ||||
| -rw-r--r-- | proto/radv/radv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/filter/config.Y b/filter/config.Y index a64bb932..12e593d0 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -112,7 +112,7 @@ f_new_ec_item(u32 kind, u32 ipv4_used, u32 key, u32 vf, u32 vt) { u64 fm, to; - if (ipv4_used || (key >= 0x10000)) { + if ((kind != EC_GENERIC) && (ipv4_used || (key >= 0x10000))) { check_u16(vf); if (vt == EC_ALL) vt = 0xFFFF; diff --git a/proto/radv/radv.c b/proto/radv/radv.c index 4a6593b8..b4b1bc58 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -167,7 +167,7 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf ifa->addr = find_lladdr(iface); 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; } @@ -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))) 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); struct iface *iface; |