Commit 5c5a1b86 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Merge commit 'aearsis/pim^' into pim

parents 43a49a94 b5b6ab65

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ if test "$enable_mpls_kernel" != no ; then 
  fi

fi



all_protocols="$proto_bfd babel bgp ospf pipe radv rip $proto_rpki static"

all_protocols="$proto_bfd babel bgp igmp ospf pipe radv rip $proto_rpki static"



all_protocols=`echo $all_protocols | sed 's/ /,/g'`

lib/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define IP4_OSPF_ALL_ROUTERS	ipa_build4(224, 0, 0, 5)

#define IP4_OSPF_DES_ROUTERS	ipa_build4(224, 0, 0, 6)

#define IP4_RIP_ROUTERS		ipa_build4(224, 0, 0, 9)

#define IP4_IGMP_ROUTERS	ipa_build4(224, 0, 0, 22)



#define IP6_ALL_NODES		ipa_build6(0xFF020000, 0, 0, 1)

#define IP6_ALL_ROUTERS		ipa_build6(0xFF020000, 0, 0, 2)

lib/timer.c

+8 −0
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ tm_start(timer *t, btime after) 
  tm_set(t, current_time() + MAX(after, 0));

}



void

tm_shift(timer *t, btime delta)

{

  btime now = current_time();

  if (t->expires && (t->expires > now))

    tm_set(t, MAX(now, t->expires + delta));

}



void

tm_stop(timer *t)

{

lib/timer.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern btime boot_time; 
timer *tm_new(pool *p);

void tm_set(timer *t, btime when);

void tm_start(timer *t, btime after);

void tm_shift(timer *t, btime delta);

void tm_stop(timer *t);



static inline int

nest/proto.c

+3 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,9 @@ protos_build(void) 
#ifdef CONFIG_RPKI

  proto_build(&proto_rpki);

#endif

#ifdef CONFIG_IGMP

  proto_build(&proto_igmp);

#endif



  proto_pool = rp_new(&root_pool, "Protocols");

  proto_shutdown_timer = tm_new(proto_pool);

CRA Git | Maintained and supported by SUSTech CRA and CCSE