Commit 69f73992 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Merge branch 'master' into int-new

parents 5a41eed2 b3fae3a8

filter/config.Y

+1 −1
Original line number Diff line number Diff line
@@ -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;

proto/radv/radv.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE