diff options
| -rw-r--r-- | debian/changelog | 33 | ||||
| -rw-r--r-- | debian/vyatta-quagga.init.d | 2 | ||||
| -rw-r--r-- | zebra/rt_netlink.c | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a0dffeab..4b3e200c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +vyatta-quagga (0.99.9-6) unstable; urgency=low + + VC4.0.2 + [ Mark O'Brien ] + + + [ Stephen Hemminger ] + * Disable watchlink from the build + * go back to building watchlink + * Don't start watchlink + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Sat, 19 Apr 2008 11:56:27 -0700 + +vyatta-quagga (0.99.9-5) unstable; urgency=low + + VC4.0.2 release candidate + [ Mark O'Brien ] + + * 3.0.2 + + [ Stephen Hemminger ] + * interface running status fix + * Fix packet filter state machine + + [ rbalocca ] + * Add upgrade test to prerm + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Wed, 16 Apr 2008 09:50:28 -0700 + vyatta-quagga (0.99.9-4) unstable; urgency=low 3.0.2 diff --git a/debian/vyatta-quagga.init.d b/debian/vyatta-quagga.init.d index 0bf2eaab..26051d22 100644 --- a/debian/vyatta-quagga.init.d +++ b/debian/vyatta-quagga.init.d @@ -47,7 +47,7 @@ vyatta_quagga_start () if [ $# -gt 0 ] ; then daemons=( $* ) else - daemons+=( watchlink ) +# daemons+=( watchlink ) daemons+=( zebra ) daemons+=( ripd ) # daemons+=( ripngd ) diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 07e473bc..273c3121 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1951,7 +1951,7 @@ static void netlink_install_filter (int sock) BPF_STMT(BPF_LD|BPF_ABS|BPF_B, sizeof(struct nlmsghdr) + offsetof(struct rtmsg, rtm_protocol)), /* 2: ldb [23] */ - BPF_JUMP(BPF_JMP+ BPF_B, RTPROT_ZEBRA, 2, 0), + BPF_JUMP(BPF_JMP+ BPF_B, RTPROT_ZEBRA, 0, 1), /* 3: jeq 0xb jt 4 jf 5 */ BPF_STMT(BPF_RET|BPF_K, 0), /* 4: ret 0 */ BPF_STMT(BPF_RET|BPF_K, 0xffff), /* 5: ret 0xffff */ |