diff -ru zpimd-000919/Makefile zpimd-20041030/Makefile
--- zpimd-000919/Makefile	Thu Aug 17 22:59:59 2000
+++ zpimd-20041030/Makefile	Sat Oct 30 00:46:37 2004
@@ -1,7 +1,7 @@
 # Make for zebra/zpimd 
 # Robert Olsson 991115
 #
-ZEBRA_PATH= /src2/zebra-0.87
+ZEBRA_PATH= ../zebra-0.95-pre2-zpimd
 EXEC= zpimd
 CFLAGS=  -g  -DHAVE_CONFIG_H -DSYSCONFDIR=\"/usr/local/etc/\" -I$(ZEBRA_PATH)
 CFLAGS+=  -I$(ZEBRA_PATH)/lib
@@ -11,7 +11,7 @@
 CFLAGS += -Wall
 
 
-LIBS= $(ZEBRA_PATH)/lib/libzebra.a
+LIBS= $(ZEBRA_PATH)/lib/libzebra.a -lcrypt
 
 CSRCS=		pim_main.c pimd.c pim_debug.c pim_packet.c  pim_route.c \
 		pim_interface.c igmp.c if_ioctl.c tables.c rpf.c \
@@ -60,878 +60,5 @@
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-pim_main.o: pim_main.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/ip_mroute.h /usr/include/linux/mroute.h tables.h \
- pim_route.h /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- if_ioctl.h pim_packet.h igmp_def.h zbug.h
-pimd.o: pimd.c /src2/zebra-0.87/lib/zebra.h /src2/zebra-0.87/config.h \
- /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/posix_opt.h \
- /usr/include/gnu/types.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/memory.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/prefix.h \
- /src2/zebra-0.87/lib/if.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h
-pim_debug.o: pim_debug.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pim_fsm.h \
- /usr/include/netinet/ip_mroute.h /usr/include/linux/mroute.h tables.h \
- pim_route.h /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- if_ioctl.h pim_packet.h igmp_def.h zbug.h
-pim_packet.o: pim_packet.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_route.h \
- pim_packet.h igmp_def.h ioctl.h if_idx_nexthop.h pim_assert.h \
- pim_joinprune.h zbug.h
-pim_route.o: pim_route.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_packet.h igmp_def.h \
- if_idx_nexthop.h pim_route.h pim_assert.h zbug.h
-pim_interface.o: pim_interface.c pim_common.h \
- /src2/zebra-0.87/lib/zebra.h /src2/zebra-0.87/config.h \
- /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/posix_opt.h \
- /usr/include/gnu/types.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_route.h \
- pim_packet.h igmp_def.h ioctl.h if_idx_nexthop.h pim_assert.h \
- pim_joinprune.h pim_timers.h zbug.h
-igmp.o: igmp.c /src2/zebra-0.87/lib/zebra.h /src2/zebra-0.87/config.h \
- /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/posix_opt.h \
- /usr/include/gnu/types.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h assert.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/netinet/ip_mroute.h /usr/include/linux/mroute.h tables.h \
- pim_route.h pim_packet.h igmp_def.h if_idx_nexthop.h pim_joinprune.h \
- zbug.h
-if_ioctl.o: if_ioctl.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/linklist.h \
- /src2/zebra-0.87/lib/if.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/memory.h \
- /src2/zebra-0.87/lib/log.h ioctl.h if_ioctl.h pim.h
-tables.o: tables.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_packet.h igmp_def.h \
- zbug.h pim_route.h if_idx_nexthop.h pim_assert.h
-rpf.o: rpf.c /src2/zebra-0.87/lib/zebra.h /src2/zebra-0.87/config.h \
- /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/posix_opt.h \
- /usr/include/gnu/types.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/ip_mroute.h /usr/include/linux/mroute.h tables.h \
- pim_route.h /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- if_ioctl.h pim_packet.h igmp_def.h if_idx_nexthop.h zbug.h
-if_idx_nexthop.o: if_idx_nexthop.c /usr/include/stdio.h \
- /usr/include/features.h /usr/include/sys/cdefs.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/errno.h /usr/include/linux/errno.h \
- /usr/include/asm/errno.h /usr/include/alloca.h /usr/include/unistd.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h /usr/include/confname.h \
- /usr/include/sys/types.h /usr/include/linux/types.h \
- /usr/include/asm/types.h /usr/include/sys/bitypes.h \
- /usr/include/string.h /usr/include/netinet/in.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/sys/socket.h \
- /usr/include/linux/socket.h /usr/include/asm/socket.h \
- /usr/include/asm/sockios.h /usr/include/linux/sockios.h \
- /usr/include/linux/uio.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/arpa/inet.h \
- /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/asm/param.h \
- /usr/include/sys/uio.h if_idx_nexthop.h
-pim_rp.o: pim_rp.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/ip_mroute.h /usr/include/linux/mroute.h tables.h \
- pim_route.h /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- if_ioctl.h pim_packet.h igmp_def.h if_idx_nexthop.h zbug.h
-pim_assert.o: pim_assert.c /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_route.h \
- pim_packet.h igmp_def.h ioctl.h if_idx_nexthop.h pim_joinprune.h \
- pim_assert.h zbug.h
-pim_joinprune.o: pim_joinprune.c pim_common.h \
- /src2/zebra-0.87/lib/zebra.h /src2/zebra-0.87/config.h \
- /usr/include/unistd.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/posix_opt.h \
- /usr/include/gnu/types.h /usr/include/linux/posix_types.h \
- /usr/include/linux/stddef.h /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_route.h \
- pim_packet.h igmp_def.h ioctl.h if_idx_nexthop.h pim_assert.h \
- pim_joinprune.h pim_timers.h zbug.h
-pim_timers.o: pim_timers.c pim_common.h /src2/zebra-0.87/lib/zebra.h \
- /src2/zebra-0.87/config.h /usr/include/unistd.h \
- /usr/include/features.h /usr/include/sys/cdefs.h \
- /usr/include/posix_opt.h /usr/include/gnu/types.h \
- /usr/include/linux/posix_types.h /usr/include/linux/stddef.h \
- /usr/include/asm/posix_types.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stddef.h \
- /usr/include/confname.h /usr/include/sys/types.h \
- /usr/include/linux/types.h /usr/include/asm/types.h \
- /usr/include/sys/bitypes.h /usr/include/stdio.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/stdlib.h /usr/include/errno.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/fcntl.h \
- /usr/include/linux/fcntl.h /usr/include/asm/fcntl.h \
- /usr/include/signal.h /usr/include/linux/signal.h \
- /usr/include/asm/signal.h /usr/include/asm/siginfo.h \
- /usr/include/string.h /usr/include/sys/fcntl.h \
- /usr/include/sys/stat.h /usr/include/linux/stat.h \
- /usr/include/sys/time.h /usr/include/linux/time.h \
- /usr/include/asm/param.h /usr/include/time.h /usr/include/sys/param.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/limits.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/syslimits.h \
- /usr/include/limits.h /usr/include/posix1_lim.h \
- /usr/include/linux/limits.h /usr/include/posix2_lim.h \
- /usr/include/linux/param.h /usr/include/sys/sysctl.h \
- /usr/include/sys/ioctl.h /usr/include/linux/ioctl.h \
- /usr/include/asm/ioctl.h /usr/include/termios.h \
- /usr/include/linux/termios.h /usr/include/asm/termios.h \
- /usr/include/asm/termbits.h /usr/include/asm/ioctls.h \
- /usr/include/sys/socketio.h /usr/include/linux/sockios.h \
- /usr/include/asm/sockios.h /usr/include/syslog.h \
- /usr/include/sys/syslog.h \
- /usr/lib/gcc-lib/i586-unknown-linux-gnulibc1/2.7.2.3/include/stdarg.h \
- /usr/include/sys/uio.h /usr/include/linux/socket.h \
- /usr/include/asm/socket.h /usr/include/linux/uio.h \
- /usr/include/sys/utsname.h /usr/include/linux/version.h \
- /usr/include/assert.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/include/linux/in.h \
- /usr/include/asm/byteorder.h \
- /usr/include/linux/byteorder/little_endian.h \
- /usr/include/linux/byteorder/swab.h \
- /usr/include/linux/byteorder/generic.h \
- /usr/include/netinet/in_systm.h /usr/include/linux/in_systm.h \
- /usr/include/netinet/ip.h /usr/include/linux/ip.h \
- /usr/include/linux/tcp.h /usr/include/net/if.h \
- /usr/include/linux/if.h /usr/include/net/route.h \
- /usr/include/linux/route.h /usr/include/linux/netlink.h \
- /usr/include/linux/rtnetlink.h /usr/include/netdb.h \
- /usr/include/paths.h /usr/include/arpa/inet.h \
- /usr/include/arpa/telnet.h /src2/zebra-0.87/lib/vector.h \
- /src2/zebra-0.87/lib/vty.h /src2/zebra-0.87/lib/command.h \
- /src2/zebra-0.87/lib/getopt.h /src2/zebra-0.87/lib/thread.h \
- /src2/zebra-0.87/lib/stream.h /src2/zebra-0.87/lib/network.h \
- /src2/zebra-0.87/lib/prefix.h /src2/zebra-0.87/lib/version.h \
- /src2/zebra-0.87/lib/memory.h /src2/zebra-0.87/lib/if.h \
- /src2/zebra-0.87/lib/linklist.h /src2/zebra-0.87/lib/sockunion.h \
- /src2/zebra-0.87/lib/log.h pim.h pimd.h pim_fsm.h \
- /usr/include/netinet/igmp.h /usr/include/linux/igmp.h \
- /usr/include/linux/mroute.h assert.h tables.h pim_route.h \
- pim_packet.h igmp_def.h ioctl.h if_idx_nexthop.h pim_assert.h \
- pim_joinprune.h pim_timers.h zbug.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
Only in zpimd-20041030: if_idx_nexthop.o
Only in zpimd-20041030: if_ioctl.o
diff -ru zpimd-000919/igmp.c zpimd-20041030/igmp.c
--- zpimd-000919/igmp.c	Thu Aug 17 23:03:18 2000
+++ zpimd-20041030/igmp.c	Sat Oct 30 01:22:25 2004
@@ -27,6 +27,7 @@
 #include "command.h"
 #include "getopt.h"
 #include "thread.h"
+#include "linklist.h"
 
 #include "stream.h"
 #include "network.h"
@@ -44,7 +45,12 @@
 #include "pim_fsm.h"
 #include <netinet/igmp.h>
 
+#ifdef linux
+#define _LINUX_IN_H
+#include <linux/mroute.h>
+#else
 #include <netinet/ip_mroute.h>
+#endif
 #include "tables.h"
 #include "pim_route.h"
 #include "pim_packet.h"
@@ -129,7 +135,7 @@
   pi = ifp->info;
   
   init_igmp_timers(pi);
-  pi->igmp_static_group_list= list_init ();
+  pi->igmp_static_group_list= list_new ();
 
   pi->t_query = thread_add_timer(master, query_thread, pi, 0);
   return 0;
@@ -156,7 +162,7 @@
   for (node=listhead (pi->igmp_static_group_list); node; nextnode (node)) {
     g = (u_int32_t) getdata (node);
   }
-  list_delete_all (pi->igmp_static_group_list);
+  list_delete (pi->igmp_static_group_list);
   pi->igmp_static_group_list = NULL;
   return 0;
 }
@@ -489,7 +495,7 @@
   /* Create an oif */
 
   mi = oif_alloc (MTYPE_PIM_OIF);
-  list_add_node(mg->oif_list, mi);
+  listnode_add(mg->oif_list, mi);
   mi->ifp = ifp;
   mi->igmp.last_reporter = src->s_addr;
   mi->uptime = time(NULL);
@@ -1007,7 +1013,7 @@
    p = XMALLOC (MTYPE_PIM_OIF, sizeof (u_int32_t)); 
    *p = group.s_addr;
    
-   list_add_node(pi->igmp_static_group_list, p);
+   listnode_add(pi->igmp_static_group_list, p);
    process_igmp_report(&pi->address->u.prefix4, *p, ifp, 1);
 
   return CMD_SUCCESS;
Only in zpimd-20041030: igmp.o
diff -ru zpimd-000919/pim.h zpimd-20041030/pim.h
--- zpimd-000919/pim.h	Fri Aug 25 16:21:53 2000
+++ zpimd-20041030/pim.h	Sat Oct 30 02:17:26 2004
@@ -49,7 +49,7 @@
 #define GROUP_QUERY_INTERVAL		60
 #define JOIN_PRUNE_INTERVAL		60
 #define DATA_TIMER_INTERVAL             20 /* We have */
-#define REGISTER_STOP_TIMER 60
+#define REGISTER_STOP_TIMER		60
 
 
 /* From PIM-spec pp 30 */
@@ -255,4 +255,4 @@
 };
 
 #define list_free_ifempty( LST ) if( list_isempty( LST ) ) \
-      { list_delete_all( LST ); LST = 0; }
+      { list_delete( LST ); LST = 0; }
diff -ru zpimd-000919/pim_assert.c zpimd-20041030/pim_assert.c
--- zpimd-000919/pim_assert.c	Wed Aug  2 11:13:49 2000
+++ zpimd-20041030/pim_assert.c	Sat Oct 30 00:47:14 2004
@@ -40,7 +40,12 @@
 #include "pim_fsm.h"
 #include <string.h>
 #include <netinet/igmp.h>
+#ifdef linux
+#define _LINUX_IN_H
 #include <linux/mroute.h>
+#else
+#include <netinet/ip_mroute.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
Only in zpimd-20041030: pim_assert.o
diff -ru zpimd-000919/pim_common.h zpimd-20041030/pim_common.h
--- zpimd-000919/pim_common.h	Wed Aug  2 11:13:49 2000
+++ zpimd-20041030/pim_common.h	Sat Oct 30 00:48:14 2004
@@ -40,7 +40,12 @@
 #include "pim_fsm.h"
 #include <string.h>
 #include <netinet/igmp.h>
+#ifdef linux
+#define _LINUX_IN_H
 #include <linux/mroute.h>
+#else
+#include <netinet/ip_mroute.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff -ru zpimd-000919/pim_debug.c zpimd-20041030/pim_debug.c
--- zpimd-000919/pim_debug.c	Wed Aug  2 11:13:49 2000
+++ zpimd-20041030/pim_debug.c	Sat Oct 30 00:45:37 2004
@@ -41,7 +41,12 @@
 #include "pim.h"
 #include "pim_fsm.h"
 
+#ifdef linux
+#define _LINUX_IN_H
+#include <linux/mroute.h>
+#else
 #include <netinet/ip_mroute.h>
+#endif
 #include "tables.h"
 #include "pim_route.h"
 
Only in zpimd-20041030: pim_debug.o
Only in zpimd-20041030: pim_interface.o
diff -ru zpimd-000919/pim_joinprune.c zpimd-20041030/pim_joinprune.c
--- zpimd-000919/pim_joinprune.c	Tue Sep 12 14:28:02 2000
+++ zpimd-20041030/pim_joinprune.c	Sat Oct 30 02:02:17 2004
@@ -96,7 +96,7 @@
     zassert(mi, -1);
     mi->ifp = ifp;
     mi->uptime = time(NULL);
-    list_add_node(mg->oif_list, mi);
+    listnode_add(mg->oif_list, mi);
     mi->mg = mg;
     mi->uptime = time(NULL);
     mi->pim.exptime = 0; /* Set correct holdtime below */
@@ -708,7 +708,7 @@
   u_int32_t len, idx;
   u_int16_t holdtime;
   u_int32_t jplen = 0;
-  
+
   /* For all pim neigbors */
   for (node = listhead (pim_neighbor_list); node; nextnode (node)) {
     pn = getdata(node);
@@ -716,26 +716,26 @@
     pi=pn->ifp->info;
 
     /* init_jp_message */
-    
+
     num_groups = 0; /* Fill in later */
-    buf_p = (char *) (pim_sendbuf + sizeof(struct ip)  + 
+    buf_p = (char *) (pim_sendbuf + sizeof(struct ip)  +
 		      sizeof(struct pimheader));
-    
+
     buf_p += encode_unicast(buf_p, pn->address.s_addr);
     *(u_int8_t *)buf_p = 0; /* Reserved */
     buf_p += 1;
-    
+
     numgroups_p = buf_p++; /* Fill in later */
     holdtime = pi->join_prune_holdtime;
     holdtime = htons(holdtime);
     memcpy(buf_p, &holdtime, 2);
     buf_p += 2;
-    
+
     /* Scan select G from mgrp */
     for(idx=0; idx < MGRP_HASH_SIZE; idx++) {
       if( mgrp_hash[idx] == 0)
 	continue;
-      
+
       for(node1=listhead (mgrp_hash[idx]); node1; nextnode (node1)) {
 	mg = getdata( node1 );
 
@@ -750,7 +750,7 @@
     }
     if(num_groups == 0) return;
     jplen +=  sizeof(struct encoded_unicast) + 4; /* The JP header size */
-    *numgroups_p = (unsigned char )num_groups; 
+    *numgroups_p = (unsigned char )num_groups;
     if(pi->version == 2)
       send_pim_v2_packet(pi->ifp, pim_sendbuf, jplen, PIM_JOIN_PRUNE,
 			 htonl(INADDR_PIM_ALLRTRS_GROUP), 1);  
@@ -801,9 +801,3 @@
 					   pi->trigger_join_prune_delay);
   return;
 }
-
-
-
-
-
-
Only in zpimd-20041030: pim_joinprune.o
diff -ru zpimd-000919/pim_main.c zpimd-20041030/pim_main.c
--- zpimd-000919/pim_main.c	Mon Aug 28 16:23:48 2000
+++ zpimd-20041030/pim_main.c	Sat Oct 30 02:54:50 2004
@@ -42,7 +42,12 @@
 #include "pimd.h"
 #include "pim_fsm.h"
 
+#ifdef linux
+#define _LINUX_IN_H
+#include <linux/mroute.h>
+#else
 #include <netinet/ip_mroute.h>
+#endif
 #include "tables.h"
 #include "pim_route.h"
 
@@ -127,7 +132,7 @@
   vty_read_config (config_file, config_current, config_default);
 
   /* Create VTY's socket */
-  vty_serv_sock (vty_port ? vty_port : PIM_VTY_PORT, PIM_VTYSH_PATH); 
+  vty_serv_sock ("localhost", vty_port ? vty_port : PIM_VTY_PORT, PIM_VTYSH_PATH); 
 
   /* Try to return to normal operation. */
 }
@@ -245,7 +250,7 @@
           vty_port = atoi (optarg);
           break;
         case 'v':
-          print_version ();
+          print_version ("zpimd");
           exit (0);
           break;
         case 'h':
@@ -258,16 +263,16 @@
     }
 
  /* Make thread master. */
-  master = thread_make_master ();
+  master = thread_master_create ();
 
   /* Initializations. */
   tables_init();
   signal_init ();
   debug_init();
   if_init();
-  cmd_init();
+  cmd_init(1);
   vty_init();
-  pim_neighbor_list = list_init ();
+  pim_neighbor_list = list_new ();
   pim_init();
   memory_init();
   socket_init();
@@ -292,7 +297,7 @@
   pid_output (PATH_PIMD_PID);
 
   /* Create pim server */
-  vty_serv_sock (vty_port ? vty_port : PIM_VTY_PORT, PIM_VTYSH_PATH);
+  vty_serv_sock ("localhost", vty_port ? vty_port : PIM_VTY_PORT, PIM_VTYSH_PATH);
  
   /* Execute each thread. */
   while (thread_fetch (master, &thread))
@@ -466,17 +471,17 @@
     
   g = inet_addr(argv[0]);
   if(g == -1) return CMD_WARNING;
-   if(IN_MULTICAST(g))  {
+   if(IN_MULTICAST(htonl(g)))  {
      ZBUG_LOG_GROUP( g );      
      vty_out(vty, "Debug info to %s for group %s%s", 
 	     ZBUG_LOGFILE,
-	     inet_2a(g, b1), 
+	     inet_2a(g, b1), 	/* no htonl() here? XXX */
 	     VTY_NEWLINE);
      fprintf(ZBUG_LOG, "Log start group %s\n", inet_2a(zbug_g, b1));
      fflush(ZBUG_LOG);
      return CMD_SUCCESS;
    }
-  vty_out(vty, "Illegal address %s",  VTY_NEWLINE);
+  vty_out(vty, "Illegal address <%s>%s", argv[0], VTY_NEWLINE);
   return CMD_SUCCESS;
 } 
 
@@ -776,7 +781,7 @@
 int
 pim_neighbor_list_add(struct pim_neighbor *pn)
 {
-  list_add_node (pim_neighbor_list, pn);
+  listnode_add (pim_neighbor_list, pn);
   return 1;
 }
 
Only in zpimd-20041030: pim_main.o
diff -ru zpimd-000919/pim_packet.c zpimd-20041030/pim_packet.c
--- zpimd-000919/pim_packet.c	Thu Aug 17 23:03:18 2000
+++ zpimd-20041030/pim_packet.c	Sat Oct 30 00:47:33 2004
@@ -40,7 +40,12 @@
 #include "pim_fsm.h"
 #include <string.h>
 #include <netinet/igmp.h>
+#ifdef linux
+#define _LINUX_IN_H
 #include <linux/mroute.h>
+#else
+#include <netinet/ip_mroute.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
Only in zpimd-20041030: pim_packet.o
diff -ru zpimd-000919/pim_route.c zpimd-20041030/pim_route.c
--- zpimd-000919/pim_route.c	Tue Aug 29 09:16:32 2000
+++ zpimd-20041030/pim_route.c	Sat Oct 30 03:00:11 2004
@@ -40,7 +40,12 @@
 #include "pim_fsm.h"
 #include <string.h>
 #include <netinet/igmp.h>
+#ifdef linux
+#define _LINUX_IN_H
 #include <linux/mroute.h>
+#else
+#include <netinet/ip_mroute.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -370,7 +375,7 @@
 
   iif = mr->ms->ifp->ifindex;
 
-  /* Switch to SPT if SPT=RPT=0 and WRONGVIF on if towars source */
+  /* Switch to SPT if SPT=RPT=0 and WRONGVIF on if towards source */
 
   if(!(mr->flags & MRT_SPT))
     if(!(mr->flags & MRT_RPT) && 
@@ -466,12 +471,12 @@
       ZBUG_G(mg->group)
 	pim_flags_f(ZBUG_LOG, 0, mg->group, mg->flags);
     }
-    
+
     printf("Process kernelCall iif=0x%x, kiif=0x%x G=%s, S=%s\n",
 	   mg->pim.rp->ifp->ifindex, igmpctl->im_vif, 
 	   inet_2a(igmpctl->im_dst.s_addr, b1),
 	   inet_2a(igmpctl->im_src.s_addr, b2));
-    
+
     if(( mg->pim.rp->ifp->ifindex == igmpctl->im_vif) &&
        (mg->pim.rp->ifp->ifindex >= 0)) {
       
Only in zpimd-20041030: pim_route.o
diff -ru zpimd-000919/pim_rp.c zpimd-20041030/pim_rp.c
--- zpimd-000919/pim_rp.c	Wed Aug  2 11:13:49 2000
+++ zpimd-20041030/pim_rp.c	Sat Oct 30 00:46:02 2004
@@ -38,7 +38,12 @@
 #include "pim.h"
 #include "pimd.h"
 #include "pim_fsm.h"
+#ifdef linux
+#define _LINUX_IN_H
+#include <linux/mroute.h>
+#else
 #include <netinet/ip_mroute.h>
+#endif
 #include "tables.h"
 #include "pim_route.h"
 #include <netinet/igmp.h>
Only in zpimd-20041030: pim_rp.o
Only in zpimd-20041030: pim_timers.o
Only in zpimd-20041030: pimd.o
diff -ru zpimd-000919/rpf.c zpimd-20041030/rpf.c
--- zpimd-000919/rpf.c	Wed Aug  2 11:13:49 2000
+++ zpimd-20041030/rpf.c	Sat Oct 30 00:46:12 2004
@@ -38,7 +38,12 @@
 #include "pim.h"
 #include "pimd.h"
 #include "pim_fsm.h"
+#ifdef linux
+#define _LINUX_IN_H
+#include <linux/mroute.h>
+#else
 #include <netinet/ip_mroute.h>
+#endif
 #include "tables.h"
 #include "pim_route.h"
 #include <netinet/igmp.h>
Only in zpimd-20041030: rpf.o
diff -ru zpimd-000919/tables.c zpimd-20041030/tables.c
--- zpimd-000919/tables.c	Fri Aug 25 16:21:53 2000
+++ zpimd-20041030/tables.c	Sat Oct 30 01:25:28 2004
@@ -40,7 +40,12 @@
 #include "pim_fsm.h"
 #include <string.h>
 #include <netinet/igmp.h>
+#ifdef linux
+#define _LINUX_IN_H
 #include <linux/mroute.h>
+#else
+#include <netinet/ip_mroute.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -68,7 +73,7 @@
 
 void tables_init( void )
 {
-  mg_list = list_init();
+  mg_list = list_new();
   memset(mrt_hash, 0, MRT_HASH_SIZE * sizeof(  list ));
   memset(mgrp_hash, 0, MGRP_HASH_SIZE * sizeof( list ));
 }
@@ -174,18 +179,18 @@
     }
   l = mrt_hash[idx];
   if(!l) {
-    l = list_init();
+    l = list_new();
     mrt_hash[idx] = l;
   }
   ms->use_count++;
-  mr->oif_list = list_init();
+  mr->oif_list = list_new();
   mr->ms = ms;
   mr->mg = mg;
   mr->uptime = time(NULL);
   mr->exptime = time(NULL);
   mr->t_entry_timeout = NULL;
   mr->flags = 0;
-  list_add_node(l, mr);
+  listnode_add(l, mr);
 
 #if 1
   {
@@ -205,11 +210,11 @@
 	if(prev_node)
 	  list_add_node_next(mg->mrt_list, prev_node, mr);
 	else
-	  list_add_node(mg->mrt_list, mr);
+	  listnode_add(mg->mrt_list, mr);
       }
   }  
 #else
-  list_add_node(mg->mrt_list, mr);
+  listnode_add(mg->mrt_list, mr);
 #endif
   return mr;
 }
@@ -250,7 +255,7 @@
       thread_cancel(mi->igmp.t_send_group_specific_query);
     XFREE(MTYPE_PIM_OIF, mi);
   }
-  list_delete_all(mr->oif_list);
+  list_delete(mr->oif_list);
   
   /* Remove us from grp list and stop pending timers */
 
@@ -275,7 +280,7 @@
   }
   if(mrt_hash[idx])
     {
-      list_delete_by_val(mrt_hash[idx], mr);
+      listnode_delete(mrt_hash[idx], mr);
       list_free_ifempty( mrt_hash[idx] );
     }
   
@@ -321,15 +326,15 @@
 
   l = mgrp_hash[idx];
   if(!l) {
-    l = list_init();
+    l = list_new();
     mgrp_hash[idx] = l;
   }
   
   mg->group = G;
-  mg->oif_list = list_init ();
-  mg->mrt_list = list_init ();
+  mg->oif_list = list_new ();
+  mg->mrt_list = list_new ();
 
-  list_add_node(l, mg);
+  listnode_add(l, mg);
 
   {
     /* Add group sorted into list */
@@ -348,7 +353,7 @@
 	if(prev_node)
 	  list_add_node_next(mg_list, prev_node, mg);
 	else
-	  list_add_node(mg_list, mg);
+	  listnode_add(mg_list, mg);
       }
   }
   
@@ -388,7 +393,7 @@
 	mr = getdata( listhead( mg->mrt_list));
 	mr_remove( mr );
       }
-    list_delete_all(mg->mrt_list);
+    list_delete(mg->mrt_list);
   }
   
   if(mg->oif_list != NULL) {
@@ -400,16 +405,16 @@
 	thread_cancel(mi->igmp.t_send_group_specific_query);
       XFREE(MTYPE_PIM_OIF, mi);
     }
-    list_delete_all(mg->oif_list);
+    list_delete(mg->oif_list);
   }
 
   if(mgrp_hash[idx])
     {
-      list_delete_by_val(mgrp_hash[idx], mg);
+      listnode_delete(mgrp_hash[idx], mg);
       list_free_ifempty( mgrp_hash[idx] );
     }
 
-  list_delete_by_val(mg_list, mg);
+  listnode_delete(mg_list, mg);
   
   XFREE(MTYPE_PIM_G, mg);
   return 1;
@@ -488,9 +493,9 @@
   s->use_count = 0;
 
   if(!(l = msrc_hash[idx]))
-    l = msrc_hash[idx] = list_init();
+    l = msrc_hash[idx] = list_new();
 
-  list_add_node(l, s);
+  listnode_add(l, s);
   return s;
 }
 
@@ -502,7 +507,7 @@
   s =  (struct msrc *) ms_lookup(S);
   if( s == NULL)
     return 0;
-  list_delete_by_val( msrc_hash[idx], s);
+  listnode_delete( msrc_hash[idx], s);
   
   list_free_ifempty( msrc_hash[idx] );
 
@@ -542,7 +547,7 @@
       fflush(ZBUG_LOG);
     }
   
-  list_delete_by_val(mg->oif_list, mi);
+  listnode_delete(mg->oif_list, mi);
   
   if( mi->pim.t_oif_timeout) 
     thread_cancel(mi->pim.t_oif_timeout);
@@ -578,7 +583,7 @@
   if( mi->igmp.t_send_group_specific_query) 
     thread_cancel(mi->igmp.t_send_group_specific_query);
 
-  list_delete_by_val(mr->oif_list, mi);  
+  listnode_delete(mr->oif_list, mi);  
 
   XFREE(MTYPE_PIM_OIF, mi);
   return 1;
@@ -743,7 +748,7 @@
     printf("list not empty\n");
   
   if(!mr->oif_list) 
-    mr->oif_list = list_init();
+    mr->oif_list = list_new();
   
   for (node = listhead (mg->oif_list); node; nextnode (node)) {
     mi_tmp  = getdata(node);
@@ -761,7 +766,7 @@
     mi->flags &= ~MRT_IGMP_IN_USE;
     mi->mr = mr;
 
-    list_add_node(mr->oif_list, mi);
+    listnode_add(mr->oif_list, mi);
   }
 }
 
@@ -812,7 +817,7 @@
     mi->flags &= ~MRT_IGMP_IN_USE;
     mi->mr = mr;
 
-    list_add_node(mr->oif_list, mi);
+    listnode_add(mr->oif_list, mi);
 
     oifs = mr_oifs(mr);
 
@@ -930,7 +935,7 @@
     mi->uptime = time(NULL);
     mi->flags &= ~MRT_IGMP_IN_USE;
     mi->mr = mr;
-    list_add_node(mr->oif_list, mi);
+    listnode_add(mr->oif_list, mi);
 }
 
 void ms_timeout(void)
Only in zpimd-20041030: tables.o
Only in zpimd-20041030: zpimd