[mpls-linux-general] Problems Patching zebra with LDP

[Josef P. <jo...@pe...>]

Hi to all,

I'm sorry I'm flooding the mailing list a little bit, but i really come not
into the next step the zebra implementation of LDP:

I want to use ZEBRA with the LDP Implemenatiotion of MPLS Linux

I get also some "Hunks Failed" when I patch the zebra-0.94 files with the
ldp_zebra_diff

when I configure and make them I get the following errors:

source='rt_netlink.c' object='rt_netlink.o' libtool=no \
depfile='.deps/rt_netlink.Po' tmpdepfile='.deps/rt_netlink.TPo' \
depmode=gcc3 /bin/sh ../depcomp \
gcc -DHAVE_CONFIG_H -DSYSCONFDIR=\"/usr/local/etc/\" -DMULTIPATH_NUM=1 -I.
-I. -I.. -I.. -I.. -I../lib    -g -O2 -Wall -c `test -f 'rt_netlink.c' ||
echo './'`rt_netlink.c
rt_netlink.c: In function `netlink_route_change':
rt_netlink.c:678: error: `RTA_LSP' undeclared (first use in this function)
rt_netlink.c:678: error: (Each undeclared identifier is reported only once
rt_netlink.c:678: error: for each function it appears in.)
rt_netlink.c: In function `netlink_route_multipath':
rt_netlink.c:1227: error: `RTA_LSP' undeclared (first use in this function)
rt_netlink.c:1318: error: structure has no member named `rtnh_lsp'
rt_netlink.c:1348: error: structure has no member named `rtnh_lsp'
make[2]: *** [rt_netlink.o] Error 1
make[2]: Leaving directory `/root/zebra-0.94/zebra'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/zebra-0.94'
make: *** [all] Error 2
uml:~/zebra-0.94# 


When I compile the zebra without mpls patching it the make works.

Do you know what I'm doing wrong? or should i wait for the next release of
the ldp-implementation? When will it be released?

I use Debian: sid, uml kernel: 2.6.4


regards josef

Josef Perlinger

Student FH-Sbg/TKS 2000
Tel.: +43 664 4024906
ICQ: 166227595
Email: jo...@pe...



attached my Patching output:

uml:~/zebra-0.94_mpls# patch -p1 < ../ldp-portable/zebra-ldp.diff 
patching file bgpd/bgpd.c
Hunk #2 FAILED at 181.
Hunk #3 succeeded at 1758 (offset 60 lines).
1 out of 3 hunks FAILED -- saving rejects to file bgpd/bgpd.c.rej
patching file bgpd/bgpd.h
patching file bgpd/bgp_vty.c
Hunk #1 succeeded at 40 (offset 1 line).
Hunk #2 succeeded at 401 (offset 1 line).
Hunk #3 succeeded at 429 (offset 1 line).
patching file bgpd/bgp_zebra.c
patching file config.h.in
patching file configure.ac
Hunk #2 succeeded at 538 (offset 2 lines).
Hunk #3 succeeded at 566 (offset 2 lines).
Hunk #4 succeeded at 788 (offset 2 lines).
Hunk #5 succeeded at 810 (offset 2 lines).
patching file lib/command.c
Hunk #1 succeeded at 2153 (offset 73 lines).
Hunk #2 succeeded at 2217 (offset 73 lines).
patching file lib/command.h
patching file lib/if.c
patching file lib/if.h
patching file lib/linklist.h
patching file lib/log.c
patching file lib/log.h
patching file lib/memory.c
patching file lib/memory.h
patching file lib/table.c
patching file lib/table.h
patching file lib/thread.c
patching file lib/vty.c
Hunk #1 succeeded at 648 (offset 24 lines).
Hunk #2 succeeded at 1058 (offset 24 lines).
patching file lib/zclient.c
patching file lib/zclient.h
patching file lib/zebra.h
patching file Makefile.am
patching file mplsd/create-links
patching file mplsd/delete-links
patching file mplsd/impl_fib.c
patching file mplsd/impl_fib.h
patching file mplsd/impl_ifmgr.c
patching file mplsd/impl_ifmgr.h
patching file mplsd/impl_lock.c
patching file mplsd/impl_mm.c
patching file mplsd/impl_mpls.c
patching file mplsd/impl_mpls.h
patching file mplsd/impl_policy.c
patching file mplsd/impl_socket.c
patching file mplsd/impl_timer.c
patching file mplsd/impl_tree.c
patching file mplsd/l2cc_interface.c
patching file mplsd/l2cc_interface.h
patching file mplsd/ldp.c
patching file mplsd/ldp.h
patching file mplsd/ldp_interface.c
patching file mplsd/ldp_interface.h
patching file mplsd/ldp_remote_peer.c
patching file mplsd/ldp_remote_peer.h
patching file mplsd/ldp_vty.c
patching file mplsd/ldp_vty.h
patching file mplsd/Makefile.am
patching file mplsd/mpls.c
patching file mplsd/mplsd.conf.sample
patching file mplsd/mpls.h
patching file mplsd/mpls_handle_type.h
patching file mplsd/mpls_interface.c
patching file mplsd/mpls_interface.h
patching file mplsd/mpls_main.c
patching file mplsd/mpls_trace.h
patching file mplsd/mpls_vty.c
patching file mplsd/mpls_vty.h
patching file mplsd/mpls_zebra.c
patching file mplsd/mpls_zebra.h
patching file mplsd/rsvpte.c
patching file mplsd/rsvpte.h
patching file mplsd/rsvpte_interface.c
patching file mplsd/rsvpte_interface.h
patching file mplsd/rsvpte_vty.c
patching file mplsd/rsvpte_vty.h
patching file mplsd/static.c
patching file mplsd/static.h
patching file mplsd/static_tunnel.c
patching file mplsd/static_tunnel.h
patching file mplsd/static_vty.c
patching file mplsd/static_vty.h
patching file ospfd/ospfd.c
Hunk #1 succeeded at 60 with fuzz 1 (offset 4 lines).
Hunk #2 succeeded at 68 (offset 4 lines).
Hunk #3 FAILED at 84.
1 out of 3 hunks FAILED -- saving rejects to file ospfd/ospfd.c.rej
patching file ospfd/ospf_lsdb.c
Hunk #1 FAILED at 284.
Hunk #2 FAILED at 293.
2 out of 2 hunks FAILED -- saving rejects to file ospfd/ospf_lsdb.c.rej
patching file ospfd/ospf_lsdb.h
Hunk #1 FAILED at 79.
1 out of 1 hunk FAILED -- saving rejects to file ospfd/ospf_lsdb.h.rej
patching file ospfd/ospf_vty.c
Hunk #1 FAILED at 3046.
Hunk #2 succeeded at 3080 (offset 21 lines).
Hunk #3 succeeded at 3586 with fuzz 2 (offset -7 lines).
Hunk #4 FAILED at 3614.
Hunk #5 FAILED at 3642.
3 out of 5 hunks FAILED -- saving rejects to file ospfd/ospf_vty.c.rej
patching file ospfd/ospf_zebra.c
Hunk #2 succeeded at 167 (offset 3 lines).
Hunk #3 succeeded at 1153 (offset -17 lines).
patching file zebra/main.c
patching file zebra/Makefile.am
patching file zebra/redistribute.c
patching file zebra/rib.h
patching file zebra/router-id.c
patching file zebra/router-id.h
patching file zebra/rt_netlink.c
Hunk #1 succeeded at 613 (offset 7 lines).
Hunk #2 succeeded at 670 (offset 7 lines).
Hunk #3 succeeded at 1222 (offset 9 lines).
Hunk #4 succeeded at 1246 (offset 9 lines).
Hunk #5 succeeded at 1313 (offset 9 lines).
Hunk #6 succeeded at 1342 (offset 9 lines).
patching file zebra/zebra_rib.c
patching file zebra/zebra_vty.c
patching file zebra/zserv.c
patching file zebra/zserv.h
uml:~/zebra-0.94_mpls# 


Josef Perlinger
Student FH-Sbg/TKS 2000
Tel.: +43 664 4024906
ICQ: 166227595
Email: jo...@pe...