Hi Andreas Thanks for responding so quickly.
Attached is the unified diff as you requested. I would prefer when you could take this upstream. Thanks again, Mark On Thu, 2009-10-08 at 10:59 +0200, Andreas Henriksson wrote: > Hello Mark! > > On Wed, Oct 07, 2009 at 05:45:28PM +0200, Mark Borst wrote: > [...] > > The command "ip mroute show" will only show the first Oif. > [...] > > Thank you very much for the great bug report and the patch! > > [...] > > diff -rc iproute-20090324-origdeb/ip/ipmroute.c > > iproute-20090324/ip/ipmroute.c > [...] > > Could you please generate the diff in unified format (-u) ? > > I'll forward the patch upstream for you if you wish, but it's probably better > if you take the discussion upstream yourself! > Please post to the net...@vger.kernel.org mailing list and you also might > want to send a copy to shemmin...@vyatta.com, who is the upstream maintainer. > > -- > Regards, > Andreas Henriksson
Only in iproute-20090324/debian: files Only in iproute-20090324/debian: iproute Only in iproute-20090324/debian: iproute.debhelper.log Only in iproute-20090324/debian: iproute-dev Only in iproute-20090324/debian: iproute-dev.debhelper.log Only in iproute-20090324/debian: iproute-dev.substvars Only in iproute-20090324/debian: iproute-doc Only in iproute-20090324/debian: iproute-doc.debhelper.log Only in iproute-20090324/debian: iproute-doc.substvars diff -ru iproute-20090324-origdeb/debian/iproute.install iproute-20090324/debian/iproute.install --- iproute-20090324-origdeb/debian/iproute.install 2009-10-06 19:03:27.000000000 +0200 +++ iproute-20090324/debian/iproute.install 2009-10-07 18:27:08.000000000 +0200 @@ -3,6 +3,6 @@ misc/lnstat misc/nstat /usr/bin/ ip/routef ip/routel /usr/bin etc/* /etc -tc/*.so /usr/lib/tc +#tc/*.so /usr/lib/tc misc/arpd /usr/sbin netem/*.dist /usr/lib/tc Only in iproute-20090324/debian: iproute.substvars diff -ru iproute-20090324-origdeb/debian/rules iproute-20090324/debian/rules --- iproute-20090324-origdeb/debian/rules 2009-10-06 19:03:27.000000000 +0200 +++ iproute-20090324/debian/rules 2009-10-07 18:26:19.000000000 +0200 @@ -21,7 +21,8 @@ binary-indep: build-indep dh_testdir dh_testroot - dh_install -i --fail-missing + #dh_install -i --fail-missing + dh_install -i dh_link -i dh_installexamples -i -p iproute-doc examples/* dh_installman -i @@ -46,7 +47,8 @@ binary-arch: build-arch dh_testdir dh_testroot - dh_install -a --fail-missing + #dh_install -a --fail-missing + dh_install -a dh_link -a dh_installman -a dh_installdocs -a Only in iproute-20090324/doc: api-ip6-flowlabels.aux Only in iproute-20090324/doc: api-ip6-flowlabels.dvi Only in iproute-20090324/doc: api-ip6-flowlabels.log Only in iproute-20090324/doc: api-ip6-flowlabels.ps Only in iproute-20090324/doc: api-ip6-flowlabels.toc Only in iproute-20090324/doc: arpd.dvi Only in iproute-20090324/doc: arpd.html Only in iproute-20090324/doc: arpd.ps Only in iproute-20090324/doc: arpd.txt Only in iproute-20090324/doc: ip-cref.aux Only in iproute-20090324/doc: ip-cref.dvi Only in iproute-20090324/doc: ip-cref.log Only in iproute-20090324/doc: ip-cref.ps Only in iproute-20090324/doc: ip-cref.toc Only in iproute-20090324/doc: ip-tunnels.aux Only in iproute-20090324/doc: ip-tunnels.dvi Only in iproute-20090324/doc: ip-tunnels.log Only in iproute-20090324/doc: ip-tunnels.ps Only in iproute-20090324/doc: ip-tunnels.toc Only in iproute-20090324/doc: nstat.dvi Only in iproute-20090324/doc: nstat.html Only in iproute-20090324/doc: nstat.ps Only in iproute-20090324/doc: nstat.txt Only in iproute-20090324/doc: rtstat.dvi Only in iproute-20090324/doc: rtstat.html Only in iproute-20090324/doc: rtstat.ps Only in iproute-20090324/doc: rtstat.txt Only in iproute-20090324/doc: ss.dvi Only in iproute-20090324/doc: ss.html Only in iproute-20090324/doc: ss.ps Only in iproute-20090324/doc: ss.txt Only in iproute-20090324/genl: ctrl.o Only in iproute-20090324/genl: genl Only in iproute-20090324/genl: genl.o Only in iproute-20090324/ip: ip Only in iproute-20090324/ip: ip6tunnel.o Only in iproute-20090324/ip: ipaddress.o Only in iproute-20090324/ip: ipaddrlabel.o Only in iproute-20090324/ip: iplink.o Only in iproute-20090324/ip: iplink_vlan.o Only in iproute-20090324/ip: ipmaddr.o Only in iproute-20090324/ip: ipmonitor.o diff -ru iproute-20090324-origdeb/ip/ipmroute.c iproute-20090324/ip/ipmroute.c --- iproute-20090324-origdeb/ip/ipmroute.c 2009-10-07 17:21:00.000000000 +0200 +++ iproute-20090324/ip/ipmroute.c 2009-10-07 17:34:01.000000000 +0200 @@ -95,7 +95,7 @@ char obuf[256]; oiflist[0] = 0; - if (sscanf(buf, "%x%x%d%u%u%u%s", maddr.data, msrc.data, &vifi, + if (sscanf(buf, "%x%x%d%u%u%u%[^\n]", maddr.data, msrc.data, &vifi, &pkts, &b, &w, oiflist) < 6) continue; Only in iproute-20090324/ip: ipmroute.o Only in iproute-20090324/ip: ipneigh.o Only in iproute-20090324/ip: ipntable.o Only in iproute-20090324/ip: ip.o Only in iproute-20090324/ip: ipprefix.o Only in iproute-20090324/ip: iproute.o Only in iproute-20090324/ip: iprule.o Only in iproute-20090324/ip: iptunnel.o Only in iproute-20090324/ip: ipxfrm.o Only in iproute-20090324/ip: link_gre.o Only in iproute-20090324/ip: link_veth.o Only in iproute-20090324/ip: rtm_map.o Only in iproute-20090324/ip: rtmon Only in iproute-20090324/ip: rtmon.o Only in iproute-20090324/ip: tunnel.o Only in iproute-20090324/ip: xfrm_monitor.o Only in iproute-20090324/ip: xfrm_policy.o Only in iproute-20090324/ip: xfrm_state.o Only in iproute-20090324/lib: dnet_ntop.o Only in iproute-20090324/lib: dnet_pton.o Only in iproute-20090324/lib: inet_proto.o Only in iproute-20090324/lib: ipx_ntop.o Only in iproute-20090324/lib: ipx_pton.o Only in iproute-20090324/lib: libnetlink.a Only in iproute-20090324/lib: libnetlink.o Only in iproute-20090324/lib: libutil.a Only in iproute-20090324/lib: ll_addr.o Only in iproute-20090324/lib: ll_map.o Only in iproute-20090324/lib: ll_proto.o Only in iproute-20090324/lib: ll_types.o Only in iproute-20090324/lib: rt_names.o Only in iproute-20090324/lib: utils.o diff -ru iproute-20090324-origdeb/Makefile iproute-20090324/Makefile --- iproute-20090324-origdeb/Makefile 2009-10-07 17:07:52.000000000 +0200 +++ iproute-20090324/Makefile 2009-10-07 18:21:37.000000000 +0200 @@ -22,7 +22,7 @@ CC = gcc HOSTCC = gcc -CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g +CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall CFLAGS = $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v Only in iproute-20090324/misc: arpd Only in iproute-20090324/misc: lnstat Only in iproute-20090324/misc: lnstat.o Only in iproute-20090324/misc: lnstat_util.o Only in iproute-20090324/misc: nstat Only in iproute-20090324/misc: rtacct Only in iproute-20090324/misc: ss Only in iproute-20090324/misc: ssfilter.c Only in iproute-20090324/misc: ssfilter.o Only in iproute-20090324/misc: ss.o Only in iproute-20090324/netem: experimental.dist Only in iproute-20090324/netem: maketable Only in iproute-20090324/netem: normal Only in iproute-20090324/netem: normal.dist Only in iproute-20090324/netem: pareto Only in iproute-20090324/netem: pareto.dist Only in iproute-20090324/netem: paretonormal Only in iproute-20090324/netem: paretonormal.dist Only in iproute-20090324: patch-stamp Only in iproute-20090324: stamp-build Only in iproute-20090324: stamp-doc Only in iproute-20090324/tc: em_cmp.o Only in iproute-20090324/tc: em_meta.o Only in iproute-20090324/tc: em_nbyte.o Only in iproute-20090324/tc: emp_ematch.lex.o Only in iproute-20090324/tc: emp_ematch.yacc.h Only in iproute-20090324/tc: emp_ematch.yacc.o Only in iproute-20090324/tc: emp_ematch.yacc.output Only in iproute-20090324/tc: em_u32.o Only in iproute-20090324/tc: f_basic.o Only in iproute-20090324/tc: f_flow.o Only in iproute-20090324/tc: f_fw.o Only in iproute-20090324/tc: f_route.o Only in iproute-20090324/tc: f_rsvp.o Only in iproute-20090324/tc: f_tcindex.o Only in iproute-20090324/tc: f_u32.o Only in iproute-20090324/tc: libtc.a Only in iproute-20090324/tc: m_action.o Only in iproute-20090324/tc: m_ematch.o Only in iproute-20090324/tc: m_estimator.o Only in iproute-20090324/tc: m_gact.o Only in iproute-20090324/tc: m_ipt.o Only in iproute-20090324/tc: m_mirred.o Only in iproute-20090324/tc: m_nat.o Only in iproute-20090324/tc: m_pedit.o Only in iproute-20090324/tc: m_police.o Only in iproute-20090324/tc: m_skbedit.o Only in iproute-20090324/tc: p_icmp.o Only in iproute-20090324/tc: p_ip.o Only in iproute-20090324/tc: p_tcp.o Only in iproute-20090324/tc: p_udp.o Only in iproute-20090324/tc: q_cbq.o Only in iproute-20090324/tc: q_drr.o Only in iproute-20090324/tc: q_dsmark.o Only in iproute-20090324/tc: q_fifo.o Only in iproute-20090324/tc: q_gred.o Only in iproute-20090324/tc: q_hfsc.o Only in iproute-20090324/tc: q_htb.o Only in iproute-20090324/tc: q_ingress.o Only in iproute-20090324/tc: q_multiq.o Only in iproute-20090324/tc: q_netem.o Only in iproute-20090324/tc: q_prio.o Only in iproute-20090324/tc: q_red.o Only in iproute-20090324/tc: q_rr.o Only in iproute-20090324/tc: q_sfq.o Only in iproute-20090324/tc: q_tbf.o Only in iproute-20090324/tc: q_wrr.o Only in iproute-20090324/tc: tc Only in iproute-20090324/tc: tc_cbq.o Only in iproute-20090324/tc: tc_class.o Only in iproute-20090324/tc: tc_core.o Only in iproute-20090324/tc: tc_estimator.o Only in iproute-20090324/tc: tc_filter.o Only in iproute-20090324/tc: tc_monitor.o Only in iproute-20090324/tc: tc.o Only in iproute-20090324/tc: tc_qdisc.o Only in iproute-20090324/tc: tc_red.o Only in iproute-20090324/tc: tc_stab.o Only in iproute-20090324/tc: tc_util.o
