diff options
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/.cvsignore | 1 | ||||
| -rw-r--r-- | ospf6d/ChangeLog | 15 | ||||
| -rw-r--r-- | ospf6d/Makefile.am | 2 | ||||
| -rw-r--r-- | ospf6d/Makefile.in | 478 | ||||
| -rw-r--r-- | ospf6d/ospf6_damp.c | 6 | ||||
| -rw-r--r-- | ospf6d/ospf6_dump.c | 3 | ||||
| -rw-r--r-- | ospf6d/ospf6_interface.c | 8 | ||||
| -rw-r--r-- | ospf6d/ospf6_main.c | 29 | ||||
| -rw-r--r-- | ospf6d/ospf6_network.c | 9 | ||||
| -rw-r--r-- | ospf6d/ospf6_routemap.c | 92 | ||||
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 1 | ||||
| -rw-r--r-- | ospf6d/ospf6d.c | 50 | ||||
| -rw-r--r-- | ospf6d/ospf6d.h | 1 |
13 files changed, 117 insertions, 578 deletions
diff --git a/ospf6d/.cvsignore b/ospf6d/.cvsignore index cec4061c..5e76e4db 100644 --- a/ospf6d/.cvsignore +++ b/ospf6d/.cvsignore @@ -1,4 +1,5 @@ Makefile +Makefile.in *.o *.patch ospf6d diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog index 8a8c0bfd..63052c7c 100644 --- a/ospf6d/ChangeLog +++ b/ospf6d/ChangeLog @@ -1,9 +1,24 @@ +2003-05-18 Hasso Tepper <hasso@estpak.ee> + + * ospf6_{dump,interface,zebra}.c,ospf6d.c: show router and interface + nodes from ospf6d when using vtysh, and don't show defaults in + interface node (from ^WIND patch). + +2003-04-23 Hasso Tepper <hasso@estpak.ee> + + * {ospf6_damp,ospf6d}.c: fix "router xxx" node commands in vtysh + 2003-04-25 Yasuhiro Ohara <yasu@sfc.wide.ad.jp> * ospf6_asbr.c: AS-External LSA refresh was based on the prefix of the obsolete LSA. It was wrong so fixed. * version: 0.9.6p +2003-04-19 Hasso Tepper <hasso@estpak.ee> + + * rip_routemap.c: sync daemon's route-map commands to have same + syntax + 2002-11-09 Vincent Jardin <jardin@6wind.com> * ospf6_interface.c: update link-local address on interface creation. diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am index e42814af..680e89b8 100644 --- a/ospf6d/Makefile.am +++ b/ospf6d/Makefile.am @@ -28,7 +28,7 @@ noinst_HEADERS = \ ospf6d_SOURCES = \ ospf6_main.c $(libospf6_a_SOURCES) -ospf6d_LDADD = -L../lib -lzebra @LIBCAP@ +ospf6d_LDADD = -L../lib -lzebra sysconf_DATA = ospf6d.conf.sample diff --git a/ospf6d/Makefile.in b/ospf6d/Makefile.in deleted file mode 100644 index 548ba099..00000000 --- a/ospf6d/Makefile.in +++ /dev/null @@ -1,478 +0,0 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -AMTAR = @AMTAR@ -AR = @AR@ -AWK = @AWK@ -BGPD = @BGPD@ -CC = @CC@ -CPP = @CPP@ -CURSES = @CURSES@ -DEPDIR = @DEPDIR@ -IF_METHOD = @IF_METHOD@ -IF_PROC = @IF_PROC@ - -INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -IPFORWARD = @IPFORWARD@ -KERNEL_METHOD = @KERNEL_METHOD@ -LIBPAM = @LIBPAM@ -LIB_IPV6 = @LIB_IPV6@ -LIB_REGEX = @LIB_REGEX@ -MULTIPATH_NUM = @MULTIPATH_NUM@ -OSPF6D = @OSPF6D@ -OSPFD = @OSPFD@ -OTHER_METHOD = @OTHER_METHOD@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -RIPD = @RIPD@ -RIPNGD = @RIPNGD@ -RTREAD_METHOD = @RTREAD_METHOD@ -RT_METHOD = @RT_METHOD@ -STRIP = @STRIP@ -VERSION = @VERSION@ -VTYSH = @VTYSH@ -ZEBRA = @ZEBRA@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ -DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -INSTALL_SDATA = @INSTALL@ -m 600 - -noinst_LIBRARIES = libospf6.a -sbin_PROGRAMS = ospf6d - -libospf6_a_SOURCES = \ - ospf6_dump.c ospf6d.c ospf6_interface.c ospf6_network.c \ - ospf6_neighbor.c ospf6_message.c ospf6_lsa.c ospf6_spf.c \ - ospf6_route.c ospf6_zebra.c ospf6_ism.c ospf6_dbex.c \ - ospf6_lsdb.c ospf6_prefix.c ospf6_top.c ospf6_area.c ospf6_nsm.c \ - ospf6_routemap.c ospf6_proto.c \ - ospf6_hook.c ospf6_asbr.c ospf6_bintree.c ospf6_linklist.c \ - ospf6_abr.c ospf6_intra.c ospf6_damp.c - - -noinst_HEADERS = \ - ospf6_area.h ospf6_dump.h ospf6_interface.h ospf6_lsa.h \ - ospf6_message.h ospf6_neighbor.h ospf6_network.h ospf6_proto.h \ - ospf6_spf.h ospf6_route.h ospf6_types.h ospf6_zebra.h ospf6d.h \ - ospf6_ism.h ospf6_dbex.h ospf6_lsdb.h ospf6_prefix.h \ - ospf6_top.h ospf6_nsm.h ospf6_routemap.h \ - ospf6_hook.h ospf6_asbr.h ospf6_bintree.h ospf6_linklist.h \ - ospf6_abr.h ospf6_intra.h ospf6_damp.h - - -ospf6d_SOURCES = \ - ospf6_main.c $(libospf6_a_SOURCES) - - -ospf6d_LDADD = ../lib/libzebra.a - -sysconf_DATA = ospf6d.conf.sample - -EXTRA_DIST = $(sysconf_DATA) -subdir = ospf6d -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - -libospf6_a_AR = $(AR) cru -libospf6_a_LIBADD = -am_libospf6_a_OBJECTS = ospf6_dump.$(OBJEXT) ospf6d.$(OBJEXT) \ - ospf6_interface.$(OBJEXT) ospf6_network.$(OBJEXT) \ - ospf6_neighbor.$(OBJEXT) ospf6_message.$(OBJEXT) \ - ospf6_lsa.$(OBJEXT) ospf6_spf.$(OBJEXT) ospf6_route.$(OBJEXT) \ - ospf6_zebra.$(OBJEXT) ospf6_ism.$(OBJEXT) ospf6_dbex.$(OBJEXT) \ - ospf6_lsdb.$(OBJEXT) ospf6_prefix.$(OBJEXT) ospf6_top.$(OBJEXT) \ - ospf6_area.$(OBJEXT) ospf6_nsm.$(OBJEXT) \ - ospf6_routemap.$(OBJEXT) ospf6_proto.$(OBJEXT) \ - ospf6_hook.$(OBJEXT) ospf6_asbr.$(OBJEXT) \ - ospf6_bintree.$(OBJEXT) ospf6_linklist.$(OBJEXT) \ - ospf6_abr.$(OBJEXT) ospf6_intra.$(OBJEXT) ospf6_damp.$(OBJEXT) -libospf6_a_OBJECTS = $(am_libospf6_a_OBJECTS) -sbin_PROGRAMS = ospf6d$(EXEEXT) -PROGRAMS = $(sbin_PROGRAMS) - -am__objects_1 = ospf6_dump.$(OBJEXT) ospf6d.$(OBJEXT) \ - ospf6_interface.$(OBJEXT) ospf6_network.$(OBJEXT) \ - ospf6_neighbor.$(OBJEXT) ospf6_message.$(OBJEXT) \ - ospf6_lsa.$(OBJEXT) ospf6_spf.$(OBJEXT) ospf6_route.$(OBJEXT) \ - ospf6_zebra.$(OBJEXT) ospf6_ism.$(OBJEXT) ospf6_dbex.$(OBJEXT) \ - ospf6_lsdb.$(OBJEXT) ospf6_prefix.$(OBJEXT) ospf6_top.$(OBJEXT) \ - ospf6_area.$(OBJEXT) ospf6_nsm.$(OBJEXT) \ - ospf6_routemap.$(OBJEXT) ospf6_proto.$(OBJEXT) \ - ospf6_hook.$(OBJEXT) ospf6_asbr.$(OBJEXT) \ - ospf6_bintree.$(OBJEXT) ospf6_linklist.$(OBJEXT) \ - ospf6_abr.$(OBJEXT) ospf6_intra.$(OBJEXT) ospf6_damp.$(OBJEXT) -am_ospf6d_OBJECTS = ospf6_main.$(OBJEXT) $(am__objects_1) -ospf6d_OBJECTS = $(am_ospf6d_OBJECTS) -ospf6d_DEPENDENCIES = ../lib/libzebra.a -ospf6d_LDFLAGS = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ospf6_abr.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_area.Po ./$(DEPDIR)/ospf6_asbr.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_bintree.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_damp.Po ./$(DEPDIR)/ospf6_dbex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_dump.Po ./$(DEPDIR)/ospf6_hook.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_interface.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_intra.Po ./$(DEPDIR)/ospf6_ism.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_linklist.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_lsa.Po ./$(DEPDIR)/ospf6_lsdb.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_main.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_message.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_neighbor.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_network.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_nsm.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_prefix.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_proto.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_route.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_routemap.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_spf.Po ./$(DEPDIR)/ospf6_top.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ospf6_zebra.Po ./$(DEPDIR)/ospf6d.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CFLAGS = @CFLAGS@ -DIST_SOURCES = $(libospf6_a_SOURCES) $(ospf6d_SOURCES) -DATA = $(sysconf_DATA) - -HEADERS = $(noinst_HEADERS) - -DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ - Makefile.in -SOURCES = $(libospf6_a_SOURCES) $(ospf6d_SOURCES) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign ospf6d/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libospf6.a: $(libospf6_a_OBJECTS) $(libospf6_a_DEPENDENCIES) - -rm -f libospf6.a - $(libospf6_a_AR) libospf6.a $(libospf6_a_OBJECTS) $(libospf6_a_LIBADD) - $(RANLIB) libospf6.a -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sbindir) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \ - else :; fi; \ - done - -uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ - rm -f $(DESTDIR)$(sbindir)/$$f; \ - done - -clean-sbinPROGRAMS: - -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -ospf6d$(EXEEXT): $(ospf6d_OBJECTS) $(ospf6d_DEPENDENCIES) - @rm -f ospf6d$(EXEEXT) - $(LINK) $(ospf6d_LDFLAGS) $(ospf6d_OBJECTS) $(ospf6d_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_abr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_area.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_asbr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_bintree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_damp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_dbex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_hook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_interface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_intra.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_ism.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_linklist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_lsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_lsdb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_message.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_neighbor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_network.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_nsm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_prefix.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_proto.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_route.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_routemap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_spf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_top.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6_zebra.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ospf6d.Po@am__quote@ - -distclean-depend: - -rm -rf ./$(DEPDIR) - -.c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< - -.c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` -CCDEPMODE = @CCDEPMODE@ -uninstall-info-am: -sysconfDATA_INSTALL = $(INSTALL_DATA) - -uninstall-sysconfDATA: - @$(NORMAL_UNINSTALL) - @list='$(sysconf_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \ - rm -f $(DESTDIR)$(sysconfdir)/$$f; \ - done - -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) - -installdirs: - $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(sysconfdir) - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-noinstLIBRARIES clean-sbinPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-sbinPROGRAMS install-sysconfDATA - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS \ - uninstall-sysconfDATA - -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES clean-sbinPROGRAMS distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-sbinPROGRAMS install-strip install-sysconfDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic tags uninstall uninstall-am \ - uninstall-info-am uninstall-sbinPROGRAMS uninstall-sysconfDATA - - -install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - @list='$(sysconf_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \ - $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \ - $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \ - fi; fi; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/ospf6d/ospf6_damp.c b/ospf6d/ospf6_damp.c index 4e807a70..878c48f6 100644 --- a/ospf6d/ospf6_damp.c +++ b/ospf6d/ospf6_damp.c @@ -567,8 +567,8 @@ DEFUN (show_ipv6_ospf6_route_flapping, return CMD_SUCCESS; } -DEFUN (flap_damping_route, - flap_damping_route_cmd, +DEFUN (ospf6_flap_damping_route, + ospf6_flap_damping_route_cmd, "flap-damping route <0-4294967295> <0-4294967295> " "<0-4294967295> <0-4294967295>", "enable flap dampening\n" @@ -734,7 +734,7 @@ ospf6_damp_init () install_element (VIEW_NODE, &show_ipv6_ospf6_route_flapping_cmd); install_element (ENABLE_NODE, &show_ipv6_ospf6_route_flapping_cmd); install_element (ENABLE_NODE, &show_ipv6_ospf6_camp_config_cmd); - install_element (OSPF6_NODE, &flap_damping_route_cmd); + install_element (OSPF6_NODE, &ospf6_flap_damping_route_cmd); install_element (ENABLE_NODE, &show_debug_ospf6_damp_cmd); install_element (CONFIG_NODE, &debug_ospf6_damp_cmd); diff --git a/ospf6d/ospf6_dump.c b/ospf6d/ospf6_dump.c index e950ec8c..1e3c0c42 100644 --- a/ospf6d/ospf6_dump.c +++ b/ospf6d/ospf6_dump.c @@ -224,7 +224,8 @@ DEFUN (no_debug_ospf6_all, struct cmd_node debug_node = { DEBUG_NODE, - "" + "", + vtysh: 1 }; int diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index d394f21b..4d632b22 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -961,18 +961,25 @@ ospf6_interface_config_write (struct vty *vty) vty_out (vty, "interface %s%s", o6i->interface->name, VTY_NEWLINE); + if (o6i->cost != 1) vty_out (vty, " ipv6 ospf6 cost %d%s", o6i->cost, VTY_NEWLINE); + if (o6i->hello_interval != 10) vty_out (vty, " ipv6 ospf6 hello-interval %d%s", o6i->hello_interval, VTY_NEWLINE); + if (o6i->dead_interval != 40) vty_out (vty, " ipv6 ospf6 dead-interval %d%s", o6i->dead_interval, VTY_NEWLINE); + if (o6i->rxmt_interval != 5) vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s", o6i->rxmt_interval, VTY_NEWLINE); + if (o6i->priority != 1) vty_out (vty, " ipv6 ospf6 priority %d%s", o6i->priority, VTY_NEWLINE); + if (o6i->transdelay != 1) vty_out (vty, " ipv6 ospf6 transmit-delay %d%s", o6i->transdelay, VTY_NEWLINE); + if (o6i->instance_id != 0) vty_out (vty, " ipv6 ospf6 instance-id %d%s", o6i->instance_id, VTY_NEWLINE); @@ -994,6 +1001,7 @@ struct cmd_node interface_node = { INTERFACE_NODE, "%s(config-if)# ", + vtysh: 1 }; void diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index e6cd6aaa..10203bf8 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -27,7 +27,6 @@ #include "command.h" #include "vty.h" #include "memory.h" -#include "privs.h" #include "ospf6d.h" #include "ospf6_network.h" @@ -44,26 +43,6 @@ extern int ospf6_sock; /* Default port values. */ #define OSPF6_VTY_PORT 2606 -/* ospf6d privileges */ -zebra_capabilities_t _caps_p [] = -{ - ZCAP_RAW, - ZCAP_BIND -}; - -struct zebra_privs_t ospf6d_privs = -{ -#if defined(ZEBRA_USER) - .user = ZEBRA_USER, -#endif -#if defined ZEBRA_GROUP - .group = ZEBRA_GROUP, -#endif - .caps_p = _caps_p, - .cap_num_p = 2, - .cap_num_i = 0 -}; - /* ospf6d options, we use GNU getopt library. */ struct option longopts[] = { @@ -72,7 +51,6 @@ struct option longopts[] = { "pid_file", required_argument, NULL, 'i'}, { "vty_addr", required_argument, NULL, 'A'}, { "vty_port", required_argument, NULL, 'P'}, - { "user", required_argument, NULL, 'u'}, { "version", no_argument, NULL, 'v'}, { "help", no_argument, NULL, 'h'}, { 0 } @@ -115,7 +93,6 @@ Daemon which manages OSPF version 3.\n\n\ -i, --pid_file Set process identifier file name\n\ -A, --vty_addr Set vty's bind address\n\ -P, --vty_port Set vty's port number\n\ --u, --user User and group to run as\n\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ @@ -254,7 +231,7 @@ main (int argc, char *argv[], char *envp[]) /* Command line argument treatment. */ while (1) { - opt = getopt_long (argc, argv, "df:hp:A:P:u:v", longopts, 0); + opt = getopt_long (argc, argv, "df:hp:A:P:v", longopts, 0); if (opt == EOF) break; @@ -286,9 +263,6 @@ main (int argc, char *argv[], char *envp[]) vty_port = atoi (optarg); vty_port = (vty_port ? vty_port : OSPF6_VTY_PORT); break; - case 'u': - ospf6d_privs.user = ospf6d_privs.group = optarg; - break; case 'v': print_version (progname); exit (0); @@ -314,7 +288,6 @@ main (int argc, char *argv[], char *envp[]) zlog_default = openzlog (progname, flag, ZLOG_OSPF6, LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON); - zprivs_init (&ospf6d_privs); signal_init (); cmd_init (1); vty_init (); diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c index ece34135..e90614e5 100644 --- a/ospf6d/ospf6_network.c +++ b/ospf6d/ospf6_network.c @@ -23,7 +23,6 @@ #include "memory.h" #include "log.h" #include "sockunion.h" -#include "privs.h" #include "ospf6d.h" #include "ospf6_proto.h" @@ -33,7 +32,6 @@ extern struct sockaddr_in6 allspfrouters6; extern struct sockaddr_in6 alldrouters6; extern int ospf6_sock; extern struct thread_master *master; -extern struct zebra_privs_t ospf6d_privs; /* iovec functions */ void @@ -196,10 +194,6 @@ iov_copy_all (struct iovec *dst, struct iovec *src, size_t size) int ospf6_serv_sock () { - - if (ospf6d_privs.change (ZPRIVS_RAISE)) - zlog_err ("ospf6_serv_sock: could not raise privs"); - ospf6_sock = socket (AF_INET6, SOCK_RAW, IPPROTO_OSPFIGP); if (ospf6_sock < 0) { @@ -208,9 +202,6 @@ ospf6_serv_sock () } sockopt_reuseaddr (ospf6_sock); - if (ospf6d_privs.change (ZPRIVS_LOWER)) - zlog_err ("ospf_sock_init: could not lower privs"); - /* setup global sockaddr_in6, allspf6 & alldr6 for later use */ allspfrouters6.sin6_family = AF_INET6; alldrouters6.sin6_family = AF_INET6; diff --git a/ospf6d/ospf6_routemap.c b/ospf6d/ospf6_routemap.c index 14df7940..f617e913 100644 --- a/ospf6d/ospf6_routemap.c +++ b/ospf6d/ospf6_routemap.c @@ -214,14 +214,14 @@ route_map_command_status (struct vty *vty, int ret) } /* add "match address" */ -DEFUN (ospf6_routemap_match_address_prefixlist, - ospf6_routemap_match_address_prefixlist_cmd, +DEFUN (match_ipv6_address_prefix_list, + match_ipv6_address_prefix_list_cmd, "match ipv6 address prefix-list WORD", - "Match values\n" + MATCH_STR IPV6_STR "Match address of route\n" "Match entries of prefix-lists\n" - "IPv6 prefix-list name\n") + "IP prefix-list name\n") { int ret = route_map_add_match ((struct route_map_index *) vty->index, "ipv6 address prefix-list", argv[0]); @@ -229,15 +229,15 @@ DEFUN (ospf6_routemap_match_address_prefixlist, } /* delete "match address" */ -DEFUN (ospf6_routemap_no_match_address_prefixlist, - ospf6_routemap_no_match_address_prefixlist_cmd, +DEFUN (no_match_ipv6_address_prefix_list, + no_match_ipv6_address_prefix_list_cmd, "no match ipv6 address prefix-list WORD", NO_STR - "Match values\n" + MATCH_STR IPV6_STR "Match address of route\n" "Match entries of prefix-lists\n" - "IPv6 prefix-list name\n") + "IP prefix-list name\n") { int ret = route_map_delete_match ((struct route_map_index *) vty->index, "ipv6 address prefix-list", argv[0]); @@ -245,13 +245,13 @@ DEFUN (ospf6_routemap_no_match_address_prefixlist, } /* add "set metric-type" */ -DEFUN (ospf6_routemap_set_metric_type, - ospf6_routemap_set_metric_type_cmd, +DEFUN (set_metric_type, + set_metric_type_cmd, "set metric-type (type-1|type-2)", - "Set value\n" - "Type of metric\n" - "OSPF6 external type 1 metric\n" - "OSPF6 external type 2 metric\n") + SET_STR + "Type of metric for destination routing protocol\n" + "OSPF[6] external type 1 metric\n" + "OSPF[6] external type 2 metric\n") { int ret = route_map_add_set ((struct route_map_index *) vty->index, "metric-type", argv[0]); @@ -259,26 +259,38 @@ DEFUN (ospf6_routemap_set_metric_type, } /* delete "set metric-type" */ -DEFUN (ospf6_routemap_no_set_metric_type, - ospf6_routemap_no_set_metric_type_cmd, - "no set metric-type (type-1|type-2)", +DEFUN (no_set_metric_type, + no_set_metric_type_cmd, + "no set metric-type", NO_STR - "Set value\n" - "Type of metric\n" - "OSPF6 external type 1 metric\n" - "OSPF6 external type 2 metric\n") + SET_STR + "Type of metric for destination routing protocol\n") { - int ret = route_map_delete_set ((struct route_map_index *) vty->index, + int ret; + if (argc == 0) + ret = route_map_delete_set ((struct route_map_index *) vty->index, + "metric-type", NULL); + else + ret = route_map_delete_set ((struct route_map_index *) vty->index, "metric-type", argv[0]); return route_map_command_status (vty, ret); } +ALIAS (no_set_metric_type, + no_set_metric_type_val_cmd, + "no set metric-type (type-1|type-2)", + NO_STR + SET_STR + "Type of metric for destination routing protocol\n" + "OSPF[6] external type 1 metric\n" + "OSPF[6] external type 2 metric\n") + /* add "set metric" */ DEFUN (set_metric, set_metric_cmd, "set metric <0-4294967295>", - "Set value\n" - "Metric value\n" + SET_STR + "Metric value for destination routing protocol\n" "Metric value\n") { int ret = route_map_add_set ((struct route_map_index *) vty->index, @@ -289,17 +301,29 @@ DEFUN (set_metric, /* delete "set metric" */ DEFUN (no_set_metric, no_set_metric_cmd, - "no set metric <0-4294967295>", + "no set metric", NO_STR - "Set value\n" - "Metric\n" - "METRIC value\n") + SET_STR + "Metric value for destination routing protocol\n") { - int ret = route_map_delete_set ((struct route_map_index *) vty->index, + int ret; + if (argc == 0) + ret = route_map_delete_set ((struct route_map_index *) vty->index, + "metric", NULL); + else + ret = route_map_delete_set ((struct route_map_index *) vty->index, "metric", argv[0]); return route_map_command_status (vty, ret); } +ALIAS (no_set_metric, + no_set_metric_val_cmd, + "no set metric <0-4294967295>", + NO_STR + SET_STR + "Metric value for destination routing protocol\n" + "Metric value\n") + /* add "set forwarding-address" */ DEFUN (ospf6_routemap_set_forwarding, ospf6_routemap_set_forwarding_cmd, @@ -341,16 +365,18 @@ ospf6_routemap_init () route_map_install_set (&ospf6_routemap_rule_set_forwarding_cmd); /* Match address prefix-list */ - install_element (RMAP_NODE, &ospf6_routemap_match_address_prefixlist_cmd); - install_element (RMAP_NODE, &ospf6_routemap_no_match_address_prefixlist_cmd); + install_element (RMAP_NODE, &match_ipv6_address_prefix_list_cmd); + install_element (RMAP_NODE, &no_match_ipv6_address_prefix_list_cmd); /* ASE Metric Type (e.g. Type-1/Type-2) */ - install_element (RMAP_NODE, &ospf6_routemap_set_metric_type_cmd); - install_element (RMAP_NODE, &ospf6_routemap_no_set_metric_type_cmd); + install_element (RMAP_NODE, &set_metric_type_cmd); + install_element (RMAP_NODE, &no_set_metric_type_cmd); + install_element (RMAP_NODE, &no_set_metric_type_val_cmd); /* ASE Metric */ install_element (RMAP_NODE, &set_metric_cmd); install_element (RMAP_NODE, &no_set_metric_cmd); + install_element (RMAP_NODE, &no_set_metric_val_cmd); /* ASE Metric */ install_element (RMAP_NODE, &ospf6_routemap_set_forwarding_cmd); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 7b8a8dcf..347ba1cf 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -348,6 +348,7 @@ struct cmd_node zebra_node = { ZEBRA_NODE, "%s(config-zebra)# ", + vtysh: 0 }; #define ADD 0 diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index d52ab93e..04609ba8 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -281,8 +281,8 @@ DEFUN (show_ipv6_ospf6_statistics, } /* change Router_ID commands. */ -DEFUN (router_id, - router_id_cmd, +DEFUN (ospf6_router_id, + ospf6_router_id_cmd, "router-id ROUTER_ID", "Configure ospf Router-ID.\n" V4NOTATION_STR) @@ -403,8 +403,8 @@ ospf6_interface_bind_area (struct vty *vty, return CMD_SUCCESS; } -DEFUN (interface_area_plist, - interface_area_plist_cmd, +DEFUN (ospf6_interface_area_plist, + ospf6_interface_area_plist_cmd, "interface IFNAME area A.B.C.D prefix-list WORD", "Enable routing on an IPv6 interface\n" IFNAME_STR @@ -421,8 +421,8 @@ DEFUN (interface_area_plist, return ospf6_interface_bind_area (vty, argv[0], argv[1], argv[2], 0); } -DEFUN (interface_area_plist_passive, - interface_area_plist_passive_cmd, +DEFUN (ospf6_interface_area_plist_passive, + ospf6_interface_area_plist_passive_cmd, "interface IFNAME area A.B.C.D prefix-list WORD passive", "Enable routing on an IPv6 interface\n" IFNAME_STR @@ -441,8 +441,8 @@ DEFUN (interface_area_plist_passive, return ospf6_interface_bind_area (vty, argv[0], argv[1], argv[2], 1); } -DEFUN (interface_area, - interface_area_cmd, +DEFUN (ospf6_interface_area, + ospf6_interface_area_cmd, "interface IFNAME area A.B.C.D", "Enable routing on an IPv6 interface\n" IFNAME_STR @@ -476,8 +476,8 @@ DEFUN (interface_area, plist_name, passive); } -DEFUN (interface_area_passive, - interface_area_passive_cmd, +DEFUN (ospf6_interface_area_passive, + ospf6_interface_area_passive_cmd, "interface IFNAME area A.B.C.D passive", "Enable routing on an IPv6 interface\n" IFNAME_STR @@ -493,8 +493,8 @@ DEFUN (interface_area_passive, return ospf6_interface_bind_area (vty, argv[0], argv[1], NULL, 1); } -DEFUN (no_interface_area, - no_interface_area_cmd, +DEFUN (no_ospf6_interface_area, + no_ospf6_interface_area_cmd, "no interface IFNAME area A.B.C.D", NO_STR "Disable routing on an IPv6 interface\n" @@ -570,8 +570,8 @@ DEFUN (ospf6_area_range, return CMD_SUCCESS; } -DEFUN (passive_interface, - passive_interface_cmd, +DEFUN (ospf6_passive_interface, + ospf6_passive_interface_cmd, "passive-interface IFNAME", OSPF6_PASSIVE_STR IFNAME_STR) @@ -596,8 +596,8 @@ DEFUN (passive_interface, return CMD_SUCCESS; } -DEFUN (no_passive_interface, - no_passive_interface_cmd, +DEFUN (no_ospf6_passive_interface, + no_ospf6_passive_interface_cmd, "no passive-interface IFNAME", NO_STR OSPF6_PASSIVE_STR @@ -712,6 +712,7 @@ struct cmd_node ospf6_node = { OSPF6_NODE, "%s(config-ospf6)# ", + vtysh: 1 }; /* Install ospf related commands. */ @@ -728,6 +729,7 @@ ospf6_init () install_element (ENABLE_NODE, &reload_cmd); install_element (CONFIG_NODE, &router_ospf6_cmd); install_element (CONFIG_NODE, &interface_cmd); + install_element (CONFIG_NODE, &no_interface_cmd); #ifdef OSPF6_STATISTICS install_element (VIEW_NODE, &show_ipv6_ospf6_statistics_cmd); install_element (ENABLE_NODE, &show_ipv6_ospf6_statistics_cmd); @@ -740,14 +742,14 @@ ospf6_init () #endif /* HAVE_SETPROCTITLE */ install_default (OSPF6_NODE); - install_element (OSPF6_NODE, &router_id_cmd); - install_element (OSPF6_NODE, &interface_area_cmd); - install_element (OSPF6_NODE, &interface_area_passive_cmd); - install_element (OSPF6_NODE, &interface_area_plist_cmd); - install_element (OSPF6_NODE, &interface_area_plist_passive_cmd); - install_element (OSPF6_NODE, &no_interface_area_cmd); - install_element (OSPF6_NODE, &passive_interface_cmd); - install_element (OSPF6_NODE, &no_passive_interface_cmd); + install_element (OSPF6_NODE, &ospf6_router_id_cmd); + install_element (OSPF6_NODE, &ospf6_interface_area_cmd); + install_element (OSPF6_NODE, &ospf6_interface_area_passive_cmd); + install_element (OSPF6_NODE, &ospf6_interface_area_plist_cmd); + install_element (OSPF6_NODE, &ospf6_interface_area_plist_passive_cmd); + install_element (OSPF6_NODE, &no_ospf6_interface_area_cmd); + install_element (OSPF6_NODE, &ospf6_passive_interface_cmd); + install_element (OSPF6_NODE, &no_ospf6_passive_interface_cmd); install_element (OSPF6_NODE, &ospf6_area_range_cmd); /* Make empty list of top list. */ diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h index 862b3828..8c7af99e 100644 --- a/ospf6d/ospf6d.h +++ b/ospf6d/ospf6d.h @@ -94,7 +94,6 @@ extern char *recent_reason; /* Default port values. */ #define OSPF6_VTY_PORT 2606 -#define OSPF6_VTYSH_PATH "/tmp/.ospf6d" #ifdef INRIA_IPV6 #ifndef IPV6_PKTINFO |